woodao-pc-ui 0.0.66 → 0.0.68

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "woodao-pc-ui",
3
- "version": "0.0.66",
3
+ "version": "0.0.68",
4
4
  "private": false,
5
5
  "scripts": {
6
6
  "serve": "vue-cli-service serve",
@@ -161309,7 +161309,7 @@ function useEcharts(dom, theme) {
161309
161309
  return instance;
161310
161310
  }
161311
161311
  ;// ./package.json
161312
- var package_namespaceObject = {"rE":"0.0.66"};
161312
+ var package_namespaceObject = {"rE":"0.0.68"};
161313
161313
  ;// ./src/setting/index.ts
161314
161314
 
161315
161315
  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
172537
172537
  // EXTERNAL MODULE: ./node_modules/console-browserify/index.js
172538
172538
  var console_browserify = __webpack_require__(94348);
172539
172539
  var console_browserify_default = /*#__PURE__*/__webpack_require__.n(console_browserify);
172540
- ;// ./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
172540
+ ;// ./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
172541
172541
 
172542
- const SelectBySystemCodevue_type_template_id_734655ff_scoped_true_hoisted_1 = ["title"];
172543
- const SelectBySystemCodevue_type_template_id_734655ff_scoped_true_hoisted_2 = ["title"];
172544
- function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
172542
+ const SelectBySystemCodevue_type_template_id_1befe7ba_scoped_true_hoisted_1 = ["title"];
172543
+ const SelectBySystemCodevue_type_template_id_1befe7ba_scoped_true_hoisted_2 = ["title"];
172544
+ function SelectBySystemCodevue_type_template_id_1befe7ba_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
172545
172545
  const _component_el_option = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-option");
172546
172546
  const _component_el_select = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-select");
172547
172547
  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
172556
172556
  size: $props.size || 'small',
172557
172557
  filterable: $props.filterable || true,
172558
172558
  clearable: $props.clearable || true,
172559
- modelValue: $props.item.value,
172560
- "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => $props.item.value = $event),
172559
+ modelValue: $options.computedValue,
172560
+ "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => $options.computedValue = $event),
172561
172561
  disabled: $props.disabled || $props.readonly,
172562
172562
  onChange: $options.change,
172563
172563
  onVisibleChange: $options.getData,
@@ -172576,15 +172576,15 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
172576
172576
  },
172577
172577
  class: "custom-option",
172578
172578
  title: item.keyName
172579
- }, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)(item.keyName), 9, SelectBySystemCodevue_type_template_id_734655ff_scoped_true_hoisted_1)]),
172579
+ }, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)(item.keyName), 9, SelectBySystemCodevue_type_template_id_1befe7ba_scoped_true_hoisted_1)]),
172580
172580
  _: 2
172581
172581
  }, 1032, ["value", "label"]);
172582
172582
  }), 128))]),
172583
172583
  _: 1
172584
172584
  }, 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, {
172585
172585
  key: 1,
172586
- modelValue: $props.item.value,
172587
- "onUpdate:modelValue": _cache[1] || (_cache[1] = $event => $props.item.value = $event),
172586
+ modelValue: $options.computedValue,
172587
+ "onUpdate:modelValue": _cache[1] || (_cache[1] = $event => $options.computedValue = $event),
172588
172588
  multiple: $props.multiple,
172589
172589
  size: $props.size || 'small',
172590
172590
  filterable: $props.filterable || true,
@@ -172610,14 +172610,14 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
172610
172610
  },
172611
172611
  class: "custom-option",
172612
172612
  title: item.keyName
172613
- }, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)(item.keyName), 9, SelectBySystemCodevue_type_template_id_734655ff_scoped_true_hoisted_2)]),
172613
+ }, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)(item.keyName), 9, SelectBySystemCodevue_type_template_id_1befe7ba_scoped_true_hoisted_2)]),
172614
172614
  _: 2
172615
172615
  }, 1032, ["value", "label"]);
172616
172616
  }), 128))]),
172617
172617
  _: 1
172618
172618
  }, 8, ["modelValue", "multiple", "size", "filterable", "clearable", "disabled", "onChange", "onVisibleChange", "placeholder"]));
172619
172619
  }
172620
- ;// ./src/package/Form/SelectBySystemCode.vue?vue&type=template&id=734655ff&scoped=true
172620
+ ;// ./src/package/Form/SelectBySystemCode.vue?vue&type=template&id=1befe7ba&scoped=true
172621
172621
 
172622
172622
  ;// ./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
172623
172623
 
@@ -172627,9 +172627,28 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
172627
172627
  name: "selectBySystemCode",
172628
172628
  data() {
172629
172629
  return {
172630
- selectList: []
172630
+ selectList: [],
172631
+ currentValue: ''
172631
172632
  };
172632
172633
  },
172634
+ computed: {
172635
+ // 计算当前值,支持两种绑定方式
172636
+ computedValue: {
172637
+ get() {
172638
+ // 如果bindValue有值,优先使用bindValue
172639
+ if (this.bindValue !== undefined && this.bindValue !== null && this.bindValue !== '') {
172640
+ return this.bindValue;
172641
+ }
172642
+ // 否则使用item.value
172643
+ return this.item.value || '';
172644
+ },
172645
+ set(val) {
172646
+ this.currentValue = val;
172647
+ // 同时更新item.value
172648
+ this.item.value = val;
172649
+ }
172650
+ }
172651
+ },
172633
172652
  watch: {
172634
172653
  sysCode(val) {
172635
172654
  if (val != '' && val != undefined && val != null) {
@@ -172647,6 +172666,26 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
172647
172666
  }
172648
172667
  this.getSelectDataByKeyName();
172649
172668
  }
172669
+ },
172670
+ // 监听bindValue变化,用于回显
172671
+ bindValue: {
172672
+ handler(newVal) {
172673
+ if (newVal !== undefined && newVal !== null && newVal !== '') {
172674
+ this.currentValue = newVal;
172675
+ this.item.value = newVal;
172676
+ }
172677
+ },
172678
+ immediate: true
172679
+ },
172680
+ // 监听item变化
172681
+ item: {
172682
+ handler(newVal) {
172683
+ if (newVal && newVal.value !== undefined) {
172684
+ this.currentValue = newVal.value;
172685
+ }
172686
+ },
172687
+ deep: true,
172688
+ immediate: true
172650
172689
  }
172651
172690
  },
172652
172691
  created() {},
