woodao-pc-ui 0.0.67 → 0.0.68

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "woodao-pc-ui",
-  "version": "0.0.67",
+  "version": "0.0.68",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/woodao-pc-ui/woodao-pc-ui.common.js

@@ -161309,7 +161309,7 @@ function useEcharts(dom, theme) {
   return instance;
 }
 ;// ./package.json
-var package_namespaceObject = {"rE":"0.0.67"};
+var package_namespaceObject = {"rE":"0.0.68"};
 ;// ./src/setting/index.ts
 
 const primaryColors = (/* unused pure expression or super */ null && (["#409eff", "#13C2C2", "#F5222D", "#722ED1", "#f7acbc", "#ef5b9c", "#bd6758", "#f47920", "#2e3a1f", "#b2d235", "#121a2a", "#6a6da9", "#867892", "#fcaf17", "#76becc", "#1b315e", "#b4532a", "#008792"]));
@@ -172537,11 +172537,11 @@ function BaseFormItemvue_type_template_id_4327caa9_scoped_true_ts_true_render(_c
 // EXTERNAL MODULE: ./node_modules/console-browserify/index.js
 var console_browserify = __webpack_require__(94348);
 var console_browserify_default = /*#__PURE__*/__webpack_require__.n(console_browserify);
-;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Form/SelectBySystemCode.vue?vue&type=template&id=734655ff&scoped=true
+;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Form/SelectBySystemCode.vue?vue&type=template&id=1befe7ba&scoped=true
 
-const SelectBySystemCodevue_type_template_id_734655ff_scoped_true_hoisted_1 = ["title"];
-const SelectBySystemCodevue_type_template_id_734655ff_scoped_true_hoisted_2 = ["title"];
-function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+const SelectBySystemCodevue_type_template_id_1befe7ba_scoped_true_hoisted_1 = ["title"];
+const SelectBySystemCodevue_type_template_id_1befe7ba_scoped_true_hoisted_2 = ["title"];
+function SelectBySystemCodevue_type_template_id_1befe7ba_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_el_option = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-option");
   const _component_el_select = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-select");
   const _component_vxe_option = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("vxe-option");
@@ -172556,8 +172556,8 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
     size: $props.size || 'small',
     filterable: $props.filterable || true,
     clearable: $props.clearable || true,
-    modelValue: $props.item.value,
-    "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => $props.item.value = $event),
+    modelValue: $options.computedValue,
+    "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => $options.computedValue = $event),
     disabled: $props.disabled || $props.readonly,
     onChange: $options.change,
     onVisibleChange: $options.getData,
@@ -172576,15 +172576,15 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
           },
           class: "custom-option",
           title: item.keyName
-        }, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)(item.keyName), 9, SelectBySystemCodevue_type_template_id_734655ff_scoped_true_hoisted_1)]),
+        }, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)(item.keyName), 9, SelectBySystemCodevue_type_template_id_1befe7ba_scoped_true_hoisted_1)]),
         _: 2
       }, 1032, ["value", "label"]);
     }), 128))]),
     _: 1
   }, 8, ["popper-append-to-body", "multiple", "size", "filterable", "clearable", "modelValue", "disabled", "onChange", "onVisibleChange", "placeholder"])) : ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_vxe_select, {
     key: 1,
-    modelValue: $props.item.value,
-    "onUpdate:modelValue": _cache[1] || (_cache[1] = $event => $props.item.value = $event),
+    modelValue: $options.computedValue,
+    "onUpdate:modelValue": _cache[1] || (_cache[1] = $event => $options.computedValue = $event),
     multiple: $props.multiple,
     size: $props.size || 'small',
     filterable: $props.filterable || true,
@@ -172610,14 +172610,14 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
           },
           class: "custom-option",
           title: item.keyName
-        }, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)(item.keyName), 9, SelectBySystemCodevue_type_template_id_734655ff_scoped_true_hoisted_2)]),
+        }, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)(item.keyName), 9, SelectBySystemCodevue_type_template_id_1befe7ba_scoped_true_hoisted_2)]),
         _: 2
       }, 1032, ["value", "label"]);
     }), 128))]),
     _: 1
   }, 8, ["modelValue", "multiple", "size", "filterable", "clearable", "disabled", "onChange", "onVisibleChange", "placeholder"]));
 }
-;// ./src/package/Form/SelectBySystemCode.vue?vue&type=template&id=734655ff&scoped=true
+;// ./src/package/Form/SelectBySystemCode.vue?vue&type=template&id=1befe7ba&scoped=true
 
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Form/SelectBySystemCode.vue?vue&type=script&lang=js
 
@@ -172627,9 +172627,28 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
   name: "selectBySystemCode",
   data() {
     return {
-      selectList: []
+      selectList: [],
+      currentValue: ''
     };
   },
+  computed: {
+    // 计算当前值，支持两种绑定方式
+    computedValue: {
+      get() {
+        // 如果bindValue有值，优先使用bindValue
+        if (this.bindValue !== undefined && this.bindValue !== null && this.bindValue !== '') {
+          return this.bindValue;
+        }
+        // 否则使用item.value
+        return this.item.value || '';
+      },
+      set(val) {
+        this.currentValue = val;
+        // 同时更新item.value
+        this.item.value = val;
+      }
+    }
+  },
   watch: {
     sysCode(val) {
       if (val != '' && val != undefined && val != null) {
@@ -172647,6 +172666,26 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
         }
         this.getSelectDataByKeyName();
       }
+    },
+    // 监听bindValue变化，用于回显
+    bindValue: {
+      handler(newVal) {
+        if (newVal !== undefined && newVal !== null && newVal !== '') {
+          this.currentValue = newVal;
+          this.item.value = newVal;
+        }
+      },
+      immediate: true
+    },
+    // 监听item变化
+    item: {
+      handler(newVal) {
+        if (newVal && newVal.value !== undefined) {
+          this.currentValue = newVal.value;
+        }
+      },
+      deep: true,
+      immediate: true
     }
   },
   created() {},
