gcs-ui-lib 1.2.23 → 1.2.25

package/lib/gcs-ui-lib.common.js

@@ -45045,7 +45045,8 @@ var _default = exports.default = {
       size: "small",
       sizeBind: {},
       exFields: [],
-      typeCodeList: []
+      typeCodeList: [],
+      displayColumns: [] // 显示列配置
     };
   },
   computed: {
@@ -45075,6 +45076,18 @@ var _default = exports.default = {
       get() {
         return this.columns;
       }
+    },
+    mergedColumns() {
+      return [...this._columns, ...this.exFields].map(item => {
+        const {
+          slotName,
+          ...rest
+        } = item;
+        return {
+          ...rest,
+          label: item.label || item.prop
+        };
+      });
     }
   },
   watch: {
@@ -45084,12 +45097,25 @@ var _default = exports.default = {
       },
       deep: true,
       immediate: true
+    },
+    mergedColumns: {
+      handler(newVal) {
+        if (!this.displayColumns.length && newVal.length) {
+          this.displayColumns = newVal;
+        }
+        this.$emit("columns-change", newVal);
+      },
+      immediate: true
     }
   },
   mounted() {
     this.init();
   },
   methods: {
+    // 判断是否为固定列（通过 prop 是否在传入的 columns 中判断）
+    _isFixedColumn(prop) {
+      return this._columns.some(col => col.prop === prop);
+    },
     async init() {
       let res = await (0, _setting.getCustomSettingFieldFormList)(this.axiosParams);
       this.exFields = [];
@@ -45125,6 +45151,8 @@ var _default = exports.default = {
           minWidth: 250,
           align: "center",
           prop: item.fieldNo,
+          slotName: item.fieldNo,
+          // 扩展字段使用 fieldNo 作为 slotName
           multiple: item.fieldProperty == "multiSelect",
           type: typeMap[item.fieldProperty] || "FillInput",
           "show-overflow-tooltip": true
@@ -45154,6 +45182,7 @@ var _default = exports.default = {
       });
       await this.$nextTick();
       this.clearValidate();
+      this.$emit("columns-change", this.mergedColumns);
     },
     handleSelectionChange(val) {
       this.$emit("selection-change", val);
@@ -45184,6 +45213,18 @@ var _default = exports.default = {
           }
         });
       });
+    },
+    setColumns(columns) {
+      // 确保每列都有 label 属性用于显示
+      this.displayColumns = columns.map(col => ({
+        ...col,
+        label: col.label || col.label2 || col.prop
+      }));
+      this.$forceUpdate();
+      this.$nextTick(() => {
+        var _this$$refs$tBox;
+        (_this$$refs$tBox = this.$refs['t-box']) === null || _this$$refs$tBox === void 0 ? void 0 : _this$$refs$tBox.doLayout();
+      });
     }
   },
   activated() {}
@@ -64983,20 +65024,6 @@ var _default = exports.default = {
 })));
 
 
-/***/ }),
-
-/***/ "6d96":
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony import */ var _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_420d6c76_vue_loader_template_node_modules_cache_loader_dist_cjs_js_ref_12_0_node_modules_babel_loader_lib_index_js_node_modules_vue_loader_lib_loaders_templateLoader_js_ref_6_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_main_vue_vue_type_template_id_07650f66_scoped_true__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("cf7a");
-/* harmony import */ var _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_420d6c76_vue_loader_template_node_modules_cache_loader_dist_cjs_js_ref_12_0_node_modules_babel_loader_lib_index_js_node_modules_vue_loader_lib_loaders_templateLoader_js_ref_6_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_main_vue_vue_type_template_id_07650f66_scoped_true__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_420d6c76_vue_loader_template_node_modules_cache_loader_dist_cjs_js_ref_12_0_node_modules_babel_loader_lib_index_js_node_modules_vue_loader_lib_loaders_templateLoader_js_ref_6_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_main_vue_vue_type_template_id_07650f66_scoped_true__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony reexport (checked) */ if(__webpack_require__.o(_node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_420d6c76_vue_loader_template_node_modules_cache_loader_dist_cjs_js_ref_12_0_node_modules_babel_loader_lib_index_js_node_modules_vue_loader_lib_loaders_templateLoader_js_ref_6_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_main_vue_vue_type_template_id_07650f66_scoped_true__WEBPACK_IMPORTED_MODULE_0__, "render")) __webpack_require__.d(__webpack_exports__, "render", function() { return _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_420d6c76_vue_loader_template_node_modules_cache_loader_dist_cjs_js_ref_12_0_node_modules_babel_loader_lib_index_js_node_modules_vue_loader_lib_loaders_templateLoader_js_ref_6_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_main_vue_vue_type_template_id_07650f66_scoped_true__WEBPACK_IMPORTED_MODULE_0__["render"]; });
-
-/* harmony reexport (checked) */ if(__webpack_require__.o(_node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_420d6c76_vue_loader_template_node_modules_cache_loader_dist_cjs_js_ref_12_0_node_modules_babel_loader_lib_index_js_node_modules_vue_loader_lib_loaders_templateLoader_js_ref_6_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_main_vue_vue_type_template_id_07650f66_scoped_true__WEBPACK_IMPORTED_MODULE_0__, "staticRenderFns")) __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_420d6c76_vue_loader_template_node_modules_cache_loader_dist_cjs_js_ref_12_0_node_modules_babel_loader_lib_index_js_node_modules_vue_loader_lib_loaders_templateLoader_js_ref_6_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_main_vue_vue_type_template_id_07650f66_scoped_true__WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
-
-
-
 /***/ }),
 
 /***/ "6d97":