@@ -172680,6 +172719,15 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
172680
172719
  successFun: backData => {
172681
172720
  console.log(backData, 'backData');
172682
172721
  this.selectList = backData;
172722
+ // 数据加载完成后,确保回显正确
172723
+ this.$nextTick(() => {
172724
+ if (this.bindValue !== undefined && this.bindValue !== null && this.bindValue !== '') {
172725
+ this.currentValue = this.bindValue;
172726
+ this.item.value = this.bindValue;
172727
+ } else if (this.item && this.item.value !== undefined) {
172728
+ this.currentValue = this.item.value;
172729
+ }
172730
+ });
172683
172731
  }
172684
172732
  });
172685
172733
  },
@@ -172699,6 +172747,15 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
172699
172747
  console.log(backData, 'keyName');
172700
172748
  this.selectList = backData;
172701
172749
  this.$forceUpdate();
172750
+ // 数据加载完成后,确保回显正确
172751
+ this.$nextTick(() => {
172752
+ if (this.bindValue !== undefined && this.bindValue !== null && this.bindValue !== '') {
172753
+ this.currentValue = this.bindValue;
172754
+ this.item.value = this.bindValue;
172755
+ } else if (this.item && this.item.value !== undefined) {
172756
+ this.currentValue = this.item.value;
172757
+ }
172758
+ });
172702
172759
  }
172703
172760
  });
172704
172761
  },
@@ -172714,7 +172771,12 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
172714
172771
  let changeIndex = this.changeIndex;
172715
172772
  if (this.moreSel && val.length == 0 && oldVal[0] != undefined) {
172716
172773
  this.item.value = oldVal.split(",");
172774
+ this.currentValue = oldVal.split(",");
172717
172775
  this.$forceUpdate();
172776
+ } else {
172777
+ // 更新当前值
172778
+ this.currentValue = val;
172779
+ this.item.value = val;
172718
172780
  }
172719
172781
  this.$emit('selectChange', bindItem);
172720
172782
  }
@@ -172794,10 +172856,10 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
172794
172856
  });
172795
172857
  ;// ./src/package/Form/SelectBySystemCode.vue?vue&type=script&lang=js
172796
172858
 
172797
- ;// ./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
172859
+ ;// ./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
172798
172860
  // extracted by mini-css-extract-plugin
172799
172861
 
172800
- ;// ./src/package/Form/SelectBySystemCode.vue?vue&type=style&index=0&id=734655ff&scoped=true&lang=css
172862
+ ;// ./src/package/Form/SelectBySystemCode.vue?vue&type=style&index=0&id=1befe7ba&scoped=true&lang=css
172801
172863
 
172802
172864
  ;// ./src/package/Form/SelectBySystemCode.vue
172803
172865
 
@@ -172807,7 +172869,7 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
172807
172869
  ;
172808
172870
 
172809
172871
 
172810
- 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"]])
172872
+ 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"]])
172811
172873
 
172812
172874
  /* harmony default export */ var SelectBySystemCode = (SelectBySystemCode_exports_);
172813
172875
  ;// ./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
174187
174249
  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"]])
174188
174250
 
174189
174251
  /* harmony default export */ var BaseForm = (BaseForm_exports_);
174190
- ;// ./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=131dc298&scoped=true
174252
+ ;// ./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
174191
174253
 
174192
- function BaseGridvue_type_template_id_131dc298_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
174254
+ function BaseGridvue_type_template_id_1c68729a_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
174193
174255
  const _component_el_input = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-input");
174194
174256
  const _component_el_date_picker = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-date-picker");
174195
174257
  const _component_el_option = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-option");
174196
174258
  const _component_el_select = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-select");
174197
174259
  const _component_select_by_system_code = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("select-by-system-code");
174198
- const _component_SelectByParentCode = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("SelectByParentCode");
174260
+ const _component_select_by_parent_code = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("select-by-parent-code");
174199
174261
  const _component_selPeople = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("selPeople");
174200
174262
  const _component_vxe_grid = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("vxe-grid");
174201
174263
  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_131dc298_scoped_true_render(_ctx, _cache,
174313
174375
  sysCodingDrop_edit: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(({
174314
174376
  row,
174315
174377
  column
174316
- }) => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_select_by_system_code, {
174317
- sysCode: column.sysCode,
174318
- item: column,
174319
- filterable: row.filterable === true,
174378
+ }) => [((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_select_by_system_code, {
174379
+ key: `${row.id}-${column.field}-${_ctx.isEditMode}`,
174380
+ sysCode: column.params.sysCode,
174381
+ item: row,
174382
+ filterable: true,
174320
174383
  bindValue: row[column.field],
174321
- bindLabel: column.title,
174384
+ bindLabel: row[column.params.childField || column.field + 'Name'],
174322
174385
  isVxeMode: true,
174323
- onSelectChange: $event => _ctx.handleSelectChange(row, column.field, $event)
174324
- }, null, 8, ["sysCode", "item", "filterable", "bindValue", "bindLabel", "onSelectChange"])]),
174386
+ onSelectChange: value => {
174387
+ _ctx.saveOldValue(row, column.field);
174388
+ _ctx.selectChangeFun(row, column.field, column);
174389
+ _ctx.handleBatchEdit(row, column.field, row[column.field]);
174390
+ }
174391
+ }, null, 8, ["sysCode", "item", "bindValue", "bindLabel", "onSelectChange"]))]),
174325
174392
  selectByParentCode_edit: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(({
174326
174393
  row,
174327
174394
  column
174328
- }) => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_SelectByParentCode, {
174329
- dictCode: column.dictCode,
174330
- keyCodeOfParent: column.keyCodeOfParent,
174331
- item: column,
174332
- filterable: _ctx.item.filterable === true,
174395
+ }) => [((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_select_by_parent_code, {
174396
+ key: `${row.id}-${column.field}-${_ctx.isEditMode}`,
174397
+ dictCode: column.params.dictCode,
174398
+ keyCodeOfParent: column.params.keyCodeOfParent,
174399
+ item: row,
174400
+ filterable: true,
174333
174401
  bindValue: row[column.field],
174334
- bindLabel: column.title,
174402
+ bindLabel: row[column.params.childField || column.field + 'Name'],
174335
174403
  isVxeMode: true,
174336
- onSelectChange: $event => _ctx.handleSelectChange(row, column.field, $event)
174337
- }, null, 8, ["dictCode", "keyCodeOfParent", "item", "filterable", "bindValue", "bindLabel", "onSelectChange"])]),
174404
+ onSelectChange: value => {
174405
+ _ctx.saveOldValue(row, column.field);
174406
+ _ctx.selectChangeFun(row, column.field, column);
174407
+ _ctx.handleBatchEdit(row, column.field, row[column.field]);
174408
+ }
174409
+ }, null, 8, ["dictCode", "keyCodeOfParent", "item", "bindValue", "bindLabel", "onSelectChange"]))]),
174338
174410
  selPeople_edit: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(({
174339
174411
  row,
174340
174412
  column
@@ -174355,7 +174427,7 @@ function BaseGridvue_type_template_id_131dc298_scoped_true_render(_ctx, _cache,
174355
174427
  };
174356
174428
  })]), 1040, ["onPageChange", "onCellClick", "onCheckboxChange", "onCurrentChange", "onCellMouseenter", "onCellMouseleave", "onCellDblclick"]);