@@ -172680,6 +172719,15 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
         successFun: backData => {
           console.log(backData, 'backData');
           this.selectList = backData;
+          // 数据加载完成后，确保回显正确
+          this.$nextTick(() => {
+            if (this.bindValue !== undefined && this.bindValue !== null && this.bindValue !== '') {
+              this.currentValue = this.bindValue;
+              this.item.value = this.bindValue;
+            } else if (this.item && this.item.value !== undefined) {
+              this.currentValue = this.item.value;
+            }
+          });
         }
       });
     },
@@ -172699,6 +172747,15 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
           console.log(backData, 'keyName');
           this.selectList = backData;
           this.$forceUpdate();
+          // 数据加载完成后，确保回显正确
+          this.$nextTick(() => {
+            if (this.bindValue !== undefined && this.bindValue !== null && this.bindValue !== '') {
+              this.currentValue = this.bindValue;
+              this.item.value = this.bindValue;
+            } else if (this.item && this.item.value !== undefined) {
+              this.currentValue = this.item.value;
+            }
+          });
         }
       });
     },
@@ -172714,7 +172771,12 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
       let changeIndex = this.changeIndex;
       if (this.moreSel && val.length == 0 && oldVal[0] != undefined) {
         this.item.value = oldVal.split(",");
+        this.currentValue = oldVal.split(",");
         this.$forceUpdate();
+      } else {
+        // 更新当前值
+        this.currentValue = val;
+        this.item.value = val;
       }
       this.$emit('selectChange', bindItem);
     }
@@ -172794,10 +172856,10 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
 });
 ;// ./src/package/Form/SelectBySystemCode.vue?vue&type=script&lang=js
  
-;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Form/SelectBySystemCode.vue?vue&type=style&index=0&id=734655ff&scoped=true&lang=css
+;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Form/SelectBySystemCode.vue?vue&type=style&index=0&id=1befe7ba&scoped=true&lang=css
 // extracted by mini-css-extract-plugin
 
-;// ./src/package/Form/SelectBySystemCode.vue?vue&type=style&index=0&id=734655ff&scoped=true&lang=css
+;// ./src/package/Form/SelectBySystemCode.vue?vue&type=style&index=0&id=1befe7ba&scoped=true&lang=css
 
 ;// ./src/package/Form/SelectBySystemCode.vue
 
@@ -172807,7 +172869,7 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
 ;
 
 
-const SelectBySystemCode_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(SelectBySystemCodevue_type_script_lang_js, [['render',SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render],['__scopeId',"data-v-734655ff"]])
+const SelectBySystemCode_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(SelectBySystemCodevue_type_script_lang_js, [['render',SelectBySystemCodevue_type_template_id_1befe7ba_scoped_true_render],['__scopeId',"data-v-1befe7ba"]])
 
 /* harmony default export */ var SelectBySystemCode = (SelectBySystemCode_exports_);
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Form/SelectByParentCode.vue?vue&type=template&id=33e25f2c&scoped=true
@@ -174187,15 +174249,15 @@ const BaseFormItem_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(BaseF
 const BaseForm_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(BaseFormvue_type_script_lang_ts, [['render',BaseFormvue_type_template_id_ad37d90c_scoped_true_ts_true_render],['__scopeId',"data-v-ad37d90c"]])
 
 /* harmony default export */ var BaseForm = (BaseForm_exports_);
-;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/BaseGrid.vue?vue&type=template&id=46de1c50&scoped=true
+;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/BaseGrid.vue?vue&type=template&id=1c68729a&scoped=true
 
-function BaseGridvue_type_template_id_46de1c50_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+function BaseGridvue_type_template_id_1c68729a_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_el_input = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-input");
   const _component_el_date_picker = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-date-picker");
   const _component_el_option = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-option");
   const _component_el_select = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-select");
   const _component_select_by_system_code = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("select-by-system-code");
-  const _component_SelectByParentCode = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("SelectByParentCode");
+  const _component_select_by_parent_code = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("select-by-parent-code");
   const _component_selPeople = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("selPeople");
   const _component_vxe_grid = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("vxe-grid");
   return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_vxe_grid, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.mergeProps)({
@@ -174313,28 +174375,38 @@ function BaseGridvue_type_template_id_46de1c50_scoped_true_render(_ctx, _cache,
     sysCodingDrop_edit: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(({
       row,
       column
-    }) => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_select_by_system_code, {
-      sysCode: column.sysCode,
-      item: column,
-      filterable: row.filterable === true,
+    }) => [((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_select_by_system_code, {
+      key: `${row.id}-${column.field}-${_ctx.isEditMode}`,
+      sysCode: column.params.sysCode,
+      item: row,
+      filterable: true,
       bindValue: row[column.field],
-      bindLabel: column.title,
+      bindLabel: row[column.params.childField || column.field + 'Name'],
       isVxeMode: true,
-      onSelectChange: $event => _ctx.handleSelectChange(row, column.field, $event)
-    }, null, 8, ["sysCode", "item", "filterable", "bindValue", "bindLabel", "onSelectChange"])]),
+      onSelectChange: value => {
+        _ctx.saveOldValue(row, column.field);
+        _ctx.selectChangeFun(row, column.field, column);
+        _ctx.handleBatchEdit(row, column.field, row[column.field]);
+      }
+    }, null, 8, ["sysCode", "item", "bindValue", "bindLabel", "onSelectChange"]))]),
     selectByParentCode_edit: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(({
       row,
       column
-    }) => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_SelectByParentCode, {
-      dictCode: column.dictCode,
-      keyCodeOfParent: column.keyCodeOfParent,
-      item: column,
-      filterable: _ctx.item.filterable === true,
+    }) => [((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_select_by_parent_code, {
+      key: `${row.id}-${column.field}-${_ctx.isEditMode}`,
+      dictCode: column.params.dictCode,
+      keyCodeOfParent: column.params.keyCodeOfParent,
+      item: row,
+      filterable: true,
       bindValue: row[column.field],
-      bindLabel: column.title,
+      bindLabel: row[column.params.childField || column.field + 'Name'],
       isVxeMode: true,
-      onSelectChange: $event => _ctx.handleSelectChange(row, column.field, $event)
-    }, null, 8, ["dictCode", "keyCodeOfParent", "item", "filterable", "bindValue", "bindLabel", "onSelectChange"])]),
+      onSelectChange: value => {
+        _ctx.saveOldValue(row, column.field);
+        _ctx.selectChangeFun(row, column.field, column);
+        _ctx.handleBatchEdit(row, column.field, row[column.field]);
+      }
+    }, null, 8, ["dictCode", "keyCodeOfParent", "item", "bindValue", "bindLabel", "onSelectChange"]))]),
     selPeople_edit: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(({
       row,
       column
@@ -174355,7 +174427,7 @@ function BaseGridvue_type_template_id_46de1c50_scoped_true_render(_ctx, _cache,
     };
   })]), 1040, ["onPageChange", "onCellClick", "onCheckboxChange", "onCurrentChange", "onCellMouseenter", "onCellMouseleave", "onCellDblclick"]);
 }
