iov-pro-components 0.0.21 → 0.0.23

package/lib/iov-pro-components.min.js

@@ -8378,7 +8378,9 @@ var script$j = {
         modelValue: {}
       },
       // 需要触发的钩子函数
-      hooks: _defineProperty$1(_defineProperty$1(_defineProperty$1(_defineProperty$1(_defineProperty$1({}, HOOKS.INIT, []), HOOKS.DO_LAYOUT, []), HOOKS.VALUE_CHANGE, []), HOOKS.OPTION_CHANGE, []), HOOKS.PROPS_CHANGE, [])
+      hooks: _defineProperty$1(_defineProperty$1(_defineProperty$1(_defineProperty$1(_defineProperty$1({}, HOOKS.INIT, []), HOOKS.DO_LAYOUT, []), HOOKS.VALUE_CHANGE, []), HOOKS.OPTION_CHANGE, []), HOOKS.PROPS_CHANGE, []),
+      // 当前所有的form-item集合
+      formItems: []
     };
   },
   computed: {
@@ -8388,16 +8390,20 @@ var script$j = {
      */
     formProps: function formProps() {
       return this.normalizeFormProps();
-    },
-    /**
-     * 当前所有的form-item集合
-     * @time 2024-11-04 17:23:02
-     */
-    formItems: function formItems() {
-      return this.normalizeFormItems(this.items);
     }
   },
   watch: {
+    /**
+     * 监听items的变化，如果变化了，重新生成formItems
+     * @time 2025-06-20 11:25:49
+     */
+    items: {
+      handler: function handler() {
+        this.formItems = this.normalizeFormItems(this.items);
+      },
+      deep: true,
+      immediate: true
+    },
     /**
      * 如果表单数据的变化，则v-model双向绑定外部数据
      * @time 2024-11-01 15:17:51
@@ -8465,31 +8471,36 @@ var script$j = {
         // 遍历当前传入的数据
         valueKeys.forEach(function (key) {
           // 取出当前表单项配置
-          var formItem = _this2.formItems.find(function (item) {
+          var formItems = _this2.formItems.filter(function (item) {
             return Array.isArray(item.name) ? item.name.includes(key) : item.name === key;
+          }).filter(function (item) {
+            return _this2.vif(item);
           });
           // 如果当前是表单的字段
-          if (formItem) {
-            // 如果当前名称需要解构
-            if (Array.isArray(formItem.name)) {
-              var _this2$modelValue$for;
-              // 当前key在数组中索引
-              var nameIndex = formItem.name.indexOf(key);
-              // 值发生改变
-              if (!isEqual(_this2.value[key], (_this2$modelValue$for = _this2.modelValue[formItem.key]) === null || _this2$modelValue$for === void 0 ? void 0 : _this2$modelValue$for[nameIndex])) {
-                // 如果字段值不存在
-                if (isEmpty(_this2.modelValue[formItem.key])) {
-                  _this2.$set(_this2.modelValue, formItem.key, []);
+          if (formItems && formItems.length > 0) {
+            // 遍历数据
+            formItems.forEach(function (formItem) {
+              // 如果当前名称需要解构
+              if (Array.isArray(formItem.name)) {
+                var _this2$modelValue$for;
+                // 当前key在数组中索引
+                var nameIndex = formItem.name.indexOf(key);
+                // 值发生改变
+                if (!isEqual(_this2.value[key], (_this2$modelValue$for = _this2.modelValue[formItem.key]) === null || _this2$modelValue$for === void 0 ? void 0 : _this2$modelValue$for[nameIndex])) {
+                  // 如果字段值不存在
+                  if (isEmpty(_this2.modelValue[formItem.key])) {
+                    _this2.$set(_this2.modelValue, formItem.key, []);
+                  }
+                  // 设置值
+                  _this2.$set(_this2.modelValue[formItem.key], nameIndex, _this2.value[key]);
+                }
+              } else {
+                // 值发生改变
+                if (!isEqual(_this2.value[key], _this2.modelValue[formItem.key])) {
+                  _this2.$set(_this2.modelValue, formItem.key, _this2.value[key]);
                 }
-                // 设置值
-                _this2.$set(_this2.modelValue[formItem.key], nameIndex, _this2.value[key]);
-              }
-            } else {
-              // 值发生改变
-              if (!isEqual(_this2.value[key], _this2.modelValue[formItem.key])) {
-                _this2.$set(_this2.modelValue, formItem.key, _this2.value[key]);
               }
-            }
+            });
           } else {
             // 值发生改变
             if (!isEqual(_this2.value[key], _this2.modelValue[key])) {
@@ -8523,7 +8534,7 @@ var script$j = {
               }
             } else {
               // 值被清空了
-              if (isNil(_this2.value[key])) {
+              if (isNil(_this2.value[formItem.name])) {
                 _this2.clearFieldValue(formItem);
               }
             }
@@ -11393,6 +11404,7 @@ var script$9 = {
       var _this$request = this.request,
         _api = _this$request.api,
         params = _this$request.params,
+        hideLoading = _this$request.hideLoading,
         requiredFields = _this$request.requiredFields,
         reloadOnParamsChange = _this$request.reloadOnParamsChange,
         threshold = _this$request.threshold;
@@ -11425,6 +11437,7 @@ var script$9 = {
         },
         params: requestParams,
         requiredFields: requiredFields,
+        hideLoading: hideLoading || false,
         reloadOnParamsChange: isNil$2(reloadOnParamsChange) ? true : reloadOnParamsChange,
         threshold: threshold || 10
       };
@@ -11709,8 +11722,18 @@ var script$9 = {
      * @time 2024-11-27 18:42:59
      */
     doLayout: function doLayout(columns) {
+      var _this5 = this;
       // 记录当前隐藏的列
-      this.displayColumns = columns.filter(this.vif);
+      this.displayColumns = columns.filter(this.vif).map(function (column) {
+        // 处理后的数据
+        var columnCopy = {};
+        // 遍历字段的key
+        Object.keys(column).forEach(function (fieldKey) {
+          columnCopy[fieldKey] = isEvalFunction(column[fieldKey]) ? _this5.functionEval(column[fieldKey]) : column[fieldKey];
+        });
+        // 返回处理后的数据
+        return columnCopy;
+      });
       // 重新渲染
       this.tableKey = randomString(32);
     },
@@ -11738,7 +11761,7 @@ var script$9 = {
     }
   },
   render: function render() {
-    var _this5 = this;
+    var _this6 = this;
     var h = arguments[0];
     var _getComponentNames = getComponentNames(['table', 'table-column', 'tag', 'link', 'pagination']),
       _getComponentNames2 = _slicedToArray(_getComponentNames, 5),
@@ -11771,24 +11794,24 @@ var script$9 = {
             "class": 'iov-pro-table'
           }, [h(Table, _mergeJSXProps([{
             "ref": 'table',
-            "key": _this5.tableKey
+            "key": _this6.tableKey
           }, {
             "props": _objectSpread2({
-              data: data ? lodashGet(data, _this5.aliasMap.list) : []
-            }, _this5.tableConfig)
+              data: data ? lodashGet(data, _this6.aliasMap.list) : []
+            }, _this6.tableConfig)
           }, {
             "class": 'iov-pro-table__table'
           }, {
-            "on": _this5.bindEvent(TABLE_EVENTS)
+            "on": _this6.bindEvent(TABLE_EVENTS)
           }]), [
           // 遍历配置项
-          _this5.displayColumns.map(function (column) {
+          _this6.displayColumns.map(function (column) {
             // 当前属性
-            var props = _this5.getTableProps(column);
+            var props = _this6.getTableProps(column);
             // slots
             var scopedSlots = {};
             // 插槽的执行方法
-            var scopedSlotsFunc = column.slotName ? _this5.$scopedSlots[column.slotName] : _this5.$scopedSlots[column.prop];
+            var scopedSlotsFunc = column.slotName ? _this6.$scopedSlots[column.slotName] : _this6.$scopedSlots[column.prop];
             // 根据类型去设置props和scopedSlots
             switch (column.type) {
               case 'enum':
@@ -11916,17 +11939,17 @@ var script$9 = {
                     "column": column
                   },
                   "on": {
-                    "sort": _this5.onSortAdvance.bind(_this5, column),
+                    "sort": _this6.onSortAdvance.bind(_this6, column),
                     "confirm": function confirm(val) {
-                      return _this5.onConfirmAdvance(column, val);
+                      return _this6.onConfirmAdvance(column, val);
                     },
-                    "reset": _this5.onResetAdvance.bind(_this5, column)
+                    "reset": _this6.onResetAdvance.bind(_this6, column)
                   }
                 }));
               }
             });
             // 表头插槽
-            var scopedSlotsHeader = _this5.$scopedSlots["".concat(column.prop, ":header")];
+            var scopedSlotsHeader = _this6.$scopedSlots["".concat(column.prop, ":header")];
             // 如果当前有搜索，排序等功能
             if (tableColumnHeader.length > 0) {
               scopedSlots.header = function () {
@@ -11954,23 +11977,23 @@ var script$9 = {
             }]));
           })]),
           // 如果有分页数量才展示