174357
174429
  }
174358
- ;// ./src/package/Grid/BaseGrid.vue?vue&type=template&id=131dc298&scoped=true
174430
+ ;// ./src/package/Grid/BaseGrid.vue?vue&type=template&id=1c68729a&scoped=true
174359
174431
 
174360
174432
  ;// ./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
174361
174433
 
@@ -174451,21 +174523,15 @@ function BaseGridvue_type_template_id_131dc298_scoped_true_render(_ctx, _cache,
174451
174523
  // 选中当前行
174452
174524
  await $grid.setCheckboxRow(row, true);
174453
174525
  await $grid.setCurrentRow(row);
174526
+ const rows = await $grid.getCheckboxRecords();
174527
+ // 过滤掉 undefined 和 null 值,避免 toString() 错误
174528
+ const validRows = rows ? rows.filter(row => row != null) : [];
174529
+ context.emit('checkbox-change', validRows);
174454
174530
  } else if (props.tableMode === 'edit') {
174455
- // 编辑模式:点击行时只设置当前行,不切换勾选状态(保持多选效果)
174531
+ // 编辑模式:点击行时只设置当前行,不切换勾选状态(只有点击checkbox才会选中)
174456
174532
  await $grid.setCurrentRow(row);
174457
-
174458
- // 如果当前行未勾选,则勾选它(确保当前行被勾选)
174459
- const checkboxRecords = await $grid.getCheckboxRecords();
174460
- const isChecked = checkboxRecords.some(record => record && record.id === row.id);
174461
- if (!isChecked) {
174462
- await $grid.setCheckboxRow(row, true);
174463
- }
174533
+ // 编辑模式下点击行不会自动选中checkbox,只有点击checkbox本身才会选中
174464
174534
  }
174465
- const rows = await $grid.getCheckboxRecords();
174466
- // 过滤掉 undefined 和 null 值,避免 toString() 错误
174467
- const validRows = rows ? rows.filter(row => row != null) : [];
174468
- context.emit('checkbox-change', validRows);
174469
174535
  }
174470
174536
 
174471
174537
  // 勾选变化事件(包括点击 checkbox)
@@ -174664,10 +174730,10 @@ function BaseGridvue_type_template_id_131dc298_scoped_true_render(_ctx, _cache,
174664
174730
  }));
174665
174731
  ;// ./src/package/Grid/BaseGrid.vue?vue&type=script&lang=js
174666
174732
 
174667
- ;// ./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=131dc298&scoped=true&lang=css
174733
+ ;// ./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
174668
174734
  // extracted by mini-css-extract-plugin
174669
174735
 
174670
- ;// ./src/package/Grid/BaseGrid.vue?vue&type=style&index=0&id=131dc298&scoped=true&lang=css
174736
+ ;// ./src/package/Grid/BaseGrid.vue?vue&type=style&index=0&id=1c68729a&scoped=true&lang=css
174671
174737
 
174672
174738
  ;// ./src/package/Grid/BaseGrid.vue
174673
174739
 
@@ -174677,7 +174743,7 @@ function BaseGridvue_type_template_id_131dc298_scoped_true_render(_ctx, _cache,
174677
174743
  ;
174678
174744
 
174679
174745
 
174680
- const BaseGrid_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(BaseGridvue_type_script_lang_js, [['render',BaseGridvue_type_template_id_131dc298_scoped_true_render],['__scopeId',"data-v-131dc298"]])
174746
+ 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"]])
174681
174747
 
174682
174748
  /* harmony default export */ var BaseGrid = (BaseGrid_exports_);
174683
174749
  ;// ./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
@@ -14,7 +14,7 @@ button[data-v-7aa63542] {
14
14
  .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}
15
15
 
16
16
  /* 覆盖 el-select 下拉选项的默认样式 */
17
- [data-v-734655ff] .el-select-dropdown__item {
17
+ [data-v-1befe7ba] .el-select-dropdown__item {
18
18
  padding: 8px 20px !important; /* 调整内边距 */
19
19
  max-width: 500px !important; /* 设置最大宽度 */
20
20
  white-space: normal !important; /* 允许换行 */
@@ -27,7 +27,7 @@ button[data-v-7aa63542] {
27
27
  }
28
28
 
29
29
  /* 鼠标悬停时显示完整内容 */
30
- [data-v-734655ff] .el-select-dropdown__item:hover {
30
+ [data-v-1befe7ba] .el-select-dropdown__item:hover {
31
31
  overflow: visible !important; /* 显示全部内容 */
32
32
  white-space: normal !important;
33
33
  -webkit-line-clamp: unset !important;
@@ -161309,7 +161309,7 @@ function useEcharts(dom, theme) {
161309
161309
  return instance;
161310
161310
  }
161311
161311
  ;// ./package.json
161312
- var package_namespaceObject = {"rE":"0.0.66"};
161312
+ var package_namespaceObject = {"rE":"0.0.68"};
161313
161313
  ;// ./src/setting/index.ts
161314
161314
 
161315
161315
  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
172537
172537
  // EXTERNAL MODULE: ./node_modules/console-browserify/index.js
172538
172538
  var console_browserify = __webpack_require__(34844);
172539
172539
  var console_browserify_default = /*#__PURE__*/__webpack_require__.n(console_browserify);
172540
- ;// ./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
172540
+ ;// ./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
172541
172541
 
172542
- const SelectBySystemCodevue_type_template_id_734655ff_scoped_true_hoisted_1 = ["title"];
172543
- const SelectBySystemCodevue_type_template_id_734655ff_scoped_true_hoisted_2 = ["title"];
172544
- function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
172542
+ const SelectBySystemCodevue_type_template_id_1befe7ba_scoped_true_hoisted_1 = ["title"];
172543
+ const SelectBySystemCodevue_type_template_id_1befe7ba_scoped_true_hoisted_2 = ["title"];
172544
+ function SelectBySystemCodevue_type_template_id_1befe7ba_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
172545
172545
  const _component_el_option = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-option");
172546
172546
  const _component_el_select = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-select");
172547
172547
  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
172556
172556
  size: $props.size || 'small',
172557
172557
  filterable: $props.filterable || true,
172558
172558
  clearable: $props.clearable || true,
172559
- modelValue: $props.item.value,
172560
- "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => $props.item.value = $event),
172559
+ modelValue: $options.computedValue,
172560
+ "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => $options.computedValue = $event),
172561
172561
  disabled: $props.disabled || $props.readonly,
172562
172562
  onChange: $options.change,
172563
172563
  onVisibleChange: $options.getData,
@@ -172576,15 +172576,15 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
172576
172576
  },
172577
172577
  class: "custom-option",
172578
172578
  title: item.keyName
172579
- }, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)(item.keyName), 9, SelectBySystemCodevue_type_template_id_734655ff_scoped_true_hoisted_1)]),
172579
+ }, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)(item.keyName), 9, SelectBySystemCodevue_type_template_id_1befe7ba_scoped_true_hoisted_1)]),
172580
172580
  _: 2