-;// ./src/package/Grid/BaseGrid.vue?vue&type=template&id=46de1c50&scoped=true
+;// ./src/package/Grid/BaseGrid.vue?vue&type=template&id=1c68729a&scoped=true
 
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/BaseGrid.vue?vue&type=script&lang=js
 
@@ -174658,10 +174730,10 @@ function BaseGridvue_type_template_id_46de1c50_scoped_true_render(_ctx, _cache,
 }));
 ;// ./src/package/Grid/BaseGrid.vue?vue&type=script&lang=js
  
-;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/BaseGrid.vue?vue&type=style&index=0&id=46de1c50&scoped=true&lang=css
+;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/BaseGrid.vue?vue&type=style&index=0&id=1c68729a&scoped=true&lang=css
 // extracted by mini-css-extract-plugin
 
-;// ./src/package/Grid/BaseGrid.vue?vue&type=style&index=0&id=46de1c50&scoped=true&lang=css
+;// ./src/package/Grid/BaseGrid.vue?vue&type=style&index=0&id=1c68729a&scoped=true&lang=css
 
 ;// ./src/package/Grid/BaseGrid.vue
 
@@ -174671,7 +174743,7 @@ function BaseGridvue_type_template_id_46de1c50_scoped_true_render(_ctx, _cache,
 ;
 
 
-const BaseGrid_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(BaseGridvue_type_script_lang_js, [['render',BaseGridvue_type_template_id_46de1c50_scoped_true_render],['__scopeId',"data-v-46de1c50"]])
+const BaseGrid_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(BaseGridvue_type_script_lang_js, [['render',BaseGridvue_type_template_id_1c68729a_scoped_true_render],['__scopeId',"data-v-1c68729a"]])
 
 /* harmony default export */ var BaseGrid = (BaseGrid_exports_);
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/GoVxeGrid.vue?vue&type=template&id=5ae8129d&scoped=true

package/woodao-pc-ui/woodao-pc-ui.css

@@ -14,7 +14,7 @@ button[data-v-7aa63542] {
 .user-ul-acl[data-v-10e11efc]{padding:4px 7px 0 7px}.choice-item-com[data-v-10e11efc]{display:flex;align-items:center;border-radius:10px;min-width:70px;float:left;line-height:20px;font-size:13px;list-style:none;margin-right:8px;margin-bottom:4px;border:1px solid #dfdfdf;padding:0 8px}.go-form-row[data-v-10e11efc]{width:100%}.go-form-row .go-label[data-v-10e11efc]{min-width:65px;font-size:14px}.go-form-row .go-content .go-common-list-content[data-v-10e11efc]{line-height:34px}.go-input-acl .go-content[data-v-10e11efc]{overflow:hidden}.go-input-acl .go-content-body[data-v-10e11efc]{position:relative}.go-input-acl .go-content-body .sel-item-container[data-v-10e11efc]{border:var(--d7010f8a);border-radius:4px;color:#515a6e;background-color:var(--2731aee8);height:32px;line-height:30px}.go-input-acl .go-content-body .sel-item-container[data-v-10e11efc]:hover{border:var(--fe2f6c36);background-color:var(--1e39afe0)}.go-input-acl .go-content-body .placeholder[data-v-10e11efc]{color:#a8abb2}.go-input-acl .go-content-body .input-group-addon[data-v-10e11efc]{position:absolute;right:8px;top:4px;color:#666;font-size:14px}
 
 /* 覆盖 el-select 下拉选项的默认样式 */
-[data-v-734655ff] .el-select-dropdown__item {
+[data-v-1befe7ba] .el-select-dropdown__item {
   padding: 8px 20px !important; /* 调整内边距 */
   max-width: 500px !important; /* 设置最大宽度 */
   white-space: normal !important; /* 允许换行 */
@@ -27,7 +27,7 @@ button[data-v-7aa63542] {
 }
 
 /* 鼠标悬停时显示完整内容 */
-[data-v-734655ff] .el-select-dropdown__item:hover {
+[data-v-1befe7ba] .el-select-dropdown__item:hover {
   overflow: visible !important; /* 显示全部内容 */
   white-space: normal !important;
   -webkit-line-clamp: unset !important;

package/woodao-pc-ui/woodao-pc-ui.umd.js

@@ -161309,7 +161309,7 @@ function useEcharts(dom, theme) {
   return instance;
 }
 ;// ./package.json
-var package_namespaceObject = {"rE":"0.0.67"};
+var package_namespaceObject = {"rE":"0.0.68"};
 ;// ./src/setting/index.ts
 
 const primaryColors = (/* unused pure expression or super */ null && (["#409eff", "#13C2C2", "#F5222D", "#722ED1", "#f7acbc", "#ef5b9c", "#bd6758", "#f47920", "#2e3a1f", "#b2d235", "#121a2a", "#6a6da9", "#867892", "#fcaf17", "#76becc", "#1b315e", "#b4532a", "#008792"]));
@@ -172537,11 +172537,11 @@ function BaseFormItemvue_type_template_id_4327caa9_scoped_true_ts_true_render(_c
 // EXTERNAL MODULE: ./node_modules/console-browserify/index.js
 var console_browserify = __webpack_require__(34844);
 var console_browserify_default = /*#__PURE__*/__webpack_require__.n(console_browserify);
-;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-84.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Form/SelectBySystemCode.vue?vue&type=template&id=734655ff&scoped=true
+;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-84.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Form/SelectBySystemCode.vue?vue&type=template&id=1befe7ba&scoped=true
 
-const SelectBySystemCodevue_type_template_id_734655ff_scoped_true_hoisted_1 = ["title"];
-const SelectBySystemCodevue_type_template_id_734655ff_scoped_true_hoisted_2 = ["title"];
-function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+const SelectBySystemCodevue_type_template_id_1befe7ba_scoped_true_hoisted_1 = ["title"];
+const SelectBySystemCodevue_type_template_id_1befe7ba_scoped_true_hoisted_2 = ["title"];
+function SelectBySystemCodevue_type_template_id_1befe7ba_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_el_option = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-option");
   const _component_el_select = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-select");
   const _component_vxe_option = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("vxe-option");
@@ -172556,8 +172556,8 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
     size: $props.size || 'small',
     filterable: $props.filterable || true,
     clearable: $props.clearable || true,
-    modelValue: $props.item.value,
-    "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => $props.item.value = $event),
+    modelValue: $options.computedValue,
+    "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => $options.computedValue = $event),
     disabled: $props.disabled || $props.readonly,
     onChange: $options.change,
     onVisibleChange: $options.getData,
@@ -172576,15 +172576,15 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
           },
           class: "custom-option",
           title: item.keyName
-        }, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)(item.keyName), 9, SelectBySystemCodevue_type_template_id_734655ff_scoped_true_hoisted_1)]),
+        }, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)(item.keyName), 9, SelectBySystemCodevue_type_template_id_1befe7ba_scoped_true_hoisted_1)]),
         _: 2
       }, 1032, ["value", "label"]);
     }), 128))]),
     _: 1
   }, 8, ["popper-append-to-body", "multiple", "size", "filterable", "clearable", "modelValue", "disabled", "onChange", "onVisibleChange", "placeholder"])) : ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_vxe_select, {
     key: 1,
-    modelValue: $props.item.value,
-    "onUpdate:modelValue": _cache[1] || (_cache[1] = $event => $props.item.value = $event),
+    modelValue: $options.computedValue,
+    "onUpdate:modelValue": _cache[1] || (_cache[1] = $event => $options.computedValue = $event),
     multiple: $props.multiple,
     size: $props.size || 'small',
     filterable: $props.filterable || true,
@@ -172610,14 +172610,14 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
           },
           class: "custom-option",
           title: item.keyName