-          data && lodashGet(data, _this5.aliasMap.totalCount) > 0 && _this5.config.pagination !== false ? h(Pagination, _mergeJSXProps([{}, {
-            "props": _objectSpread2(_objectSpread2({}, _this5.paginationConfig), {}, {
-              currentPage: _this5.currPage,
-              pageSize: _this5.pageSize,
-              total: lodashGet(data, _this5.aliasMap.totalCount)
+          data && lodashGet(data, _this6.aliasMap.totalCount) > 0 && _this6.config.pagination !== false ? h(Pagination, _mergeJSXProps([{}, {
+            "props": _objectSpread2(_objectSpread2({}, _this6.paginationConfig), {}, {
+              currentPage: _this6.currPage,
+              pageSize: _this6.pageSize,
+              total: lodashGet(data, _this6.aliasMap.totalCount)
             })
           }, {
             "class": 'iov-pro-table__pagination'
           }, {
-            "on": _this5.bindEvent(PAGINATION_EVENTS)
+            "on": _this6.bindEvent(PAGINATION_EVENTS)
           }])) : null]);
         }
       }
     }, {
       "on": {
         loaded: function loaded(respData) {
-          return _this5.$emit('loaded', respData);
+          return _this6.$emit('loaded', respData);
         }
       }
     }]));
@@ -19923,7 +19946,7 @@ var install = function install(Vue, componentConfig) {
 };
 var index = {
   install: install,
-  version: '0.0.21',
+  version: '0.0.23',
   ColumnTooltip: __vue_component__$t,
   Description: __vue_component__$q,
   DialogSelect: __vue_component__$p,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iov-pro-components",
-  "version": "0.0.21",
+  "version": "0.0.23",
   "description": "IOV Pro Components for Vue.js",
   "main": "lib/iov-pro-components.min.js",
   "files": [