172581
172581
  }, 1032, ["value", "label"]);
172582
172582
  }), 128))]),
172583
172583
  _: 1
172584
172584
  }, 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, {
172585
172585
  key: 1,
172586
- modelValue: $props.item.value,
172587
- "onUpdate:modelValue": _cache[1] || (_cache[1] = $event => $props.item.value = $event),
172586
+ modelValue: $options.computedValue,
172587
+ "onUpdate:modelValue": _cache[1] || (_cache[1] = $event => $options.computedValue = $event),
172588
172588
  multiple: $props.multiple,
172589
172589
  size: $props.size || 'small',
172590
172590
  filterable: $props.filterable || true,
@@ -172610,14 +172610,14 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
172610
172610
  },
172611
172611
  class: "custom-option",
172612
172612
  title: item.keyName
172613
- }, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)(item.keyName), 9, SelectBySystemCodevue_type_template_id_734655ff_scoped_true_hoisted_2)]),
172613
+ }, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)(item.keyName), 9, SelectBySystemCodevue_type_template_id_1befe7ba_scoped_true_hoisted_2)]),
172614
172614
  _: 2
172615
172615
  }, 1032, ["value", "label"]);
172616
172616
  }), 128))]),
172617
172617
  _: 1
172618
172618
  }, 8, ["modelValue", "multiple", "size", "filterable", "clearable", "disabled", "onChange", "onVisibleChange", "placeholder"]));
172619
172619
  }
172620
- ;// ./src/package/Form/SelectBySystemCode.vue?vue&type=template&id=734655ff&scoped=true
172620
+ ;// ./src/package/Form/SelectBySystemCode.vue?vue&type=template&id=1befe7ba&scoped=true
172621
172621
 
172622
172622
  ;// ./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
172623
172623
 
@@ -172627,9 +172627,28 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
172627
172627
  name: "selectBySystemCode",
172628
172628
  data() {
172629
172629
  return {
172630
- selectList: []
172630
+ selectList: [],
172631
+ currentValue: ''
172631
172632
  };
172632
172633
  },
172634
+ computed: {
172635
+ // 计算当前值,支持两种绑定方式
172636
+ computedValue: {
172637
+ get() {
172638
+ // 如果bindValue有值,优先使用bindValue
172639
+ if (this.bindValue !== undefined && this.bindValue !== null && this.bindValue !== '') {
172640
+ return this.bindValue;
172641
+ }
172642
+ // 否则使用item.value
172643
+ return this.item.value || '';
172644
+ },
172645
+ set(val) {
172646
+ this.currentValue = val;
172647
+ // 同时更新item.value
172648
+ this.item.value = val;
172649
+ }
172650
+ }
172651
+ },
172633
172652
  watch: {
172634
172653
  sysCode(val) {
172635
172654
  if (val != '' && val != undefined && val != null) {
@@ -172647,6 +172666,26 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
172647
172666
  }
172648
172667
  this.getSelectDataByKeyName();
172649
172668
  }
172669
+ },
172670
+ // 监听bindValue变化,用于回显
172671
+ bindValue: {
172672
+ handler(newVal) {
172673
+ if (newVal !== undefined && newVal !== null && newVal !== '') {
172674
+ this.currentValue = newVal;
172675
+ this.item.value = newVal;
172676
+ }
172677
+ },
172678
+ immediate: true
172679
+ },
172680
+ // 监听item变化
172681
+ item: {
172682
+ handler(newVal) {
172683
+ if (newVal && newVal.value !== undefined) {
172684
+ this.currentValue = newVal.value;
172685
+ }
172686
+ },
172687
+ deep: true,
172688
+ immediate: true
172650
172689
  }
172651
172690
  },
172652
172691
  created() {},
@@ -172680,6 +172719,15 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
172680
172719
  successFun: backData => {
172681
172720
  console.log(backData, 'backData');
172682
172721
  this.selectList = backData;
172722
+ // 数据加载完成后,确保回显正确
172723
+ this.$nextTick(() => {
172724
+ if (this.bindValue !== undefined && this.bindValue !== null && this.bindValue !== '') {
172725
+ this.currentValue = this.bindValue;
172726
+ this.item.value = this.bindValue;
172727
+ } else if (this.item && this.item.value !== undefined) {
172728
+ this.currentValue = this.item.value;
172729
+ }
172730
+ });
172683
172731
  }
172684
172732
  });
172685
172733
  },
@@ -172699,6 +172747,15 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
172699
172747
  console.log(backData, 'keyName');
172700
172748
  this.selectList = backData;
172701
172749
  this.$forceUpdate();
172750
+ // 数据加载完成后,确保回显正确
172751
+ this.$nextTick(() => {
172752
+ if (this.bindValue !== undefined && this.bindValue !== null && this.bindValue !== '') {
172753
+ this.currentValue = this.bindValue;
172754
+ this.item.value = this.bindValue;
172755
+ } else if (this.item && this.item.value !== undefined) {
172756
+ this.currentValue = this.item.value;
172757
+ }
172758
+ });
172702
172759
  }
172703
172760
  });
172704
172761
  },
@@ -172714,7 +172771,12 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
172714
172771
  let changeIndex = this.changeIndex;
172715
172772
  if (this.moreSel && val.length == 0 && oldVal[0] != undefined) {
172716
172773
  this.item.value = oldVal.split(",");
172774
+ this.currentValue = oldVal.split(",");
172717
172775
  this.$forceUpdate();
172776
+ } else {
172777
+ // 更新当前值
172778
+ this.currentValue = val;
172779
+ this.item.value = val;
172718
172780
  }