-        }, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)(item.keyName), 9, SelectBySystemCodevue_type_template_id_734655ff_scoped_true_hoisted_2)]),
+        }, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)(item.keyName), 9, SelectBySystemCodevue_type_template_id_1befe7ba_scoped_true_hoisted_2)]),
         _: 2
       }, 1032, ["value", "label"]);
     }), 128))]),
     _: 1
   }, 8, ["modelValue", "multiple", "size", "filterable", "clearable", "disabled", "onChange", "onVisibleChange", "placeholder"]));
 }
-;// ./src/package/Form/SelectBySystemCode.vue?vue&type=template&id=734655ff&scoped=true
+;// ./src/package/Form/SelectBySystemCode.vue?vue&type=template&id=1befe7ba&scoped=true
 
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-84.use[1]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Form/SelectBySystemCode.vue?vue&type=script&lang=js
 
@@ -172627,9 +172627,28 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
   name: "selectBySystemCode",
   data() {
     return {
-      selectList: []
+      selectList: [],
+      currentValue: ''
     };
   },
+  computed: {
+    // 计算当前值，支持两种绑定方式
+    computedValue: {
+      get() {
+        // 如果bindValue有值，优先使用bindValue
+        if (this.bindValue !== undefined && this.bindValue !== null && this.bindValue !== '') {
+          return this.bindValue;
+        }
+        // 否则使用item.value
+        return this.item.value || '';
+      },
+      set(val) {
+        this.currentValue = val;
+        // 同时更新item.value
+        this.item.value = val;
+      }
+    }
+  },
   watch: {
     sysCode(val) {
       if (val != '' && val != undefined && val != null) {
@@ -172647,6 +172666,26 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
         }
         this.getSelectDataByKeyName();
       }
+    },
+    // 监听bindValue变化，用于回显
+    bindValue: {
+      handler(newVal) {
+        if (newVal !== undefined && newVal !== null && newVal !== '') {
+          this.currentValue = newVal;
+          this.item.value = newVal;
+        }
+      },
+      immediate: true
+    },
+    // 监听item变化
+    item: {
+      handler(newVal) {
+        if (newVal && newVal.value !== undefined) {
+          this.currentValue = newVal.value;
+        }
+      },
+      deep: true,
+      immediate: true
     }
   },
   created() {},
@@ -172680,6 +172719,15 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
         successFun: backData => {
           console.log(backData, 'backData');
           this.selectList = backData;
+          // 数据加载完成后，确保回显正确
+          this.$nextTick(() => {
+            if (this.bindValue !== undefined && this.bindValue !== null && this.bindValue !== '') {
+              this.currentValue = this.bindValue;
+              this.item.value = this.bindValue;
+            } else if (this.item && this.item.value !== undefined) {
+              this.currentValue = this.item.value;
+            }
+          });
         }
       });
     },