@@ -104458,168 +104485,6 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ "cf7a":
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.staticRenderFns = exports.render = void 0;
-var render = exports.render = function render() {
-  var _vm = this,
-    _c = _vm._self._c;
-  return _c('div', [!_vm.readOnly ? _c('el-form', {
-    ref: "formRef",
-    attrs: {
-      "model": _vm.formData
-    }
-  }, [_c('el-table', {
-    ref: "t-box",
-    staticClass: "t-box",
-    attrs: {
-      "data": _vm.formData.tableData,
-      "max-height": _vm.tableHeight,
-      "size": _vm.size,
-      "border": "",
-      "header-align": "center"
-    },
-    on: {
-      "selection-change": _vm.handleSelectionChange
-    }
-  }, [_vm.selection ? _c('el-table-column', {
-    attrs: {
-      "type": "selection",
-      "width": "62",
-      "fixed": "left",
-      "align": "center"
-    }
-  }) : _vm._e(), _c('el-table-column', {
-    attrs: {
-      "type": "index",
-      "width": "56",
-      "fixed": "left",
-      "label": _vm.$l('序号'),
-      "align": "center"
-    }
-  }), _vm._l(_vm._columns, function (item) {
-    return _c('el-table-column', _vm._b({
-      key: item.prop,
-      attrs: {
-        "header-align": "center",
-        "min-width": "250",
-        "show-overflow-tooltip": false
-      },
-      scopedSlots: _vm._u([{
-        key: "default",
-        fn: function ({
-          $index,
-          row,
-          column
-        }) {
-          return [_c('el-form-item', {
-            attrs: {
-              "prop": `tableData.${$index}.${item.prop}`,
-              "rules": [{
-                required: _vm._requireProps.includes(item.prop),
-                trigger: ['blur', 'change'],
-                message: '请输入/选择' + item.label
-              }]
-            }
-          }, [_vm._t(item.slotName, null, {
-            "scope": {
-              $index,
-              row,
-              column,
-              item
-            }
-          })], 2)];
-        }
-      }], null, true)
-    }, 'el-table-column', item, false), [_c('template', {
-      slot: "header"
-    }, [_vm.headerProps.includes(item.prop) ? _c('span', {
-      staticClass: "req-h"
-    }, [_vm._v("*")]) : _vm._e(), _vm._v(" " + _vm._s(_vm.$l(item.label)) + " ")])], 2);
-  }), _vm._l(_vm.exFields, function (item) {
-    return _c('el-table-column', _vm._b({
-      key: item.prop,
-      attrs: {
-        "header-align": "center",
-        "min-width": "250",
-        "show-overflow-tooltip": false
-      },
-      scopedSlots: _vm._u([{
-        key: "default",
-        fn: function ({
-          $index,
-          row
-        }) {
-          return [_c('el-form-item', {
-            attrs: {
-              "prop": `tableData.${$index}.${item.prop}`,
-              "rules": [{
-                required: _vm._requireProps.includes(item.prop),
-                trigger: ['blur', 'change'],
-                message: '请输入/选择' + item.label
-              }]
-            }
-          }, [_c(item.type, {
-            tag: "component",
-            attrs: {
-              "disabled": _vm.disabled || row['disabled'],
-              "items": item
-            },
-            model: {
-              value: row[item.prop],
-              callback: function ($$v) {
-                _vm.$set(row, item.prop, $$v);
-              },
-              expression: "row[item.prop]"
-            }
-          })], 1)];
-        }
-      }], null, true)
-    }, 'el-table-column', item, false), [_c('template', {
-      slot: "header"
-    }, [_vm.headerProps.includes(item.prop) ? _c('span', {
-      staticClass: "req-h"
-    }, [_vm._v("*")]) : _vm._e(), _vm._v(" " + _vm._s(_vm.$l(item.label)) + " "), item.fieldDescription ? _c('el-tooltip', {
-      staticClass: "item",
-      attrs: {
-        "effect": "dark",
-        "content": item.fieldDescription,
-        "placement": "top-start"
-      }
-    }, [_c('i', {
-      staticClass: "n20-icon-xinxitishi"
-    })]) : _vm._e()], 1)], 2);
-  }), _c('TableSetSize', {
-    attrs: {
-      "size": _vm.size
-    },
-    on: {
-      "update:size": function ($event) {
-        _vm.size = $event;
-      },
-      "resize": el => _vm.sizeBind = el
-    }
-  })], 2)], 1) : _c('FillTable', {
-    attrs: {
-      "data": _vm.tableData,
-      "columns": _vm.AllColumns,
-      "max-height": _vm.tableHeight,
-      "showSetsize": true,
-      "cell-default": true
-    }
-  })], 1);
-};
-var staticRenderFns = exports.staticRenderFns = [];
-
-/***/ }),
-
 /***/ "cfd7":
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -105702,6 +105567,137 @@ module.exports = {
 };
 
 