172719
172781
  this.$emit('selectChange', bindItem);
172720
172782
  }
@@ -172794,10 +172856,10 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
172794
172856
  });
172795
172857
  ;// ./src/package/Form/SelectBySystemCode.vue?vue&type=script&lang=js
172796
172858
 
172797
- ;// ./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
172859
+ ;// ./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
172798
172860
  // extracted by mini-css-extract-plugin
172799
172861
 
172800
- ;// ./src/package/Form/SelectBySystemCode.vue?vue&type=style&index=0&id=734655ff&scoped=true&lang=css
172862
+ ;// ./src/package/Form/SelectBySystemCode.vue?vue&type=style&index=0&id=1befe7ba&scoped=true&lang=css
172801
172863
 
172802
172864
  ;// ./src/package/Form/SelectBySystemCode.vue
172803
172865
 
@@ -172807,7 +172869,7 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
172807
172869
  ;
172808
172870
 
172809
172871
 
172810
- 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"]])
172872
+ 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"]])
172811
172873
 
172812
172874
  /* harmony default export */ var SelectBySystemCode = (SelectBySystemCode_exports_);
172813
172875
  ;// ./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
174187
174249
  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"]])
174188
174250
 
174189
174251
  /* harmony default export */ var BaseForm = (BaseForm_exports_);
174190
- ;// ./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=131dc298&scoped=true
174252
+ ;// ./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
174191
174253
 
174192
- function BaseGridvue_type_template_id_131dc298_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
174254
+ function BaseGridvue_type_template_id_1c68729a_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
174193
174255
  const _component_el_input = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-input");
174194
174256
  const _component_el_date_picker = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-date-picker");
174195
174257
  const _component_el_option = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-option");
174196
174258
  const _component_el_select = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-select");
174197
174259
  const _component_select_by_system_code = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("select-by-system-code");
174198
- const _component_SelectByParentCode = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("SelectByParentCode");
174260
+ const _component_select_by_parent_code = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("select-by-parent-code");
174199
174261
  const _component_selPeople = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("selPeople");
174200
174262
  const _component_vxe_grid = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("vxe-grid");
174201
174263
  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_131dc298_scoped_true_render(_ctx, _cache,
174313
174375
  sysCodingDrop_edit: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(({
174314
174376
  row,
174315
174377
  column
174316
- }) => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_select_by_system_code, {
174317
- sysCode: column.sysCode,
174318
- item: column,
174319
- filterable: row.filterable === true,
174378
+ }) => [((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_select_by_system_code, {
174379
+ key: `${row.id}-${column.field}-${_ctx.isEditMode}`,
174380
+ sysCode: column.params.sysCode,
174381
+ item: row,
174382
+ filterable: true,
174320
174383
  bindValue: row[column.field],
174321
- bindLabel: column.title,
174384
+ bindLabel: row[column.params.childField || column.field + 'Name'],
174322
174385
  isVxeMode: true,
174323
- onSelectChange: $event => _ctx.handleSelectChange(row, column.field, $event)
174324
- }, null, 8, ["sysCode", "item", "filterable", "bindValue", "bindLabel", "onSelectChange"])]),
174386
+ onSelectChange: value => {
174387
+ _ctx.saveOldValue(row, column.field);
174388
+ _ctx.selectChangeFun(row, column.field, column);
174389
+ _ctx.handleBatchEdit(row, column.field, row[column.field]);
174390
+ }
174391
+ }, null, 8, ["sysCode", "item", "bindValue", "bindLabel", "onSelectChange"]))]),
174325
174392
  selectByParentCode_edit: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(({
174326
174393
  row,
174327
174394
  column
174328
- }) => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_SelectByParentCode, {
174329
- dictCode: column.dictCode,
174330
- keyCodeOfParent: column.keyCodeOfParent,
174331
- item: column,
174332
- filterable: _ctx.item.filterable === true,
174395
+ }) => [((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_select_by_parent_code, {
174396
+ key: `${row.id}-${column.field}-${_ctx.isEditMode}`,
174397
+ dictCode: column.params.dictCode,
174398
+ keyCodeOfParent: column.params.keyCodeOfParent,
174399
+ item: row,
174400
+ filterable: true,
174333
174401
  bindValue: row[column.field],
174334
- bindLabel: column.title,
174402
+ bindLabel: row[column.params.childField || column.field + 'Name'],
174335
174403
  isVxeMode: true,
174336
- onSelectChange: $event => _ctx.handleSelectChange(row, column.field, $event)
174337
- }, null, 8, ["dictCode", "keyCodeOfParent", "item", "filterable", "bindValue", "bindLabel", "onSelectChange"])]),
174404
+ onSelectChange: value => {
174405
+ _ctx.saveOldValue(row, column.field);
174406
+ _ctx.selectChangeFun(row, column.field, column);
174407
+ _ctx.handleBatchEdit(row, column.field, row[column.field]);
174408
+ }
174409
+ }, null, 8, ["dictCode", "keyCodeOfParent", "item", "bindValue", "bindLabel", "onSelectChange"]))]),
174338
174410
  selPeople_edit: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(({
174339
174411
  row,
174340
174412
  column
@@ -174355,7 +174427,7 @@ function BaseGridvue_type_template_id_131dc298_scoped_true_render(_ctx, _cache,
174355
174427
  };
174356
174428
  })]), 1040, ["onPageChange", "onCellClick", "onCheckboxChange", "onCurrentChange", "onCellMouseenter", "onCellMouseleave", "onCellDblclick"]);
174357
174429
  }
174358
- ;// ./src/package/Grid/BaseGrid.vue?vue&type=template&id=131dc298&scoped=true
174430
+ ;// ./src/package/Grid/BaseGrid.vue?vue&type=template&id=1c68729a&scoped=true
174359
174431
 
174360
174432
  ;// ./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
174361
174433
 