@@ -172699,6 +172747,15 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
           console.log(backData, 'keyName');
           this.selectList = backData;
           this.$forceUpdate();
+          // 数据加载完成后，确保回显正确
+          this.$nextTick(() => {
+            if (this.bindValue !== undefined && this.bindValue !== null && this.bindValue !== '') {
+              this.currentValue = this.bindValue;
+              this.item.value = this.bindValue;
+            } else if (this.item && this.item.value !== undefined) {
+              this.currentValue = this.item.value;
+            }
+          });
         }
       });
     },
@@ -172714,7 +172771,12 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
       let changeIndex = this.changeIndex;
       if (this.moreSel && val.length == 0 && oldVal[0] != undefined) {
         this.item.value = oldVal.split(",");
+        this.currentValue = oldVal.split(",");
         this.$forceUpdate();
+      } else {
+        // 更新当前值
+        this.currentValue = val;
+        this.item.value = val;
       }
       this.$emit('selectChange', bindItem);
     }
@@ -172794,10 +172856,10 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
 });
 ;// ./src/package/Form/SelectBySystemCode.vue?vue&type=script&lang=js
  
-;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-56.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-56.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-56.use[2]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Form/SelectBySystemCode.vue?vue&type=style&index=0&id=734655ff&scoped=true&lang=css
+;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-56.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-56.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-56.use[2]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Form/SelectBySystemCode.vue?vue&type=style&index=0&id=1befe7ba&scoped=true&lang=css
 // extracted by mini-css-extract-plugin
 
-;// ./src/package/Form/SelectBySystemCode.vue?vue&type=style&index=0&id=734655ff&scoped=true&lang=css
+;// ./src/package/Form/SelectBySystemCode.vue?vue&type=style&index=0&id=1befe7ba&scoped=true&lang=css
 
 ;// ./src/package/Form/SelectBySystemCode.vue
 
@@ -172807,7 +172869,7 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
 ;
 
 
-const SelectBySystemCode_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(SelectBySystemCodevue_type_script_lang_js, [['render',SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render],['__scopeId',"data-v-734655ff"]])
+const SelectBySystemCode_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(SelectBySystemCodevue_type_script_lang_js, [['render',SelectBySystemCodevue_type_template_id_1befe7ba_scoped_true_render],['__scopeId',"data-v-1befe7ba"]])
 
 /* harmony default export */ var SelectBySystemCode = (SelectBySystemCode_exports_);
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-84.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Form/SelectByParentCode.vue?vue&type=template&id=33e25f2c&scoped=true
@@ -174187,15 +174249,15 @@ const BaseFormItem_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(BaseF
 const BaseForm_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(BaseFormvue_type_script_lang_ts, [['render',BaseFormvue_type_template_id_ad37d90c_scoped_true_ts_true_render],['__scopeId',"data-v-ad37d90c"]])
 
 /* harmony default export */ var BaseForm = (BaseForm_exports_);
-;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-84.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/BaseGrid.vue?vue&type=template&id=46de1c50&scoped=true
+;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-84.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/BaseGrid.vue?vue&type=template&id=1c68729a&scoped=true
 
-function BaseGridvue_type_template_id_46de1c50_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+function BaseGridvue_type_template_id_1c68729a_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_el_input = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-input");
   const _component_el_date_picker = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-date-picker");
   const _component_el_option = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-option");
   const _component_el_select = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-select");
   const _component_select_by_system_code = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("select-by-system-code");
-  const _component_SelectByParentCode = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("SelectByParentCode");
+  const _component_select_by_parent_code = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("select-by-parent-code");
   const _component_selPeople = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("selPeople");
   const _component_vxe_grid = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("vxe-grid");
   return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_vxe_grid, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.mergeProps)({
@@ -174313,28 +174375,38 @@ function BaseGridvue_type_template_id_46de1c50_scoped_true_render(_ctx, _cache,
     sysCodingDrop_edit: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(({
       row,
       column
-    }) => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_select_by_system_code, {
-      sysCode: column.sysCode,
-      item: column,
-      filterable: row.filterable === true,
+    }) => [((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_select_by_system_code, {
+      key: `${row.id}-${column.field}-${_ctx.isEditMode}`,
+      sysCode: column.params.sysCode,
+      item: row,
+      filterable: true,
       bindValue: row[column.field],
-      bindLabel: column.title,
+      bindLabel: row[column.params.childField || column.field + 'Name'],
       isVxeMode: true,
-      onSelectChange: $event => _ctx.handleSelectChange(row, column.field, $event)
-    }, null, 8, ["sysCode", "item", "filterable", "bindValue", "bindLabel", "onSelectChange"])]),
+      onSelectChange: value => {
+        _ctx.saveOldValue(row, column.field);
+        _ctx.selectChangeFun(row, column.field, column);
+        _ctx.handleBatchEdit(row, column.field, row[column.field]);
+      }
+    }, null, 8, ["sysCode", "item", "bindValue", "bindLabel", "onSelectChange"]))]),
     selectByParentCode_edit: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(({
       row,
       column
-    }) => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_SelectByParentCode, {
-      dictCode: column.dictCode,
-      keyCodeOfParent: column.keyCodeOfParent,
-      item: column,
-      filterable: _ctx.item.filterable === true,
+    }) => [((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_select_by_parent_code, {
+      key: `${row.id}-${column.field}-${_ctx.isEditMode}`,
+      dictCode: column.params.dictCode,
+      keyCodeOfParent: column.params.keyCodeOfParent,
+      item: row,
+      filterable: true,
       bindValue: row[column.field],
-      bindLabel: column.title,
+      bindLabel: row[column.params.childField || column.field + 'Name'],
       isVxeMode: true,
-      onSelectChange: $event => _ctx.handleSelectChange(row, column.field, $event)
-    }, null, 8, ["dictCode", "keyCodeOfParent", "item", "filterable", "bindValue", "bindLabel", "onSelectChange"])]),
+      onSelectChange: value => {
+        _ctx.saveOldValue(row, column.field);
+        _ctx.selectChangeFun(row, column.field, column);
+        _ctx.handleBatchEdit(row, column.field, row[column.field]);
+      }
+    }, null, 8, ["dictCode", "keyCodeOfParent", "item", "bindValue", "bindLabel", "onSelectChange"]))]),
     selPeople_edit: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(({
       row,
       column
@@ -174355,7 +174427,7 @@ function BaseGridvue_type_template_id_46de1c50_scoped_true_render(_ctx, _cache,
     };
   })]), 1040, ["onPageChange", "onCellClick", "onCheckboxChange", "onCurrentChange", "onCellMouseenter", "onCellMouseleave", "onCellDblclick"]);
 }
