@baosight/erm 1.0.55 → 1.0.57

package/lib/index.common.js

@@ -39909,26 +39909,35 @@ const __exports__ = /*#__PURE__*/(0,exportHelper/* default */.Z)(script, [['rend
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js!./node_modules/ts-loader/index.js??clonedRuleSet-41.use[2]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./packages/ermList/ermList.vue?vue&type=script&lang=ts&setup=true
 
 
-const ermListvue_type_script_lang_ts_setup_true_withScopeId = n => (_pushScopeId("data-v-69f08f9e"), n = n(), _popScopeId(), n);
+const ermListvue_type_script_lang_ts_setup_true_withScopeId = n => (_pushScopeId("data-v-99b5b5a0"), n = n(), _popScopeId(), n);
 const ermListvue_type_script_lang_ts_setup_true_hoisted_1 = {
   key: 0,
   class: "mainTitle"
 };
 const ermListvue_type_script_lang_ts_setup_true_hoisted_2 = ["onClick"];
 const ermListvue_type_script_lang_ts_setup_true_hoisted_3 = {
-  class: "rowContent"
+  key: 0,
+  class: "leftArea"
 };
-const ermListvue_type_script_lang_ts_setup_true_hoisted_4 = {
+const ermListvue_type_script_lang_ts_setup_true_hoisted_4 = ["src", "onClick", "onMousedown", "onMouseup", "onTouchstart", "onTouchend"];
+const _hoisted_5 = ["onClick"];
+const _hoisted_6 = {
+  key: 1,
+  class: "rightArea"
+};
+const _hoisted_7 = ["src", "onClick", "onMousedown", "onMouseup", "onTouchstart", "onTouchend"];
+const _hoisted_8 = ["onClick"];
+const _hoisted_9 = {
   key: 0,
   class: "leftArea"
 };
-const _hoisted_5 = ["src", "onClick", "onMousedown", "onMouseup", "onTouchstart", "onTouchend"];
-const _hoisted_6 = ["onClick"];
-const _hoisted_7 = {
+const _hoisted_10 = ["src", "onClick", "onMousedown", "onMouseup", "onTouchstart", "onTouchend"];
+const _hoisted_11 = ["onClick"];
+const _hoisted_12 = {
   key: 1,
   class: "rightArea"
 };
-const _hoisted_8 = ["src", "onClick", "onMousedown", "onMouseup", "onTouchstart", "onTouchend"];
+const _hoisted_13 = ["src", "onClick", "onMousedown", "onMouseup", "onTouchstart", "onTouchend"];
 
 
 
@@ -40043,7 +40052,7 @@ const _hoisted_8 = ["src", "onClick", "onMousedown", "onMouseup", "onTouchstart"
     },
     /**
     * 多选模式
-    * @type {Boolean}
+    * @type {String}
     */
     selectMode: {
       type: String,
@@ -40080,6 +40089,14 @@ const _hoisted_8 = ["src", "onClick", "onMousedown", "onMouseup", "onTouchstart"
     rightSwiperDelete: {
       type: Boolean,
       default: false
+    },
+    /**
+    * 显示模式 list|card
+    * @type {String}
+    */
+    viewType: {
+      type: String,
+      default: 'list'
     }
   },
   emits: ['leftIconClick', 'mainClick', 'rightIconClick', 'leftIconHold', 'rightIconHold', 'pullRefresh', 'pullUpdate'],
@@ -40087,6 +40104,8 @@ const _hoisted_8 = ["src", "onClick", "onMousedown", "onMouseup", "onTouchstart"
     expose: __expose,
     emit: __emit
   }) {
+    const activeNames = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.ref)(['1']);
+    //#region 组件属性
     const props = __props;
     //#endregion
     //#region 组件事件
@@ -40097,7 +40116,8 @@ const _hoisted_8 = ["src", "onClick", "onMousedown", "onMouseup", "onTouchstart"
       endLoad,
       selectAll,
       selectNone,
-      getSelectedRows
+      getSelectedRows,
+      getTableName
     });
     //#endregion
     //#region 单记录高度设置
@@ -40131,36 +40151,69 @@ const _hoisted_8 = ["src", "onClick", "onMousedown", "onMouseup", "onTouchstart"
     //#region 显示字段配置
     //显示字段项接口itemConfig 
     const itemConfigs = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.ref)([]);
-    //调用后台查询itemConfigs 
-    async function getItemConfig() {
+    //#region initSvc()
+    var retTable = {};
+    var mergeCols = [];
+    async function initSvc() {
       console.log('erm初始化---formName ', props.formName);
       console.log('erm初始化---functionId ', props.functionId);
       console.log('erm初始化---initSvc ', props.initSvc);
+      retTable = {};
       const eiInfo = new ei.EI.EIInfo();
       const eiBlock = eiInfo.addBlock(new ei.EI.EiBlock(), '');
       eiBlock.pushData({
-        TYPE: 'FORM',
+        DEFAULT_COMPANY_CODE: 'BS',
         FORM_NAME: props.formName,
-        FUNCTION_ID: props.functionId
+        TYPE_CODE: "Web",
+        FUNCTION_IDS: props.functionId,
+        DATASET_NAME: "#",
+        TABLE_NAMES: ""
       }, true);
-      ei.EIManager.callService('', props.initSvc, eiInfo).then(res => {
-        itemConfigs.value = res.blocks["Table0"].data;
-        itemConfigs.value.forEach(element => {
-          if (element.HEAD_TEXTCOLOR.trim() !== "") {
-            var color = element.HEAD_TEXTCOLOR.trim();
+      console.log('eiblk', eiBlock);
+      await ei.EIManager.callService('', props.initSvc, eiInfo).then(res => {
+        if (res.sys.status !== 0) {
+          console.log(res.sys.msg);
+          return;
+        }
+        retTable = res.blocks;
+        console.log('ret', retTable);
+        var item_config = retTable["TSI00GRIDCOLUMN"].data;
+        const tsi00gridview = retTable["TSI00GRIDVIEW"].data;
+        const tsi00datatable = retTable["TSI00DATATABLE"].data;
+        const datasetName = tsi00gridview[0].DATASET_NAME;
+        const tableName = tsi00gridview[0].TABLE_NAME;
+        item_config.forEach(item => {
+          //字体颜色处理
+          if (item.HEAD_TEXTCOLOR.trim() !== "" || item.HEAD_TEXTCOLOR.trim() !== "16777215") {
+            var color = item.HEAD_TEXTCOLOR.trim();
             color = '#' + (Number(color) + 16777216).toString(16).padStart(6, '0');
-            element.HEAD_TEXTCOLOR = color;
+            item.HEAD_TEXTCOLOR = color;
           } else {
-            element.HEAD_TEXTCOLOR = '#000000';
+            item.HEAD_TEXTCOLOR = '#000000';
           }
-          if (element.CELL_TEXTCOLOR.trim() !== "") {
-            var color = element.CELL_TEXTCOLOR.trim();
+          if (item.CELL_TEXTCOLOR.trim() !== "" || item.CELL_TEXTCOLOR.trim() !== "16777215") {
+            var color = item.CELL_TEXTCOLOR.trim();
             color = '#' + (Number(color) + 16777216).toString(16).padStart(6, '0');
-            element.CELL_TEXTCOLOR = color;
+            item.CELL_TEXTCOLOR = color;
           } else {
-            element.HEAD_TEXTCOLOR = '#000000';
+            item.CELL_TEXTCOLOR = '#000000';
           }
+          //tsi00gridview
+          item.DATASET_NAME = datasetName;
+          item.TABLE_NAME = tableName;
+          item.DATA_TYPE = "";
+          //tsi00datatable
+          tsi00datatable.forEach(item2 => {
+            if (item.FIELD_NAME === item2.COL_NAME) {
+              item.DATA_TYPE = item2.DATA_TYPE;
+            }
+          });
         });
+        itemConfigs.value = item_config;
+        mergeCols = tsi00gridview[0].MERGE_COLUMN.split(',').filter(item => item != ' ' && item != '');
+        console.log('mergeCols', mergeCols);
+        console.log('yon', mergeCols.includes('AGEa'));
+        //获取小代码
       });
     }
     //#endregion
@@ -40321,9 +40374,14 @@ const _hoisted_8 = ["src", "onClick", "onMousedown", "onMouseup", "onTouchstart"
       immediate: true
     });
     //#endregion
+    //#region getTableName()获取配置表名
+    function getTableName() {
+      return retTable["TSI00GRIDVIEW"].data[0].TABLE_NAME;
+    }
+    //#endregion
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.onMounted)(() => {
       setSize();
-      getItemConfig();
+      initSvc();
     });
     return (_ctx, _cache) => {
       const _component_van_button = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.resolveComponent)("van-button");
@@ -40333,15 +40391,17 @@ const _hoisted_8 = ["src", "onClick", "onMousedown", "onMouseup", "onTouchstart"
       const _component_van_swipe_cell = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.resolveComponent)("van-swipe-cell");
       const _component_van_checkbox_group = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.resolveComponent)("van-checkbox-group");
       const _component_van_list = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.resolveComponent)("van-list");
+      const _component_van_collapse_item = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.resolveComponent)("van-collapse-item");
+      const _component_van_collapse = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.resolveComponent)("van-collapse");
       const _component_van_pull_refresh = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.resolveComponent)("van-pull-refresh");
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementBlock)(external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.Fragment, null, [__props.mainTitle && __props.mainTitle !== '' ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementBlock)("div", ermListvue_type_script_lang_ts_setup_true_hoisted_1, (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.toDisplayString)(__props.mainTitle), 1)) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createCommentVNode)("", true), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createVNode)(_component_van_pull_refresh, {
         class: "pullRefresh",
         modelValue: loadingTop.value,
-        "onUpdate:modelValue": _cache[3] || (_cache[3] = $event => loadingTop.value = $event),
+        "onUpdate:modelValue": _cache[7] || (_cache[7] = $event => loadingTop.value = $event),
         disabled: __props.pullDisabled,
-        onRefresh: _cache[4] || (_cache[4] = $event => _ctx.$emit('pullRefresh'))
+        onRefresh: _cache[8] || (_cache[8] = $event => _ctx.$emit('pullRefresh'))
       }, {
-        default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [itemConfigs.value.length > 0 && __props.data.length > 0 ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createBlock)(_component_van_list, {
+        default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [itemConfigs.value.length > 0 && __props.data.length > 0 && (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.unref)(mergeCols).length === 0 ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createBlock)(_component_van_list, {
           key: 0,
           loading: loadingBottom.value,
           "onUpdate:loading": _cache[1] || (_cache[1] = $event => loadingBottom.value = $event),
@@ -40398,7 +40458,12 @@ const _hoisted_8 = ["src", "onClick", "onMousedown", "onMouseup", "onTouchstart"
                   class: "swiperButton",
                   onClick: $event => rightDeleteClick(idx1)
                 }, null, 8, ["onClick"])) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createCommentVNode)("", true)])]),