@@ -174451,21 +174523,15 @@ function BaseGridvue_type_template_id_131dc298_scoped_true_render(_ctx, _cache,
174451
174523
  // 选中当前行
174452
174524
  await $grid.setCheckboxRow(row, true);
174453
174525
  await $grid.setCurrentRow(row);
174526
+ const rows = await $grid.getCheckboxRecords();
174527
+ // 过滤掉 undefined 和 null 值,避免 toString() 错误
174528
+ const validRows = rows ? rows.filter(row => row != null) : [];
174529
+ context.emit('checkbox-change', validRows);
174454
174530
  } else if (props.tableMode === 'edit') {
174455
- // 编辑模式:点击行时只设置当前行,不切换勾选状态(保持多选效果)
174531
+ // 编辑模式:点击行时只设置当前行,不切换勾选状态(只有点击checkbox才会选中)
174456
174532
  await $grid.setCurrentRow(row);
174457
-
174458
- // 如果当前行未勾选,则勾选它(确保当前行被勾选)
174459
- const checkboxRecords = await $grid.getCheckboxRecords();
174460
- const isChecked = checkboxRecords.some(record => record && record.id === row.id);
174461
- if (!isChecked) {
174462
- await $grid.setCheckboxRow(row, true);
174463
- }
174533
+ // 编辑模式下点击行不会自动选中checkbox,只有点击checkbox本身才会选中
174464
174534
  }
174465
- const rows = await $grid.getCheckboxRecords();
174466
- // 过滤掉 undefined 和 null 值,避免 toString() 错误
174467
- const validRows = rows ? rows.filter(row => row != null) : [];
174468
- context.emit('checkbox-change', validRows);
174469
174535
  }
174470
174536
 
174471
174537
  // 勾选变化事件(包括点击 checkbox)
@@ -174664,10 +174730,10 @@ function BaseGridvue_type_template_id_131dc298_scoped_true_render(_ctx, _cache,
174664
174730
  }));
174665
174731
  ;// ./src/package/Grid/BaseGrid.vue?vue&type=script&lang=js
174666
174732
 
174667
- ;// ./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=131dc298&scoped=true&lang=css
174733
+ ;// ./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
174668
174734
  // extracted by mini-css-extract-plugin
174669
174735
 
174670
- ;// ./src/package/Grid/BaseGrid.vue?vue&type=style&index=0&id=131dc298&scoped=true&lang=css
174736
+ ;// ./src/package/Grid/BaseGrid.vue?vue&type=style&index=0&id=1c68729a&scoped=true&lang=css
174671
174737
 
174672
174738
  ;// ./src/package/Grid/BaseGrid.vue
174673
174739
 
@@ -174677,7 +174743,7 @@ function BaseGridvue_type_template_id_131dc298_scoped_true_render(_ctx, _cache,
174677
174743
  ;
174678
174744
 
174679
174745
 
174680
- const BaseGrid_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(BaseGridvue_type_script_lang_js, [['render',BaseGridvue_type_template_id_131dc298_scoped_true_render],['__scopeId',"data-v-131dc298"]])
174746
+ 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"]])
174681
174747
 
174682
174748
  /* harmony default export */ var BaseGrid = (BaseGrid_exports_);
174683
174749
  ;// ./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
@@ -161309,7 +161309,7 @@ function useEcharts(dom, theme) {
161309
161309
  return instance;
161310
161310
  }
161311
161311
  ;// ./package.json
161312
- var package_namespaceObject = {"rE":"0.0.66"};
161312
+ var package_namespaceObject = {"rE":"0.0.68"};
161313
161313
  ;// ./src/setting/index.ts
161314
161314
 
161315
161315
  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
172537
172537
  // EXTERNAL MODULE: ./node_modules/console-browserify/index.js
172538
172538
  var console_browserify = __webpack_require__(8313);
172539
172539
  var console_browserify_default = /*#__PURE__*/__webpack_require__.n(console_browserify);
172540
- ;// ./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
172540
+ ;// ./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
172541
172541
 
172542
- const SelectBySystemCodevue_type_template_id_734655ff_scoped_true_hoisted_1 = ["title"];
172543
- const SelectBySystemCodevue_type_template_id_734655ff_scoped_true_hoisted_2 = ["title"];
172544
- function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
172542
+ const SelectBySystemCodevue_type_template_id_1befe7ba_scoped_true_hoisted_1 = ["title"];
172543
+ const SelectBySystemCodevue_type_template_id_1befe7ba_scoped_true_hoisted_2 = ["title"];
172544
+ function SelectBySystemCodevue_type_template_id_1befe7ba_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
172545
172545
  const _component_el_option = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-option");
172546
172546
  const _component_el_select = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-select");
172547
172547
  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
172556
172556
  size: $props.size || 'small',
172557
172557
  filterable: $props.filterable || true,
172558
172558
  clearable: $props.clearable || true,
172559
- modelValue: $props.item.value,
172560
- "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => $props.item.value = $event),
172559
+ modelValue: $options.computedValue,
172560
+ "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => $options.computedValue = $event),
172561
172561
  disabled: $props.disabled || $props.readonly,
172562
172562
  onChange: $options.change,
172563
172563
  onVisibleChange: $options.getData,
@@ -172576,15 +172576,15 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
172576
172576
  },
172577
172577
  class: "custom-option",
172578
172578
  title: item.keyName
172579
- }, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)(item.keyName), 9, SelectBySystemCodevue_type_template_id_734655ff_scoped_true_hoisted_1)]),
172579
+ }, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)(item.keyName), 9, SelectBySystemCodevue_type_template_id_1befe7ba_scoped_true_hoisted_1)]),
172580
172580
  _: 2
172581
172581
  }, 1032, ["value", "label"]);
172582
172582
  }), 128))]),
172583
172583
  _: 1
172584
172584
  }, 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, {
172585
172585
  key: 1,
172586
- modelValue: $props.item.value,
172587
- "onUpdate:modelValue": _cache[1] || (_cache[1] = $event => $props.item.value = $event),
172586
+ modelValue: $options.computedValue,
172587
+ "onUpdate:modelValue": _cache[1] || (_cache[1] = $event => $options.computedValue = $event),
172588
172588
  multiple: $props.multiple,
172589
172589
  size: $props.size || 'small',
172590
172590
  filterable: $props.filterable || true,
@@ -172610,14 +172610,14 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
172610
172610
  },
172611
172611
  class: "custom-option",
172612
172612
  title: item.keyName
172613
- }, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)(item.keyName), 9, SelectBySystemCodevue_type_template_id_734655ff_scoped_true_hoisted_2)]),
172613
+ }, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)(item.keyName), 9, SelectBySystemCodevue_type_template_id_1befe7ba_scoped_true_hoisted_2)]),
172614
172614
  _: 2
172615
172615
  }, 1032, ["value", "label"]);
172616
172616
  }), 128))]),
172617
172617
  _: 1
172618
172618
  }, 8, ["modelValue", "multiple", "size", "filterable", "clearable", "disabled", "onChange", "onVisibleChange", "placeholder"]));
172619
172619
  }
172620
- ;// ./src/package/Form/SelectBySystemCode.vue?vue&type=template&id=734655ff&scoped=true
172620
+ ;// ./src/package/Form/SelectBySystemCode.vue?vue&type=template&id=1befe7ba&scoped=true
172621
172621
 