-;// ./src/package/Grid/BaseGrid.vue?vue&type=template&id=46de1c50&scoped=true
+;// ./src/package/Grid/BaseGrid.vue?vue&type=template&id=1c68729a&scoped=true
 
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-84.use[1]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/BaseGrid.vue?vue&type=script&lang=js
 
@@ -174658,10 +174730,10 @@ function BaseGridvue_type_template_id_46de1c50_scoped_true_render(_ctx, _cache,
 }));
 ;// ./src/package/Grid/BaseGrid.vue?vue&type=script&lang=js
  
-;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-56.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-56.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-56.use[2]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/BaseGrid.vue?vue&type=style&index=0&id=46de1c50&scoped=true&lang=css
+;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-56.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-56.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-56.use[2]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/BaseGrid.vue?vue&type=style&index=0&id=1c68729a&scoped=true&lang=css
 // extracted by mini-css-extract-plugin
 
-;// ./src/package/Grid/BaseGrid.vue?vue&type=style&index=0&id=46de1c50&scoped=true&lang=css
+;// ./src/package/Grid/BaseGrid.vue?vue&type=style&index=0&id=1c68729a&scoped=true&lang=css
 
 ;// ./src/package/Grid/BaseGrid.vue
 
@@ -174671,7 +174743,7 @@ function BaseGridvue_type_template_id_46de1c50_scoped_true_render(_ctx, _cache,
 ;
 
 
-const BaseGrid_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(BaseGridvue_type_script_lang_js, [['render',BaseGridvue_type_template_id_46de1c50_scoped_true_render],['__scopeId',"data-v-46de1c50"]])
+const BaseGrid_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(BaseGridvue_type_script_lang_js, [['render',BaseGridvue_type_template_id_1c68729a_scoped_true_render],['__scopeId',"data-v-1c68729a"]])
 
 /* harmony default export */ var BaseGrid = (BaseGrid_exports_);
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-84.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/GoVxeGrid.vue?vue&type=template&id=5ae8129d&scoped=true

package/woodao-pc-ui/woodao-pc-ui.umd.min.js

@@ -161309,7 +161309,7 @@ function useEcharts(dom, theme) {
   return instance;
 }
 ;// ./package.json
-var package_namespaceObject = {"rE":"0.0.67"};
+var package_namespaceObject = {"rE":"0.0.68"};
 ;// ./src/setting/index.ts
 
 const primaryColors = (/* unused pure expression or super */ null && (["#409eff", "#13C2C2", "#F5222D", "#722ED1", "#f7acbc", "#ef5b9c", "#bd6758", "#f47920", "#2e3a1f", "#b2d235", "#121a2a", "#6a6da9", "#867892", "#fcaf17", "#76becc", "#1b315e", "#b4532a", "#008792"]));
@@ -172537,11 +172537,11 @@ function BaseFormItemvue_type_template_id_4327caa9_scoped_true_ts_true_render(_c
 // EXTERNAL MODULE: ./node_modules/console-browserify/index.js
 var console_browserify = __webpack_require__(8313);
 var console_browserify_default = /*#__PURE__*/__webpack_require__.n(console_browserify);
-;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-128.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Form/SelectBySystemCode.vue?vue&type=template&id=734655ff&scoped=true
+;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-128.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Form/SelectBySystemCode.vue?vue&type=template&id=1befe7ba&scoped=true
 
-const SelectBySystemCodevue_type_template_id_734655ff_scoped_true_hoisted_1 = ["title"];
-const SelectBySystemCodevue_type_template_id_734655ff_scoped_true_hoisted_2 = ["title"];
-function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+const SelectBySystemCodevue_type_template_id_1befe7ba_scoped_true_hoisted_1 = ["title"];
+const SelectBySystemCodevue_type_template_id_1befe7ba_scoped_true_hoisted_2 = ["title"];
+function SelectBySystemCodevue_type_template_id_1befe7ba_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_el_option = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-option");
   const _component_el_select = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-select");
   const _component_vxe_option = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("vxe-option");
@@ -172556,8 +172556,8 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
     size: $props.size || 'small',
     filterable: $props.filterable || true,
     clearable: $props.clearable || true,
-    modelValue: $props.item.value,
-    "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => $props.item.value = $event),
+    modelValue: $options.computedValue,
+    "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => $options.computedValue = $event),
     disabled: $props.disabled || $props.readonly,
     onChange: $options.change,
     onVisibleChange: $options.getData,
@@ -172576,15 +172576,15 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
           },
           class: "custom-option",
           title: item.keyName
-        }, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)(item.keyName), 9, SelectBySystemCodevue_type_template_id_734655ff_scoped_true_hoisted_1)]),
+        }, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)(item.keyName), 9, SelectBySystemCodevue_type_template_id_1befe7ba_scoped_true_hoisted_1)]),
         _: 2
       }, 1032, ["value", "label"]);
     }), 128))]),
     _: 1
   }, 8, ["popper-append-to-body", "multiple", "size", "filterable", "clearable", "modelValue", "disabled", "onChange", "onVisibleChange", "placeholder"])) : ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_vxe_select, {
     key: 1,
-    modelValue: $props.item.value,
-    "onUpdate:modelValue": _cache[1] || (_cache[1] = $event => $props.item.value = $event),
+    modelValue: $options.computedValue,
+    "onUpdate:modelValue": _cache[1] || (_cache[1] = $event => $options.computedValue = $event),
     multiple: $props.multiple,
     size: $props.size || 'small',
     filterable: $props.filterable || true,
@@ -172610,14 +172610,14 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
           },
           class: "custom-option",
           title: item.keyName