+/***/ }),
+
+/***/ "d255":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.staticRenderFns = exports.render = void 0;
+var render = exports.render = function render() {
+  var _vm = this,
+    _c = _vm._self._c;
+  return _c('div', [!_vm.readOnly ? _c('el-form', {
+    ref: "formRef",
+    attrs: {
+      "model": _vm.formData
+    }
+  }, [_c('el-table', {
+    ref: "t-box",
+    staticClass: "t-box",
+    attrs: {
+      "data": _vm.formData.tableData,
+      "max-height": _vm.tableHeight,
+      "size": _vm.size,
+      "border": "",
+      "header-align": "center"
+    },
+    on: {
+      "selection-change": _vm.handleSelectionChange
+    }
+  }, [_vm.selection ? _c('el-table-column', {
+    attrs: {
+      "type": "selection",
+      "width": "62",
+      "fixed": "left",
+      "align": "center"
+    }
+  }) : _vm._e(), _c('el-table-column', {
+    attrs: {
+      "type": "index",
+      "width": "56",
+      "fixed": "left",
+      "label": _vm.$l('序号'),
+      "align": "center"
+    }
+  }), _vm._l(_vm.displayColumns, function (item, index) {
+    return _c('el-table-column', _vm._b({
+      key: `${item.prop}-${index}`,
+      attrs: {
+        "header-align": "center",
+        "min-width": "250",
+        "show-overflow-tooltip": false
+      },
+      scopedSlots: _vm._u([{
+        key: "default",
+        fn: function ({
+          $index,
+          row,
+          column
+        }) {
+          return [_c('el-form-item', {
+            attrs: {
+              "prop": `tableData.${$index}.${item.prop}`,
+              "rules": [{
+                required: _vm._requireProps.includes(item.prop),
+                trigger: ['blur', 'change'],
+                message: '请输入/选择' + item.label
+              }]
+            }
+          }, [_vm._isFixedColumn(item.prop) ? _vm._t(item.slotName, null, {
+            "scope": {
+              $index,
+              row,
+              column,
+              item
+            }
+          }) : _c(item.type, {
+            tag: "component",
+            attrs: {
+              "disabled": _vm.disabled || row['disabled'],
+              "items": item
+            },
+            model: {
+              value: row[item.prop],
+              callback: function ($$v) {
+                _vm.$set(row, item.prop, $$v);
+              },
+              expression: "row[item.prop]"
+            }
+          })], 2)];
+        }
+      }], null, true)
+    }, 'el-table-column', item, false), [_c('template', {
+      slot: "header"
+    }, [_vm.headerProps.includes(item.prop) ? _c('span', {
+      staticClass: "req-h"
+    }, [_vm._v("*")]) : _vm._e(), _vm._v(" " + _vm._s(_vm.$l(item.label)) + " "), item.fieldDescription ? _c('el-tooltip', {
+      staticClass: "item",
+      attrs: {
+        "effect": "dark",
+        "content": item.fieldDescription,
+        "placement": "top-start"
+      }
+    }, [_c('i', {
+      staticClass: "n20-icon-xinxitishi"
+    })]) : _vm._e()], 1)], 2);
+  }), _c('TableSetSize', {
+    attrs: {
+      "size": _vm.size
+    },
+    on: {
+      "update:size": function ($event) {
+        _vm.size = $event;
+      },
+      "resize": el => _vm.sizeBind = el
+    }
+  })], 2)], 1) : _c('FillTable', {
+    attrs: {
+      "data": _vm.tableData,
+      "columns": _vm.AllColumns,
+      "max-height": _vm.tableHeight,
+      "showSetsize": true,
+      "cell-default": true
+    }
+  })], 1);
+};
+var staticRenderFns = exports.staticRenderFns = [];
+
 /***/ }),
 
 /***/ "d263":