-                default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementVNode)("div", ermListvue_type_script_lang_ts_setup_true_hoisted_3, [__props.showLeft || (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.unref)(showSelectInner) ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementBlock)("div", ermListvue_type_script_lang_ts_setup_true_hoisted_4, [!(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.unref)(showSelectInner) ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.renderSlot)(_ctx.$slots, "leftArea", {
+                default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementVNode)("div", {
+                  class: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.normalizeClass)({
+                    rowContent: props.viewType === 'list',
+                    rowContentCard: props.viewType === 'card'
+                  })
+                }, [__props.showLeft || (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.unref)(showSelectInner) ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementBlock)("div", ermListvue_type_script_lang_ts_setup_true_hoisted_3, [!(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.unref)(showSelectInner) ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.renderSlot)(_ctx.$slots, "leftArea", {
                   key: 0,
                   data: {
                     item: item1,
@@ -40412,7 +40477,7 @@ const _hoisted_8 = ["src", "onClick", "onMousedown", "onMouseup", "onTouchstart"
                   onMouseup: $event => mouseUpLeft(item1),
                   onTouchstart: $event => mouseDownLeft(item1),
                   onTouchend: $event => mouseUpLeft(item1)
-                }, null, 44, _hoisted_5)]) : ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createBlock)(_component_van_checkbox, {
+                }, null, 44, ermListvue_type_script_lang_ts_setup_true_hoisted_4)]) : ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createBlock)(_component_van_checkbox, {
                   key: 1,
                   onClick: $event => rowClick(item1, idx1),
                   name: item1
@@ -40439,7 +40504,7 @@ const _hoisted_8 = ["src", "onClick", "onMousedown", "onMouseup", "onTouchstart"
                     }, 1032, ["style"])]),
                     _: 2
                   }, 1024);
