医嘱搜索新增 key

src/components/cy/combo-grid/src/CyComboGrid.vue

@@ -258,7 +258,7 @@ defineExpose({
                        :showHeader="showTableHeader"
                        max-height="250px"
                        :columnConfig="{ resizable: true}"
-                       :row-config="{ height: rowHeight, isCurrent: true,isHover:true, useKey: true,keyField: 'value' }"
+                       :row-config="{ height: rowHeight, isCurrent: true,isHover:true, useKey: true,keyField: keyField }"
                        :scroll-y="{enabled: true}"
                        :loading="props.loading"
             >

src/components/cy/combo-grid/src/CyComboGridProps.ts

@@ -13,6 +13,10 @@ const CyComboGridProps = {
         type: [Object, String, Array, Number] as PropType<string | any[] | object>,
         required: true,
     },
+    keyField: {
+        type: String,
+        default: 'value'
+    },
     data: {
         type: Array,
     },

src/components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/yz-edit/YzEditor.vue

@@ -15,6 +15,7 @@
               :disabled="isEdit"
               value="orderCode"
               label="orderName"
+              key-field="id"
               :remote-method="searchOrders"
               @rowClick="({row}) => searchClickFunc(row)"
               :table-header="tableHeaderV2"

src/types/global.d.ts

@@ -1,40 +0,0 @@
-import type {TreeSearch} from "@/utils/xe-utils-enhance/array-utils";
-import {Ref} from "vue";
-
-declare module "xe-utils/ctor.d.ts" {
-    interface XEUtilsMethods {
-
-        /**
-         * 添加单位
-         * @param value 值
-         * @param defaultValue 默认单位
-         */
-        addUnit(value: string | number, defaultValue = 'px'): string
-
-        /**
-         * 判断是否是字符串数字
-         * @param value 值
-         */
-        isStringNumber(value: string): boolean
-
-        /**
-         * 柱状图搜索
-         * @param data 树状图数据
-         * @param iterator 迭代器 返回 boolean
-         */
-        treeSearch<D = any>(data: D[], iterator: (item: TreeSearch<D>) => boolean): D[]
-
-        /**
-         * 循环数组返回一个新的数组
-         * @param list 数组
-         * @param iteration 迭代
-         */
-        eachAndReturnList<T = any>(list: T[] | Ref<T[]> | number, iteration: (item: T, index: number) => any): any[];
-
-        noop: () => void,
-
-        cloneDeep<T>(value: T): T;
-    }
-}
-
-

src/utils/xe-utils-enhance/vxe-formatter.ts

@@ -24,50 +24,57 @@ function addVxeTableFormats() {
     })
 }
 
-
-function addVxeUtils() {
-    XEUtils.mixin({
-        isStringNumber(val: string) {
-            if (!XEUtils.isString(val)) {
-                return false
-            }
-            return !Number.isNaN(Number(val));
-        },
-        addUnit(value: string | number, defaultUnit: string = 'px') {
-            if (!value)
-                return "";
-            if (XEUtils.isNumber(value) || XEUtils.isStringNumber(value)) {
-                return `${value}${defaultUnit}`;
-            } else if (XEUtils.isString(value)) {
-                return value;
-            }
-        },
-        treeSearch,
-        eachAndReturnList<T = any>(list: T[] | Ref<T[]> | number, iteration: (item: T, index: number) => any) {
-            const temp: any[] = []
-            if (XEUtils.isNumber(list)) {
-                for (let i = 0; i < list; i++) {
-                    temp.push(iteration(i as T, i))
-                }
-            } else {
-                XEUtils.arrayEach(unref(list), (item, index) => {
-                    temp.push(iteration(item, index))
-                })
+const mixin = {
+    isStringNumber(val: string) {
+        if (!XEUtils.isString(val)) {
+            return false
+        }
+        return !Number.isNaN(Number(val));
+    },
+    addUnit(value: string | number, defaultUnit: string = 'px') {
+        if (!value)
+            return "";
+        if (XEUtils.isNumber(value) || XEUtils.isStringNumber(value)) {
+            return `${value}${defaultUnit}`;
+        } else if (XEUtils.isString(value)) {
+            return value;
+        }
+    },
+    treeSearch,
+    eachAndReturnList<T = any>(list: T[] | Ref<T[]> | number, iteration: (item: T, index: number) => any) {
+        const temp: any[] = []
+        if (XEUtils.isNumber(list)) {
+            for (let i = 0; i < list; i++) {
+                temp.push(iteration(i as T, i))
             }
-            return temp;
-        },
-        noop: () => {
-        },
-        cloneDeep(value: any) {
-            return XEUtils.clone(value, true)
-        },
-    })
+        } else {
+            XEUtils.arrayEach(unref(list), (item, index) => {
+                temp.push(iteration(item, index))
+            })
+        }
+        return temp;
+    },
+    noop: () => {
+    },
+    cloneDeep(value: any, deep = true) {
+        return XEUtils.clone(value, deep)
+    },
+}
+
+class XEUtilsMixinClass {
+    Return = mixin
 }
 
+type XEUtilsMixinType = XEUtilsMixinClass['Return']
+
+declare module "xe-utils/ctor.d.ts" {
+    interface XEUtilsMethods extends XEUtilsMixinType {
+    }
+}
 
 function initVxeConfig() {
     addVxeTableFormats()
-    addVxeUtils()
+    XEUtils.mixin(mixin)
 }
 
 export default initVxeConfig

src/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr-editor/emr-editor-mounted.ts

@@ -75,8 +75,6 @@ const yibaozifeixiangmutongyishu = (editor: { getNodes: (arg0: string) => { targ
 
     ];
     component.setValue(temp)
-
-
 }
 
 editFunc.set('yibaozifeixiangmutongyishu', yibaozifeixiangmutongyishu)

tsconfig.json

@@ -37,7 +37,6 @@
     "src/**/*.d.ts",
     "src/**/*.tsx",
     "src/**/*.vue",
-    "src/types/global.d.ts"
   ],
   "references": [
     {