Merge branch 'bug_fix' into 'master'

Bug fix See merge request !248

Merge branch 'bug_fix' into 'master'
Bug fix See merge request !248
莫红玲
2 parents e10685e9 b277fe55
Showing 3 changed files with 38 additions and 16 deletions
src/pages/ehr/components/EditTable.tsx
src/pages/order3/AddValueTaskConfig/components/List.tsx
src/utils/utils.ts
@@ -5,10 +5,11 @@ import {
   FormInstance,
   Input,
   InputRef,
+  Popover,
   Table,
   TableProps,
 } from "antd";
-import { EditOutlined } from "@ant-design/icons";
+import { EditOutlined, ExclamationCircleFilled } from "@ant-design/icons";
 import React, { useContext, useEffect, useMemo, useRef, useState } from "react";
 import { Rule, RuleObject } from "antd/lib/form";
 import { StoreValue } from "antd/lib/form/interface";
@@ -122,7 +123,7 @@ export default function EditTable&lt;T&gt;({
     useEffect(() => {
       if (edit) {
         form.setFieldsValue({
-          [dataIndex]: record?.[dataIndex] ?? '',
+          [dataIndex]: record?.[dataIndex] ?? "",
         });
       }
     }, []);
@@ -147,10 +148,12 @@ export default function EditTable&lt;T&gt;({
  
     const save = async (e: any) => {
       try {
-        e.preventDefault();
-        const values = await form.validateFields();
-        toggleEdit();
-        handleSave({ ...record, ...values });
+        if (!e.shiftKey) {
+          e.preventDefault();
+          const values = await form.validateFields();
+          toggleEdit();
+          handleSave({ ...record, [dataIndex]: (values?.[dataIndex] as string)?.trim() });
+        }
       } catch (errInfo) {
         console.log("Save failed:", errInfo);
       }
@@ -207,6 +210,7 @@ export default function EditTable&lt;T&gt;({
               ref={inputRef}
               allowClear
               maxLength={maxLength}
+              autoSize={{ minRows: 2 }}
               // showCount={!!maxLength}
               onPressEnter={save}
               onBlur={save}
@@ -222,7 +226,7 @@ export default function EditTable&lt;T&gt;({
               onFocus={() => {
                 inputType === "number" &&
                   form.setFieldsValue({
-                    [dataIndex]: `${record?.[dataIndex] ?? ''}`?.replace(
+                    [dataIndex]: `${record?.[dataIndex] ?? ""}`?.replace(
                       /^0+/g,
                       ""
                     ),
@@ -250,7 +254,11 @@ export default function EditTable&lt;T&gt;({
       ) : (
         <div
           className="editable-cell-value-wrap"
-          style={{ paddingRight: 24, cursor: "pointer" }}
+          style={{
+            paddingRight: 24,
+            cursor: "pointer",
+            whiteSpace: "pre-wrap",
+          }}
           onClick={(e) => {
             e.stopPropagation();
             toggleEdit();
@@ -297,6 +305,20 @@ export default function EditTable&lt;T&gt;({
       }
       return {
         ...col,
+        title:
+          col.editable && col.inputType === "text" ? (
+            <>
+              {col.title}&nbsp;&nbsp;
+              <Popover
+                // trigger=""
+                content="在输入时，如需输入回车换行，请同时按下(Shfit + Enter)键进行换行输入"
+              >
+                <ExclamationCircleFilled />
+              </Popover>
+            </>
+          ) : (
+            col.title
+          ),
         onCell: (record: T) => ({
           record,
           ...col,
@@ -63,7 +63,7 @@ export default function LargeList({addedValueType} : Props) {
           <div style={{display: 'flex', flexDirection: 'column'}}>
             <span>商业险金额*{record.vciOutputValueRatio}%</span>
             <span>交强险金额*{record.tciOutputValueRatio}%</span>
-            <span>架意险产值*{record.jcxOutputValueRatio}%</span>
+            <span>驾意险产值*{record.jcxOutputValueRatio}%</span>
           </div>
         )}
       />
@@ -80,7 +80,7 @@ export default function LargeList({addedValueType} : Props) {
         render={(_text, record: ListResult) => `装潢产值*${_text}%`}
       />
       <Column 
-        title="适用门店" 
+        title="适用门店"
         dataIndex="shopList"
         align="left"
         render={(_text, record: ListResult) => <span style={{color: "#4189FD"}} onClick={() => setShopData({visible: true, data: record.shopList})}>{handleRenderShop(record.shopList)}</span>}
@@ -2,7 +2,7 @@
  * @Author: wangqiang@feewee.cn
  * @Date: 2022-05-11 15:58:56
  * @LastEditors: wangqiang@feewee.cn
- * @LastEditTime: 2023-05-06 14:51:12
+ * @LastEditTime: 2023-05-09 14:04:54
  */
  
 import { checkNull } from "@/utils/validate";
@@ -32,12 +32,12 @@ const isAntDesignProOrDev = (): boolean =&gt; {
  
 export { isAntDesignProOrDev, isAntDesignPro, isUrl };
  
-export const formatObjText = (
-  list: any[],
-  formatKey: string = "staffName",
+export function formatObjText<T>(
+  list: T[],
+  formatKey: keyof T,
   maxCount: number = 2,
   unit: string = "人"
-) => {
+): string {
   if (!list || (list && !list.length)) return "-";
   else {
     let result = "";
@@ -50,7 +50,7 @@ export const formatObjText = (
     }
     return result;
   }
-};
+}
  
 export function isNumber(str: string | number) {
   // 匹配整数或带有小数点的数字