-                }), 256))], 8, _hoisted_6), __props.showRight ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementBlock)("div", _hoisted_7, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.renderSlot)(_ctx.$slots, "rightArea", {
+                }), 256))], 8, _hoisted_5), __props.showRight ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementBlock)("div", _hoisted_6, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.renderSlot)(_ctx.$slots, "rightArea", {
                   data: {
                     item: item1,
                     index: idx1
@@ -40453,15 +40518,187 @@ const _hoisted_8 = ["src", "onClick", "onMousedown", "onMouseup", "onTouchstart"
                   onMouseup: $event => mouseUpRight(item1),
                   onTouchstart: $event => mouseDownRight(item1),
                   onTouchend: $event => mouseUpRight(item1)
-                }, null, 44, _hoisted_8)])])) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createCommentVNode)("", true)])]),
+                }, null, 44, _hoisted_7)])])) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createCommentVNode)("", true)], 2)]),
                 _: 2
               }, 1024)], 10, ermListvue_type_script_lang_ts_setup_true_hoisted_2);
             }), 256))]),
             _: 3
           }, 8, ["modelValue"])]),
           _: 3
+        }, 8, ["loading", "finished"])) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createCommentVNode)("", true), itemConfigs.value.length > 0 && __props.data.length > 0 && (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.unref)(mergeCols).length > 0 ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createBlock)(_component_van_list, {
+          key: 1,
+          loading: loadingBottom.value,
+          "onUpdate:loading": _cache[5] || (_cache[5] = $event => loadingBottom.value = $event),
+          style: {
+            "min-height": "200px"
+          },
+          onLoad: _cache[6] || (_cache[6] = $event => _ctx.$emit('pullUpdate')),
+          "immediate-check": true,
+          finished: __props.pullDownDisabled
+        }, {
+          default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createVNode)(_component_van_checkbox_group, {
+            modelValue: checked.value,
+            "onUpdate:modelValue": _cache[4] || (_cache[4] = $event => checked.value = $event),
+            ref_key: "checkBoxGroup",
+            ref: checkBoxGroup
+          }, {
+            default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createVNode)(_component_van_collapse, {
+              modelValue: activeNames.value,
+              "onUpdate:modelValue": _cache[3] || (_cache[3] = $event => activeNames.value = $event),
+              "lazy-render": "false"
+            }, {
+              default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(true), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementBlock)(external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.Fragment, null, (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.renderList)(__props.data, (item1, idx1) => {
+                return (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementBlock)("div", {
+                  class: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.normalizeClass)({
+                    selected: checked.value.indexOf(item1) >= 0
+                  }),
+                  onClick: $event => rowClick(item1, idx1)
+                }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createVNode)(_component_van_swipe_cell, null, {
+                  left: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.renderSlot)(_ctx.$slots, "leftButton", {
+                    data: {
+                      item: item1,
+                      index: idx1
+                    }
+                  }, () => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.unref)(leftSwiperSelectFlag) && !(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.unref)(showSelectInner) ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createBlock)(_component_van_button, {
+                    key: 0,
+                    square: "",
+                    type: "primary",
+                    text: "开启多选",
+                    class: "swiperButton",
+                    onClick: leftSelectOpen
+                  })) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createCommentVNode)("", true), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.unref)(leftSwiperSelectFlag) && (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.unref)(showSelectInner) ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createBlock)(_component_van_button, {
+                    key: 1,
+                    square: "",
+                    type: "primary",
+                    text: "取消多选",
+                    class: "swiperButton",
+                    onClick: leftSelectClose
+                  })) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createCommentVNode)("", true)])]),
+                  right: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.renderSlot)(_ctx.$slots, "rightButton", {
+                    data: {
+                      item: item1,
+                      index: idx1
+                    }
+                  }, () => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.unref)(rightSwiperDeleteFlag) ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createBlock)(_component_van_button, {
+                    key: 0,
+                    square: "",
+                    type: "danger",
+                    text: "删除",
+                    class: "swiperButton",
+                    onClick: $event => rightDeleteClick(idx1)
+                  }, null, 8, ["onClick"])) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createCommentVNode)("", true)])]),
+                  default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementVNode)("div", {
+                    id: "列表",
+                    class: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.normalizeClass)({
+                      rowContent: props.viewType === 'list',
+                      rowContentCard: props.viewType === 'card'
+                    })
+                  }, [__props.showLeft || (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.unref)(showSelectInner) ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementBlock)("div", _hoisted_9, [!(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.unref)(showSelectInner) ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.renderSlot)(_ctx.$slots, "leftArea", {
+                    key: 0,
+                    data: {
+                      item: item1,
+                      index: idx1
+                    }
+                  }, () => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementVNode)("img", {
+                    src: getAssetsImage(__props.leftIconUrl),
+                    style: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.normalizeStyle)('height:' + __props.leftIconSize[1] + ';width:' + __props.leftIconSize[0]),
+                    onClick: $event => _ctx.$emit('leftIconClick', item1),
+                    onMousedown: $event => mouseDownLeft(item1),
+                    onMouseup: $event => mouseUpLeft(item1),
+                    onTouchstart: $event => mouseDownLeft(item1),
+                    onTouchend: $event => mouseUpLeft(item1)
+                  }, null, 44, _hoisted_10)]) : ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createBlock)(_component_van_checkbox, {
+                    key: 1,
+                    onClick: $event => rowClick(item1, idx1),
+                    name: item1
+                  }, null, 8, ["onClick", "name"]))])) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createCommentVNode)("", true), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createVNode)(_component_van_collapse_item, {
+                    name: idx1,
+                    style: {
+                      "width": "100%"
+                    },
+                    onClick: $event => {
+                      console.log('van-collapse-itemccc');
+                      rowClick(item1, idx1);
+                    }
+                  }, {
+                    title: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementVNode)("div", null, [((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(true), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementBlock)(external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.Fragment, null, (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.renderList)(itemConfigs.value, (item2, idx2) => {
+                      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createBlock)(_component_van_row, null, {
+                        default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.unref)(mergeCols).includes(item2.ITEM_CODE) ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementBlock)(external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.Fragment, {
+                          key: 0
+                        }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createVNode)(_component_van_col, {
+                          class: "singleRow colDesc",
+                          style: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.normalizeStyle)('color:' + item2.HEAD_TEXTCOLOR),
+                          span: "8"
+                        }, {
+                          default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createTextVNode)((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.toDisplayString)(item2.COL_CAPTION) + ":", 1)]),
+                          _: 2
+                        }, 1032, ["style"]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createVNode)(_component_van_col, {
+                          class: "singleRow colData",
+                          style: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.normalizeStyle)('color:' + item2.CELL_TEXTCOLOR),
+                          offset: "0",
+                          span: "16"
+                        }, {
+                          default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createTextVNode)((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.toDisplayString)(__props.data[idx1][item2.ITEM_CODE]), 1)]),
+                          _: 2
+                        }, 1032, ["style"])], 64)) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createCommentVNode)("", true)]),
+                        _: 2
+                      }, 1024);
+                    }), 256))])]),
+                    default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementVNode)("div", {
+                      class: "mainContent",
+                      onClick: $event => {
+                        _ctx.$emit('mainClick', item1);
+                        rowClick(item1, idx1);
+                      }
+                    }, [((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(true), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementBlock)(external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.Fragment, null, (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.renderList)(itemConfigs.value, (item2, idx2) => {
+                      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createBlock)(_component_van_row, null, {
+                        default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [!(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.unref)(mergeCols).includes(item2.ITEM_CODE) ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementBlock)(external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.Fragment, {
+                          key: 0
+                        }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createVNode)(_component_van_col, {
+                          class: "singleRow colDesc",
+                          style: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.normalizeStyle)('color:' + item2.HEAD_TEXTCOLOR),
+                          span: "8"
+                        }, {
+                          default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createTextVNode)((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.toDisplayString)(item2.COL_CAPTION) + ":", 1)]),
+                          _: 2
+                        }, 1032, ["style"]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createVNode)(_component_van_col, {
+                          class: "singleRow colData",
+                          style: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.normalizeStyle)('color:' + item2.CELL_TEXTCOLOR),
+                          offset: "0",
+                          span: "16"
+                        }, {
+                          default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createTextVNode)((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.toDisplayString)(__props.data[idx1][item2.ITEM_CODE]), 1)]),
+                          _: 2
+                        }, 1032, ["style"])], 64)) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createCommentVNode)("", true)]),
+                        _: 2
+                      }, 1024);
+                    }), 256))], 8, _hoisted_11)]),
+                    _: 2
+                  }, 1032, ["name", "onClick"]), __props.showRight ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementBlock)("div", _hoisted_12, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.renderSlot)(_ctx.$slots, "rightArea", {
+                    data: {
+                      item: item1,
+                      index: idx1
+                    }
+                  }, () => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementVNode)("img", {
+                    class: "rightIcon",
+                    src: getAssetsImage(__props.rightIconUrl),
+                    style: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.normalizeStyle)('height:' + __props.rightIconSize[1] + ';width:' + __props.rightIconSize[0]),
+                    onClick: $event => _ctx.$emit('rightIconClick', item1),
+                    onMousedown: $event => mouseDownRight(item1),
+                    onMouseup: $event => mouseUpRight(item1),
+                    onTouchstart: $event => mouseDownRight(item1),
+                    onTouchend: $event => mouseUpRight(item1)
+                  }, null, 44, _hoisted_13)])])) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createCommentVNode)("", true)], 2)]),
+                  _: 2
+                }, 1024)], 10, _hoisted_8);
+              }), 256))]),
+              _: 3
+            }, 8, ["modelValue"])]),
+            _: 3
+          }, 8, ["modelValue"])]),
+          _: 3
         }, 8, ["loading", "finished"])) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createCommentVNode)("", true), itemConfigs.value.length === 0 || __props.data.length === 0 ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createBlock)(NoData, {
-          key: 1
+          key: 2
         })) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createCommentVNode)("", true)]),
         _: 3
       }, 8, ["modelValue", "disabled"])], 64);