172622
172622
  ;// ./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
172623
172623
 
@@ -172627,9 +172627,28 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
172627
172627
  name: "selectBySystemCode",
172628
172628
  data() {
172629
172629
  return {
172630
- selectList: []
172630
+ selectList: [],
172631
+ currentValue: ''
172631
172632
  };
172632
172633
  },
172634
+ computed: {
172635
+ // 计算当前值,支持两种绑定方式
172636
+ computedValue: {
172637
+ get() {
172638
+ // 如果bindValue有值,优先使用bindValue
172639
+ if (this.bindValue !== undefined && this.bindValue !== null && this.bindValue !== '') {
172640
+ return this.bindValue;
172641
+ }
172642
+ // 否则使用item.value
172643
+ return this.item.value || '';
172644
+ },
172645
+ set(val) {
172646
+ this.currentValue = val;
172647
+ // 同时更新item.value
172648
+ this.item.value = val;
172649
+ }
172650
+ }
172651
+ },
172633
172652
  watch: {
172634
172653
  sysCode(val) {
172635
172654
  if (val != '' && val != undefined && val != null) {
@@ -172647,6 +172666,26 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
172647
172666
  }
172648
172667
  this.getSelectDataByKeyName();
172649
172668
  }
172669
+ },
172670
+ // 监听bindValue变化,用于回显
172671
+ bindValue: {
172672
+ handler(newVal) {
172673
+ if (newVal !== undefined && newVal !== null && newVal !== '') {
172674
+ this.currentValue = newVal;
172675
+ this.item.value = newVal;
172676
+ }
172677
+ },
172678
+ immediate: true
172679
+ },
172680
+ // 监听item变化
172681
+ item: {
172682
+ handler(newVal) {
172683
+ if (newVal && newVal.value !== undefined) {
172684
+ this.currentValue = newVal.value;
172685
+ }
172686
+ },
172687
+ deep: true,
172688
+ immediate: true
172650
172689
  }
172651
172690
  },
172652
172691
  created() {},
@@ -172680,6 +172719,15 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
172680
172719
  successFun: backData => {
172681
172720
  console.log(backData, 'backData');
172682
172721
  this.selectList = backData;
172722
+ // 数据加载完成后,确保回显正确
172723
+ this.$nextTick(() => {
172724
+ if (this.bindValue !== undefined && this.bindValue !== null && this.bindValue !== '') {
172725
+ this.currentValue = this.bindValue;
172726
+ this.item.value = this.bindValue;
172727
+ } else if (this.item && this.item.value !== undefined) {
172728
+ this.currentValue = this.item.value;
172729
+ }
172730
+ });
172683
172731
  }
172684
172732
  });
172685
172733
  },
@@ -172699,6 +172747,15 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
172699
172747
  console.log(backData, 'keyName');
172700
172748
  this.selectList = backData;
172701
172749
  this.$forceUpdate();
172750
+ // 数据加载完成后,确保回显正确
172751
+ this.$nextTick(() => {
172752
+ if (this.bindValue !== undefined && this.bindValue !== null && this.bindValue !== '') {
172753
+ this.currentValue = this.bindValue;
172754
+ this.item.value = this.bindValue;
172755
+ } else if (this.item && this.item.value !== undefined) {
172756
+ this.currentValue = this.item.value;
172757
+ }
172758
+ });
172702
172759
  }
172703
172760
  });
172704
172761
  },
@@ -172714,7 +172771,12 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
172714
172771
  let changeIndex = this.changeIndex;
172715
172772
  if (this.moreSel && val.length == 0 && oldVal[0] != undefined) {
172716
172773
  this.item.value = oldVal.split(",");
172774
+ this.currentValue = oldVal.split(",");
172717
172775
  this.$forceUpdate();
172776
+ } else {
172777
+ // 更新当前值
172778
+ this.currentValue = val;
172779
+ this.item.value = val;
172718
172780
  }
172719
172781
  this.$emit('selectChange', bindItem);
172720
172782
  }
@@ -172794,10 +172856,10 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
172794
172856
  });
172795
172857
  ;// ./src/package/Form/SelectBySystemCode.vue?vue&type=script&lang=js
172796
172858
 
172797
- ;// ./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
172859
+ ;// ./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
172798
172860
  // extracted by mini-css-extract-plugin
172799
172861
 
172800
- ;// ./src/package/Form/SelectBySystemCode.vue?vue&type=style&index=0&id=734655ff&scoped=true&lang=css
172862
+ ;// ./src/package/Form/SelectBySystemCode.vue?vue&type=style&index=0&id=1befe7ba&scoped=true&lang=css
172801
172863
 
172802
172864
  ;// ./src/package/Form/SelectBySystemCode.vue
172803
172865
 