@@ -107313,6 +107309,20 @@ var _default = exports.default = {
 
 
 
+/***/ }),
+
+/***/ "d753":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_420d6c76_vue_loader_template_node_modules_cache_loader_dist_cjs_js_ref_12_0_node_modules_babel_loader_lib_index_js_node_modules_vue_loader_lib_loaders_templateLoader_js_ref_6_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_main_vue_vue_type_template_id_c18894b2_scoped_true__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("d255");
+/* harmony import */ var _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_420d6c76_vue_loader_template_node_modules_cache_loader_dist_cjs_js_ref_12_0_node_modules_babel_loader_lib_index_js_node_modules_vue_loader_lib_loaders_templateLoader_js_ref_6_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_main_vue_vue_type_template_id_c18894b2_scoped_true__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_420d6c76_vue_loader_template_node_modules_cache_loader_dist_cjs_js_ref_12_0_node_modules_babel_loader_lib_index_js_node_modules_vue_loader_lib_loaders_templateLoader_js_ref_6_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_main_vue_vue_type_template_id_c18894b2_scoped_true__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony reexport (checked) */ if(__webpack_require__.o(_node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_420d6c76_vue_loader_template_node_modules_cache_loader_dist_cjs_js_ref_12_0_node_modules_babel_loader_lib_index_js_node_modules_vue_loader_lib_loaders_templateLoader_js_ref_6_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_main_vue_vue_type_template_id_c18894b2_scoped_true__WEBPACK_IMPORTED_MODULE_0__, "render")) __webpack_require__.d(__webpack_exports__, "render", function() { return _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_420d6c76_vue_loader_template_node_modules_cache_loader_dist_cjs_js_ref_12_0_node_modules_babel_loader_lib_index_js_node_modules_vue_loader_lib_loaders_templateLoader_js_ref_6_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_main_vue_vue_type_template_id_c18894b2_scoped_true__WEBPACK_IMPORTED_MODULE_0__["render"]; });
+
+/* harmony reexport (checked) */ if(__webpack_require__.o(_node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_420d6c76_vue_loader_template_node_modules_cache_loader_dist_cjs_js_ref_12_0_node_modules_babel_loader_lib_index_js_node_modules_vue_loader_lib_loaders_templateLoader_js_ref_6_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_main_vue_vue_type_template_id_c18894b2_scoped_true__WEBPACK_IMPORTED_MODULE_0__, "staticRenderFns")) __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _node_modules_cache_loader_dist_cjs_js_cacheDirectory_node_modules_cache_vue_loader_cacheIdentifier_420d6c76_vue_loader_template_node_modules_cache_loader_dist_cjs_js_ref_12_0_node_modules_babel_loader_lib_index_js_node_modules_vue_loader_lib_loaders_templateLoader_js_ref_6_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_main_vue_vue_type_template_id_c18894b2_scoped_true__WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
+
+
+
 /***/ }),
 
 /***/ "d77c":
@@ -108703,7 +108713,7 @@ var staticRenderFns = exports.staticRenderFns = [];
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _main_vue_vue_type_template_id_07650f66_scoped_true__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("6d96");
+/* harmony import */ var _main_vue_vue_type_template_id_c18894b2_scoped_true__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("d753");
 /* harmony import */ var _main_vue_vue_type_script_lang_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("b1db");
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _main_vue_vue_type_script_lang_js__WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _main_vue_vue_type_script_lang_js__WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _node_modules_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("2877");
@@ -108716,11 +108726,11 @@ __webpack_require__.r(__webpack_exports__);
 
 var component = Object(_node_modules_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__[/* default */ "a"])(
   _main_vue_vue_type_script_lang_js__WEBPACK_IMPORTED_MODULE_1__["default"],
-  _main_vue_vue_type_template_id_07650f66_scoped_true__WEBPACK_IMPORTED_MODULE_0__["render"],
-  _main_vue_vue_type_template_id_07650f66_scoped_true__WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"],
+  _main_vue_vue_type_template_id_c18894b2_scoped_true__WEBPACK_IMPORTED_MODULE_0__["render"],
+  _main_vue_vue_type_template_id_c18894b2_scoped_true__WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"],
   false,
   null,
-  "07650f66",
+  "c18894b2",
   null
   
 )