-        }, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)(item.keyName), 9, SelectBySystemCodevue_type_template_id_734655ff_scoped_true_hoisted_2)]),
+        }, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)(item.keyName), 9, SelectBySystemCodevue_type_template_id_1befe7ba_scoped_true_hoisted_2)]),
         _: 2
       }, 1032, ["value", "label"]);
     }), 128))]),
     _: 1
   }, 8, ["modelValue", "multiple", "size", "filterable", "clearable", "disabled", "onChange", "onVisibleChange", "placeholder"]));
 }
-;// ./src/package/Form/SelectBySystemCode.vue?vue&type=template&id=734655ff&scoped=true
+;// ./src/package/Form/SelectBySystemCode.vue?vue&type=template&id=1befe7ba&scoped=true
 
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-128.use[1]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Form/SelectBySystemCode.vue?vue&type=script&lang=js
 
@@ -172627,9 +172627,28 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
   name: "selectBySystemCode",
   data() {
     return {
-      selectList: []
+      selectList: [],
+      currentValue: ''
     };
   },
+  computed: {
+    // 计算当前值，支持两种绑定方式
+    computedValue: {
+      get() {
+        // 如果bindValue有值，优先使用bindValue
+        if (this.bindValue !== undefined && this.bindValue !== null && this.bindValue !== '') {
+          return this.bindValue;
+        }
+        // 否则使用item.value
+        return this.item.value || '';
+      },
+      set(val) {
+        this.currentValue = val;
+        // 同时更新item.value
+        this.item.value = val;
+      }
+    }
+  },
   watch: {
     sysCode(val) {
       if (val != '' && val != undefined && val != null) {
@@ -172647,6 +172666,26 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
         }
         this.getSelectDataByKeyName();
       }
+    },
+    // 监听bindValue变化，用于回显
+    bindValue: {
+      handler(newVal) {
+        if (newVal !== undefined && newVal !== null && newVal !== '') {
+          this.currentValue = newVal;
+          this.item.value = newVal;
+        }
+      },
+      immediate: true
+    },
+    // 监听item变化
+    item: {
+      handler(newVal) {
+        if (newVal && newVal.value !== undefined) {
+          this.currentValue = newVal.value;
+        }
+      },
+      deep: true,
+      immediate: true
     }
   },
   created() {},
@@ -172680,6 +172719,15 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
         successFun: backData => {
           console.log(backData, 'backData');
           this.selectList = backData;
+          // 数据加载完成后，确保回显正确
+          this.$nextTick(() => {
+            if (this.bindValue !== undefined && this.bindValue !== null && this.bindValue !== '') {
+              this.currentValue = this.bindValue;
+              this.item.value = this.bindValue;
+            } else if (this.item && this.item.value !== undefined) {
+              this.currentValue = this.item.value;
+            }
+          });
         }
       });
     },
@@ -172699,6 +172747,15 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
           console.log(backData, 'keyName');
           this.selectList = backData;
           this.$forceUpdate();
+          // 数据加载完成后，确保回显正确
+          this.$nextTick(() => {
+            if (this.bindValue !== undefined && this.bindValue !== null && this.bindValue !== '') {
+              this.currentValue = this.bindValue;
+              this.item.value = this.bindValue;
+            } else if (this.item && this.item.value !== undefined) {
+              this.currentValue = this.item.value;
+            }
+          });
         }
       });
     },
@@ -172714,7 +172771,12 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
       let changeIndex = this.changeIndex;
       if (this.moreSel && val.length == 0 && oldVal[0] != undefined) {
         this.item.value = oldVal.split(",");
+        this.currentValue = oldVal.split(",");
         this.$forceUpdate();
+      } else {
+        // 更新当前值
+        this.currentValue = val;
+        this.item.value = val;
       }
       this.$emit('selectChange', bindItem);
     }
@@ -172794,10 +172856,10 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
 });
 ;// ./src/package/Form/SelectBySystemCode.vue?vue&type=script&lang=js
  
-;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-100.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-100.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-100.use[2]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Form/SelectBySystemCode.vue?vue&type=style&index=0&id=734655ff&scoped=true&lang=css
+;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-100.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-100.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-100.use[2]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Form/SelectBySystemCode.vue?vue&type=style&index=0&id=1befe7ba&scoped=true&lang=css
 // extracted by mini-css-extract-plugin
 
-;// ./src/package/Form/SelectBySystemCode.vue?vue&type=style&index=0&id=734655ff&scoped=true&lang=css
+;// ./src/package/Form/SelectBySystemCode.vue?vue&type=style&index=0&id=1befe7ba&scoped=true&lang=css
 
 ;// ./src/package/Form/SelectBySystemCode.vue
 
@@ -172807,7 +172869,7 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
 ;
 
 