@@ -172807,7 +172869,7 @@ function SelectBySystemCodevue_type_template_id_734655ff_scoped_true_render(_ctx
172807
172869
  ;
172808
172870
 
172809
172871
 
172810
- 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"]])
172872
+ 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"]])
172811
172873
 
172812
172874
  /* harmony default export */ var SelectBySystemCode = (SelectBySystemCode_exports_);
172813
172875
  ;// ./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
174187
174249
  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"]])
174188
174250
 
174189
174251
  /* harmony default export */ var BaseForm = (BaseForm_exports_);
174190
- ;// ./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=131dc298&scoped=true
174252
+ ;// ./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
174191
174253
 
174192
- function BaseGridvue_type_template_id_131dc298_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
174254
+ function BaseGridvue_type_template_id_1c68729a_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
174193
174255
  const _component_el_input = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-input");
174194
174256
  const _component_el_date_picker = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-date-picker");
174195
174257
  const _component_el_option = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-option");
174196
174258
  const _component_el_select = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-select");
174197
174259
  const _component_select_by_system_code = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("select-by-system-code");
174198
- const _component_SelectByParentCode = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("SelectByParentCode");
174260
+ const _component_select_by_parent_code = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("select-by-parent-code");
174199
174261
  const _component_selPeople = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("selPeople");
174200
174262
  const _component_vxe_grid = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("vxe-grid");
174201
174263
  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_131dc298_scoped_true_render(_ctx, _cache,
174313
174375
  sysCodingDrop_edit: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(({
174314
174376
  row,
174315
174377
  column
174316
- }) => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_select_by_system_code, {
174317
- sysCode: column.sysCode,
174318
- item: column,
174319
- filterable: row.filterable === true,
174378
+ }) => [((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_select_by_system_code, {
174379
+ key: `${row.id}-${column.field}-${_ctx.isEditMode}`,
174380
+ sysCode: column.params.sysCode,
174381
+ item: row,
174382
+ filterable: true,
174320
174383
  bindValue: row[column.field],
174321
- bindLabel: column.title,
174384
+ bindLabel: row[column.params.childField || column.field + 'Name'],
174322
174385
  isVxeMode: true,
174323
- onSelectChange: $event => _ctx.handleSelectChange(row, column.field, $event)
174324
- }, null, 8, ["sysCode", "item", "filterable", "bindValue", "bindLabel", "onSelectChange"])]),
174386
+ onSelectChange: value => {
174387
+ _ctx.saveOldValue(row, column.field);
174388
+ _ctx.selectChangeFun(row, column.field, column);
174389
+ _ctx.handleBatchEdit(row, column.field, row[column.field]);
174390
+ }
174391
+ }, null, 8, ["sysCode", "item", "bindValue", "bindLabel", "onSelectChange"]))]),
174325
174392
  selectByParentCode_edit: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(({
174326
174393
  row,
174327
174394
  column
174328
- }) => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_SelectByParentCode, {
174329
- dictCode: column.dictCode,
174330
- keyCodeOfParent: column.keyCodeOfParent,
174331
- item: column,
174332
- filterable: _ctx.item.filterable === true,
174395
+ }) => [((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_select_by_parent_code, {
174396
+ key: `${row.id}-${column.field}-${_ctx.isEditMode}`,
174397
+ dictCode: column.params.dictCode,
174398
+ keyCodeOfParent: column.params.keyCodeOfParent,
174399
+ item: row,
174400
+ filterable: true,
174333
174401
  bindValue: row[column.field],
174334
- bindLabel: column.title,
174402
+ bindLabel: row[column.params.childField || column.field + 'Name'],
174335
174403
  isVxeMode: true,
174336
- onSelectChange: $event => _ctx.handleSelectChange(row, column.field, $event)
174337
- }, null, 8, ["dictCode", "keyCodeOfParent", "item", "filterable", "bindValue", "bindLabel", "onSelectChange"])]),
174404
+ onSelectChange: value => {
174405
+ _ctx.saveOldValue(row, column.field);
174406
+ _ctx.selectChangeFun(row, column.field, column);
174407
+ _ctx.handleBatchEdit(row, column.field, row[column.field]);
174408
+ }
174409
+ }, null, 8, ["dictCode", "keyCodeOfParent", "item", "bindValue", "bindLabel", "onSelectChange"]))]),
174338
174410
  selPeople_edit: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(({
174339
174411
  row,
174340
174412
  column
@@ -174355,7 +174427,7 @@ function BaseGridvue_type_template_id_131dc298_scoped_true_render(_ctx, _cache,
174355
174427
  };
174356
174428
  })]), 1040, ["onPageChange", "onCellClick", "onCheckboxChange", "onCurrentChange", "onCellMouseenter", "onCellMouseleave", "onCellDblclick"]);
174357
174429
  }
174358
- ;// ./src/package/Grid/BaseGrid.vue?vue&type=template&id=131dc298&scoped=true
174430
+ ;// ./src/package/Grid/BaseGrid.vue?vue&type=template&id=1c68729a&scoped=true
174359
174431
 
174360
174432
  ;// ./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
174361
174433
 
@@ -174451,21 +174523,15 @@ function BaseGridvue_type_template_id_131dc298_scoped_true_render(_ctx, _cache,
174451
174523
  // 选中当前行
174452
174524
  await $grid.setCheckboxRow(row, true);
174453
174525
  await $grid.setCurrentRow(row);
174526
+ const rows = await $grid.getCheckboxRecords();
174527
+ // 过滤掉 undefined 和 null 值,避免 toString() 错误
174528
+ const validRows = rows ? rows.filter(row => row != null) : [];
174529
+ context.emit('checkbox-change', validRows);
174454
174530
  } else if (props.tableMode === 'edit') {
174455
- // 编辑模式:点击行时只设置当前行,不切换勾选状态(保持多选效果)
174531
+ // 编辑模式:点击行时只设置当前行,不切换勾选状态(只有点击checkbox才会选中)
174456
174532
  await $grid.setCurrentRow(row);
174457
-
174458
- // 如果当前行未勾选,则勾选它(确保当前行被勾选)
174459
- const checkboxRecords = await $grid.getCheckboxRecords();
174460
- const isChecked = checkboxRecords.some(record => record && record.id === row.id);
174461
- if (!isChecked) {
174462
- await $grid.setCheckboxRow(row, true);
174463
- }
174533
+ // 编辑模式下点击行不会自动选中checkbox,只有点击checkbox本身才会选中
174464
174534
  }
174465
- const rows = await $grid.getCheckboxRecords();
174466
- // 过滤掉 undefined 和 null 值,避免 toString() 错误
174467
- const validRows = rows ? rows.filter(row => row != null) : [];
174468
- context.emit('checkbox-change', validRows);
174469
174535
  }
174470
174536
 
174471
174537
  // 勾选变化事件(包括点击 checkbox)
@@ -174664,10 +174730,10 @@ function BaseGridvue_type_template_id_131dc298_scoped_true_render(_ctx, _cache,
174664
174730
  }));
174665
174731
  ;// ./src/package/Grid/BaseGrid.vue?vue&type=script&lang=js
174666
174732
 
174667
- ;// ./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=131dc298&scoped=true&lang=css
174733
+ ;// ./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
174668
174734
  // extracted by mini-css-extract-plugin
174669
174735
 
174670
- ;// ./src/package/Grid/BaseGrid.vue?vue&type=style&index=0&id=131dc298&scoped=true&lang=css
174736
+ ;// ./src/package/Grid/BaseGrid.vue?vue&type=style&index=0&id=1c68729a&scoped=true&lang=css
174671
174737
 
174672
174738
  ;// ./src/package/Grid/BaseGrid.vue
174673
174739
 
@@ -174677,7 +174743,7 @@ function BaseGridvue_type_template_id_131dc298_scoped_true_render(_ctx, _cache,
174677
174743
  ;
174678
174744
 
174679
174745
 
174680
- const BaseGrid_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(BaseGridvue_type_script_lang_js, [['render',BaseGridvue_type_template_id_131dc298_scoped_true_render],['__scopeId',"data-v-131dc298"]])
174746
+ 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"]])
174681
174747
 
174682
174748
  /* harmony default export */ var BaseGrid = (BaseGrid_exports_);
174683
174749
  ;// ./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