@@ -40470,10 +40707,10 @@ const _hoisted_8 = ["src", "onClick", "onMousedown", "onMouseup", "onTouchstart"
 }));
 ;// CONCATENATED MODULE: ./packages/ermList/ermList.vue?vue&type=script&lang=ts&setup=true
  
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./packages/ermList/ermList.vue?vue&type=style&index=0&id=69f08f9e&lang=scss&scoped=true
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./packages/ermList/ermList.vue?vue&type=style&index=0&id=99b5b5a0&lang=scss&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./packages/ermList/ermList.vue?vue&type=style&index=0&id=69f08f9e&lang=scss&scoped=true
+;// CONCATENATED MODULE: ./packages/ermList/ermList.vue?vue&type=style&index=0&id=99b5b5a0&lang=scss&scoped=true
 
 ;// CONCATENATED MODULE: ./packages/ermList/ermList.vue
 
@@ -40482,7 +40719,7 @@ const _hoisted_8 = ["src", "onClick", "onMousedown", "onMouseup", "onTouchstart"
 ;
 
 
-const ermList_exports_ = /*#__PURE__*/(0,exportHelper/* default */.Z)(ermListvue_type_script_lang_ts_setup_true, [['__scopeId',"data-v-69f08f9e"]])
+const ermList_exports_ = /*#__PURE__*/(0,exportHelper/* default */.Z)(ermListvue_type_script_lang_ts_setup_true, [['__scopeId',"data-v-99b5b5a0"]])
 
 /* harmony default export */ const ermList = (ermList_exports_);
 ;// CONCATENATED MODULE: ./packages/utils/utils.ts
@@ -41286,7 +41523,7 @@ const MobileButtonEdit_exports_ = MobileButtonEditvue_type_script_lang_ts_setup_
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js!./node_modules/ts-loader/index.js??clonedRuleSet-41.use[2]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./packages/ermForm/ermForm.vue?vue&type=script&lang=ts&setup=true
 
 
-const ermFormvue_type_script_lang_ts_setup_true_withScopeId = n => (_pushScopeId("data-v-39d06794"), n = n(), _popScopeId(), n);
+const ermFormvue_type_script_lang_ts_setup_true_withScopeId = n => (_pushScopeId("data-v-5af4bea8"), n = n(), _popScopeId(), n);
 const ermFormvue_type_script_lang_ts_setup_true_hoisted_1 = {
   key: 0,
   class: "mainTitle"
@@ -41312,6 +41549,7 @@ const ermFormvue_type_script_lang_ts_setup_true_hoisted_5 = {
 
 
 
+//显示字段项表itemConfigs 
 /* harmony default export */ const ermFormvue_type_script_lang_ts_setup_true = (/*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.defineComponent)({
   __name: 'ermForm',
   props: {
@@ -41373,7 +41611,9 @@ const ermFormvue_type_script_lang_ts_setup_true_hoisted_5 = {
       addRow,
       checkRequireInput,
       resetData,
-      getGridCellData
+      getGridCellData,
+      mergeDataRow,
+      getTableName
     });
     //#endregion
     //#region 单记录高度设置
@@ -41420,37 +41660,84 @@ const ermFormvue_type_script_lang_ts_setup_true_hoisted_5 = {
     }, {
       deep: true
     });
-    //调用后台查询itemConfigs 
-    async function getItemConfig() {
-      const eiInfo = new ei.EI.EIInfo();
-      const eiBlock = eiInfo.addBlock(new ei.EI.EiBlock(), '');
+    //#region initSvc()
+    var retTable = {};
+    async function initSvc() {
       console.log('erm初始化---formName ', props.formName);
       console.log('erm初始化---functionId ', props.functionId);
       console.log('erm初始化---initSvc ', props.initSvc);
+      retTable = {};
+      const eiInfo = new ei.EI.EIInfo();
+      const eiBlock = eiInfo.addBlock(new ei.EI.EiBlock(), '');
       eiBlock.pushData({
-        TYPE: 'FORM',
+        DEFAULT_COMPANY_CODE: ei.EP.Environment.companyCode,
         FORM_NAME: props.formName,
-        FUNCTION_ID: props.functionId
+        TYPE_CODE: "Web",
+        FUNCTION_IDS: props.functionId,
+        DATASET_NAME: "#",
+        TABLE_NAMES: ""
       }, true);
-      ei.EIManager.callService('', props.initSvc, eiInfo).then(res => {
-        itemConfigs.value = res.blocks["Table0"].data;
-        itemConfigs.value.forEach(element => {
-          if (element.HEAD_TEXTCOLOR.trim() !== "") {
-            var color = element.HEAD_TEXTCOLOR.trim();
+      console.log('eiblk', eiBlock);
+      await ei.EIManager.callService('', props.initSvc, eiInfo).then(res => {
+        if (res.sys.status !== 0) {
+          console.log(res.sys.msg);
+          return;
+        }
+        retTable = res.blocks;
+        console.log('ret', retTable);
+        //获取小代码
+        codeSets.value = retTable;
+        var item_config = retTable["TSI00GRIDCOLUMN"].data;
+        const tsi00gridview = retTable["TSI00GRIDVIEW"].data;
+        const tsi00datatable = retTable["TSI00DATATABLE"].data;
+        const datasetName = tsi00gridview[0].DATASET_NAME;
+        const tableName = tsi00gridview[0].TABLE_NAME;
+        item_config.forEach(item => {
+          //字体颜色处理
+          if (item.HEAD_TEXTCOLOR.trim() !== "" || item.HEAD_TEXTCOLOR.trim() !== "16777215") {
+            var color = item.HEAD_TEXTCOLOR.trim();
             color = '#' + (Number(color) + 16777216).toString(16).padStart(6, '0');
-            element.HEAD_TEXTCOLOR = color;
+            item.HEAD_TEXTCOLOR = color;
           } else {
-            element.HEAD_TEXTCOLOR = '#000000';
+            item.HEAD_TEXTCOLOR = '#000000';
           }
-          if (element.CELL_TEXTCOLOR.trim() !== "") {
-            var color = element.CELL_TEXTCOLOR.trim();
+          if (item.CELL_TEXTCOLOR.trim() !== "" || item.CELL_TEXTCOLOR.trim() !== "16777215") {
+            var color = item.CELL_TEXTCOLOR.trim();
             color = '#' + (Number(color) + 16777216).toString(16).padStart(6, '0');
-            element.CELL_TEXTCOLOR = color;
+            item.CELL_TEXTCOLOR = color;
           } else {
-            element.HEAD_TEXTCOLOR = '#000000';
+            item.CELL_TEXTCOLOR = '#000000';
+          }
+          //tsi00gridview
+          item.DATASET_NAME = datasetName;
+          item.TABLE_NAME = tableName;
+          item.DATA_TYPE = "";
+          //tsi00datatable
+          tsi00datatable.forEach(item2 => {
+            if (item.FIELD_NAME === item2.COL_NAME) {
+              item.DATA_TYPE = item2.DATA_TYPE;
+            }
+          });
+          if (item.COLUMN_EDIT === '7') {
+            item.CODE_TABLE_NAME = item.SVC_NAME;
+            if (item.ORIGIN_CODE === "5") {
+              item.CODE_TABLE_NAME = "SI->" + item.CODE_TABLE_NAME;
+            }
+            if (item.ORIGIN_CODE === "6") {
+              item.CODE_TABLE_NAME = "EP->" + item.CODE_TABLE_NAME;
+            }
+            if (item.ORIGIN_CODE === "4") {
+              item.CODE_TABLE_NAME = item.FORM_NAME + item.CODE_TABLE_NAME;
+            }
+            if (item.DISPLAY_MEMBER.trim() === "" || item.VALUE_MEMBER.trim() === "") {
+              item.VALUE_MEMBER = codeSets.value[item.CODE_TABLE_NAME].columns[0].name;
+              item.DISPLAY_MEMBER = codeSets.value[item.CODE_TABLE_NAME].columns[1].name;
+            }
           }
+          console.log('DISPLAY_MEMBER', item.DISPLAY_MEMBER);
+          console.log('VALUE_MEMBER', item.VALUE_MEMBER);
         });
-        addRow();
+        itemConfigs.value = item_config;
       });
     }
     //#endregion
@@ -41490,6 +41777,12 @@ const ermFormvue_type_script_lang_ts_setup_true_hoisted_5 = {
     //#region 默认值规则defaultValueRule()
     function defaultValueRule(str, type) {
       var defaultValue = str.trim();
+      if (str.trim().indexOf("yyyy") > 0) {
+        defaultValue = str.trim().replace('yyyy', 'YYYY');
+      }
+      if (str.trim().indexOf("MMdd") > 0) {
+        defaultValue = str.trim().replace('dd', 'DD');
+      }
       var date = new Date();
       if (defaultValue === '$USER_ID$') {
         return (0,ei.getCurrentUser)().userId;
@@ -41498,7 +41791,7 @@ const ermFormvue_type_script_lang_ts_setup_true_hoisted_5 = {
       } else if (defaultValue === '$USER_NAME$') {
         return (0,ei.getCurrentUser)().userName;
       } else if (defaultValue.toUpperCase().indexOf('YYYY') >= 0 && defaultValue.toUpperCase().indexOf(',ADD') < 0) {
-        var out = moment_default()(date).format(str);
+        var out = moment_default()(date).format(defaultValue);
         return out;
       } else if (defaultValue.toUpperCase().indexOf(',ADDDAYS') > 0) {
         var idx = defaultValue.toUpperCase().indexOf(',ADDDAYS');
@@ -41542,74 +41835,16 @@ const ermFormvue_type_script_lang_ts_setup_true_hoisted_5 = {
       }
     }
     //#endregion
-    //#region 小代码查询
-    const getCodeSets = async (codeInfos, callback) => {
-      var retTable = {};
-      const eiInfo = new ei.EI.EIInfo();
-      const eiBlock = eiInfo.addBlock(new ei.EI.EiBlock(), '');
-      codeInfos.forEach(codeinfo => {
-        eiBlock.pushData({
-          TYPE: "CODE",
-          FORM_NAME: props.formName,
-          QUERY_TYPE: codeinfo.queryType,
-          QUERY_ID: codeinfo.queryId,
-          QUERY_FILTER: codeinfo.queryFilter
-        }, true);
-      });
-      await ei.EIManager.callService('', codeInfos[0].initSvc, eiInfo).then(res => {
-        if (res.sys.status !== 0) {
-          console.log('获取小代码报错', res.msg);
-        }
-        retTable = res.blocks;
-      });
-      await callback(retTable);
-    };
-    async function queryCodeSets() {
-      var codeInfo = [];
-      codeSets.value = {};
-      itemConfigs.value.forEach(itemConfig => {
-        //1 5 SI ->1
-        //2 DATASOURCE ->2
-        //4 CodeSet -> 3
-        //6 EP -> 4
-        var queryType;
-        if (itemConfig.COLUMN_EDIT === '7' || itemConfig.COLUMN_EDIT === 'C') {
-          if (itemConfig.ORIGIN_CODE === '5' || itemConfig.ORIGIN_CODE === '1') {
-            queryType = '1';
-          } else if (itemConfig.ORIGIN_CODE === '2') {
-            queryType = '2';
-          } else if (itemConfig.ORIGIN_CODE === '4') {
-            queryType = '3';
-          } else if (itemConfig.ORIGIN_CODE === '6') {
-            queryType = '4';
-          } else {
-            return;
-          }
-          codeInfo.push({
-            initSvc: props.initSvc,
-            queryType: queryType,
-            queryId: itemConfig.SVC_NAME,
-            queryFilter: itemConfig.FILTER_STRING,
-            displayMember: itemConfig.DISPLAY_MEMBER,
-            valueMember: itemConfig.VALUE_MEMBER,
-            formFilter: itemConfig.FORM_FILTER
-          });
-        }
-      });
-      getCodeSets(codeInfo, ret => {
-        codeSets.value = ret;
-      });
-    }
-    //#endregion
     //#region 下拉框联动
     function codeSetFilter() {
       itemConfigs.value.forEach(itemConfig => {
         if (itemConfig.FORM_FILTER.trim() !== '' && itemConfig.FATHER_FIELD.trim() !== '') {
           var FORM_FILTER = itemConfig.FORM_FILTER.substring(0, itemConfig.FORM_FILTER.indexOf('=')).trim();
-          for (let i = 0; i < codeSets.value[itemConfig.SVC_NAME].data.length; i++) {
-            const element = codeSets.value[itemConfig.SVC_NAME].data[i];
-            codeSets.value[itemConfig.SVC_NAME].data[i].showFlag = true;
-            if (data[0][itemConfig.FATHER_FIELD].toString().trim() !== '' && element[FORM_FILTER] !== data[0][itemConfig.FATHER_FIELD]) {
+          console.log(FORM_FILTER);
+          for (let i = 0; i < codeSets.value[itemConfig.CODE_TABLE_NAME].data.length; i++) {
+            const element = codeSets.value[itemConfig.CODE_TABLE_NAME].data[i];
+            codeSets.value[itemConfig.CODE_TABLE_NAME].data[i].showFlag = true;
+            if (data[0][itemConfig.FATHER_FIELD] !== '' && data[0][itemConfig.FATHER_FIELD] !== ' ' && element[FORM_FILTER] !== data[0][itemConfig.FATHER_FIELD]) {
               element.showFlag = false;
             } else {
               element.showFlag = true;
@@ -41672,14 +41907,39 @@ const ermFormvue_type_script_lang_ts_setup_true_hoisted_5 = {
       });
     }
     //#endregion
+    //#region mergeDataRow 整行赋值
+    function mergeDataRow(idx, objIn) {
+      if (data.length <= idx) {
+        console.log('data中不存在第' + idx + '行数据');
+        return;
+      }
+      for (const key in objIn) {
+        if (objIn.hasOwnProperty(key)) {
+          console.log(`属性名: ${key}, 属性值: ${objIn[key]}`);
+          if (data[idx].hasOwnProperty(key)) {
+            data[idx][key] = objIn[key];
+          }
+        }
+      }
+    }
+    //#endregion
+    //#region getTableName()获取配置表名
+    function getTableName() {
+      return retTable["TSI00GRIDVIEW"].data[0].TABLE_NAME;
+    }
+    //#endregion
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.onMounted)(() => {
-      getItemConfig();
+      initSvc();
+      addRow();
     });
     //itemConfigs变动时处理换行
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.watch)(() => itemConfigs.value, () => {
       (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.nextTick)(() => {
-        queryCodeSets();
+        // queryCodeSets()
         setDescWrap();
+        setTimeout(() => {
+          console.log('codesets--------', codeSets.value);
+        }, 1000);
       });
     }, {
       deep: true
@@ -41748,7 +42008,7 @@ const ermFormvue_type_script_lang_ts_setup_true_hoisted_5 = {
               }, null, 8, ["data", "type", "onInput", "title", "checkFlag", "readOnly"])) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createCommentVNode)("", true), item2.COLUMN_EDIT === '7' ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createBlock)(MobileLookUp, {
                 key: 4,
                 data: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.unref)(data)[idx1][item2.ITEM_CODE],
-                "code-set": codeSets.value[item2.SVC_NAME],
+                "code-set": codeSets.value[item2.CODE_TABLE_NAME],
                 type: item2.FORMAT_STRING,
                 onInput: params => {
                   (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.unref)(data)[idx1][item2.ITEM_CODE] = params;
@@ -41773,10 +42033,10 @@ const ermFormvue_type_script_lang_ts_setup_true_hoisted_5 = {
 }));
 ;// CONCATENATED MODULE: ./packages/ermForm/ermForm.vue?vue&type=script&lang=ts&setup=true
  
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./packages/ermForm/ermForm.vue?vue&type=style&index=0&id=39d06794&lang=scss&scoped=true
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./packages/ermForm/ermForm.vue?vue&type=style&index=0&id=5af4bea8&lang=scss&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./packages/ermForm/ermForm.vue?vue&type=style&index=0&id=39d06794&lang=scss&scoped=true
+;// CONCATENATED MODULE: ./packages/ermForm/ermForm.vue?vue&type=style&index=0&id=5af4bea8&lang=scss&scoped=true
 
 ;// CONCATENATED MODULE: ./packages/ermForm/ermForm.vue
 
@@ -41785,7 +42045,7 @@ const ermFormvue_type_script_lang_ts_setup_true_hoisted_5 = {
 ;
 
 
-const ermForm_exports_ = /*#__PURE__*/(0,exportHelper/* default */.Z)(ermFormvue_type_script_lang_ts_setup_true, [['__scopeId',"data-v-39d06794"]])
+const ermForm_exports_ = /*#__PURE__*/(0,exportHelper/* default */.Z)(ermFormvue_type_script_lang_ts_setup_true, [['__scopeId',"data-v-5af4bea8"]])
 
 /* harmony default export */ const ermForm = (ermForm_exports_);
 ;// CONCATENATED MODULE: ./packages/ermForm/index.ts