-const SelectBySystemCode_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(SelectBySystemCodevue_type_script_lang_js, [['render',SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render],['__scopeId',"data-v-734655ff"]])
+const SelectBySystemCode_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(SelectBySystemCodevue_type_script_lang_js, [['render',SelectBySystemCodevue_type_template_id_1befe7ba_scoped_true_render],['__scopeId',"data-v-1befe7ba"]])
 
 /* harmony default export */ var SelectBySystemCode = (SelectBySystemCode_exports_);
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-128.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Form/SelectByParentCode.vue?vue&type=template&id=33e25f2c&scoped=true
@@ -174187,15 +174249,15 @@ const BaseFormItem_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(BaseF
 const BaseForm_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(BaseFormvue_type_script_lang_ts, [['render',BaseFormvue_type_template_id_ad37d90c_scoped_true_ts_true_render],['__scopeId',"data-v-ad37d90c"]])
 
 /* harmony default export */ var BaseForm = (BaseForm_exports_);
-;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-128.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/BaseGrid.vue?vue&type=template&id=46de1c50&scoped=true
+;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-128.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/BaseGrid.vue?vue&type=template&id=1c68729a&scoped=true
 
-function BaseGridvue_type_template_id_46de1c50_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+function BaseGridvue_type_template_id_1c68729a_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_el_input = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-input");
   const _component_el_date_picker = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-date-picker");
   const _component_el_option = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-option");
   const _component_el_select = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-select");
   const _component_select_by_system_code = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("select-by-system-code");
-  const _component_SelectByParentCode = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("SelectByParentCode");
+  const _component_select_by_parent_code = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("select-by-parent-code");
   const _component_selPeople = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("selPeople");
   const _component_vxe_grid = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("vxe-grid");
   return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_vxe_grid, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.mergeProps)({
@@ -174313,28 +174375,38 @@ function BaseGridvue_type_template_id_46de1c50_scoped_true_render(_ctx, _cache,
     sysCodingDrop_edit: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(({
       row,
       column
-    }) => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_select_by_system_code, {
-      sysCode: column.sysCode,
-      item: column,
-      filterable: row.filterable === true,
+    }) => [((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_select_by_system_code, {
+      key: `${row.id}-${column.field}-${_ctx.isEditMode}`,
+      sysCode: column.params.sysCode,
+      item: row,
+      filterable: true,
       bindValue: row[column.field],
-      bindLabel: column.title,
+      bindLabel: row[column.params.childField || column.field + 'Name'],
       isVxeMode: true,
-      onSelectChange: $event => _ctx.handleSelectChange(row, column.field, $event)
-    }, null, 8, ["sysCode", "item", "filterable", "bindValue", "bindLabel", "onSelectChange"])]),
+      onSelectChange: value => {
+        _ctx.saveOldValue(row, column.field);
+        _ctx.selectChangeFun(row, column.field, column);
+        _ctx.handleBatchEdit(row, column.field, row[column.field]);
+      }
+    }, null, 8, ["sysCode", "item", "bindValue", "bindLabel", "onSelectChange"]))]),
     selectByParentCode_edit: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(({
       row,
       column
-    }) => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_SelectByParentCode, {
-      dictCode: column.dictCode,
-      keyCodeOfParent: column.keyCodeOfParent,
-      item: column,
-      filterable: _ctx.item.filterable === true,
+    }) => [((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_select_by_parent_code, {
+      key: `${row.id}-${column.field}-${_ctx.isEditMode}`,
+      dictCode: column.params.dictCode,
+      keyCodeOfParent: column.params.keyCodeOfParent,
+      item: row,
+      filterable: true,
       bindValue: row[column.field],
-      bindLabel: column.title,
+      bindLabel: row[column.params.childField || column.field + 'Name'],
       isVxeMode: true,
-      onSelectChange: $event => _ctx.handleSelectChange(row, column.field, $event)
-    }, null, 8, ["dictCode", "keyCodeOfParent", "item", "filterable", "bindValue", "bindLabel", "onSelectChange"])]),
+      onSelectChange: value => {
+        _ctx.saveOldValue(row, column.field);
+        _ctx.selectChangeFun(row, column.field, column);
+        _ctx.handleBatchEdit(row, column.field, row[column.field]);
+      }
+    }, null, 8, ["dictCode", "keyCodeOfParent", "item", "bindValue", "bindLabel", "onSelectChange"]))]),
     selPeople_edit: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(({
       row,
       column
@@ -174355,7 +174427,7 @@ function BaseGridvue_type_template_id_46de1c50_scoped_true_render(_ctx, _cache,
     };
   })]), 1040, ["onPageChange", "onCellClick", "onCheckboxChange", "onCurrentChange", "onCellMouseenter", "onCellMouseleave", "onCellDblclick"]);
 }
-;// ./src/package/Grid/BaseGrid.vue?vue&type=template&id=46de1c50&scoped=true
+;// ./src/package/Grid/BaseGrid.vue?vue&type=template&id=1c68729a&scoped=true
 
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-128.use[1]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/BaseGrid.vue?vue&type=script&lang=js
 
@@ -174658,10 +174730,10 @@ function BaseGridvue_type_template_id_46de1c50_scoped_true_render(_ctx, _cache,
 }));
 ;// ./src/package/Grid/BaseGrid.vue?vue&type=script&lang=js
  
-;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-100.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-100.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-100.use[2]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/BaseGrid.vue?vue&type=style&index=0&id=46de1c50&scoped=true&lang=css
+;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-100.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-100.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-100.use[2]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/BaseGrid.vue?vue&type=style&index=0&id=1c68729a&scoped=true&lang=css
 // extracted by mini-css-extract-plugin
 
-;// ./src/package/Grid/BaseGrid.vue?vue&type=style&index=0&id=46de1c50&scoped=true&lang=css
+;// ./src/package/Grid/BaseGrid.vue?vue&type=style&index=0&id=1c68729a&scoped=true&lang=css
 
 ;// ./src/package/Grid/BaseGrid.vue
 
@@ -174671,7 +174743,7 @@ function BaseGridvue_type_template_id_46de1c50_scoped_true_render(_ctx, _cache,
 ;
 
 
-const BaseGrid_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(BaseGridvue_type_script_lang_js, [['render',BaseGridvue_type_template_id_46de1c50_scoped_true_render],['__scopeId',"data-v-46de1c50"]])
+const BaseGrid_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(BaseGridvue_type_script_lang_js, [['render',BaseGridvue_type_template_id_1c68729a_scoped_true_render],['__scopeId',"data-v-1c68729a"]])
 
 /* harmony default export */ var BaseGrid = (BaseGrid_exports_);
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-128.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/GoVxeGrid.vue?vue&type=template&id=5ae8129d&scoped=true