zmdms-webui 2.9.9 → 3.0.0

package/dist/es/config/utils.js

@@ -8,6 +8,30 @@
  */
 function getFinalValue(globalDefault, componentValue) {
     return componentValue !== null && componentValue !== void 0 ? componentValue : globalDefault;
+}
+/**
+ * 访问对象值 path可能是数组或字符串。
+ * @param obj 目标对象
+ * @param path 访问路径
+ * @returns 访问到的值
+ * @example
+ * accessObjValue({ a: { b: { c: 1 } } }, "a.b.c"); // 1
+ * accessObjValue({ a: { b: { c: 1 } } }, ["a", "b", "c"]); // 1
+ */
+function accessObjValue(obj, path) {
+    if (!obj) {
+        return undefined;
+    }
+    var pathArr = Array.isArray(path) ? path : path.split(".");
+    var result = obj;
+    for (var _i = 0, pathArr_1 = pathArr; _i < pathArr_1.length; _i++) {
+        var key = pathArr_1[_i];
+        result = result[key];
+        if (!result) {
+            return undefined;
+        }
+    }
+    return result;
 }
 
-export { getFinalValue };
+export { accessObjValue, getFinalValue };

package/dist/es/form/form.js

@@ -76,13 +76,16 @@ var Form = function (props, ref) {
         if (items) {
             for (var i = 0; i < items.length; i++) {
                 var item = items[i];
-                if (typeof item.name === "string" &&
+                if ((typeof item.name === "string" || Array.isArray(item.name)) &&
                     item.shouldUpdateNames &&
                     item.shouldUpdateClear) {
                     var keys = typeof item.shouldUpdateClear === "boolean"
                         ? item.shouldUpdateNames
                         : item.shouldUpdateClear;
-                    result[item.name] = {
+                    var nameKey = Array.isArray(item.name)
+                        ? item.name.join(".")
+                        : item.name;
+                    result[nameKey] = {
                         keys: keys,
                         isDisplay: item.isDisplay,
                     };
@@ -96,6 +99,42 @@ var Form = function (props, ref) {
         if (changedValues) {
             var keys = Object.keys(changedValues);
             var nameKeys_1 = Object.keys(itemsShouldUpdate);
+            // 支持name传入数组的情况。
+            // 如果清空状态里面，有数组的话，可以继续查找
+            var isInClear_1 = function (shouldUpdateClear, key) {
+                // 遍历name，查找changedValues是否跟key匹配
+                var isFindName = function (name, obj, firstKey) {
+                    var formNameKey = firstKey.split(".");
+                    if (formNameKey.length > 1) {
+                        return name.join(".") === firstKey;
+                    }
+                    var currentObj = obj;
+                    var isFind = true;
+                    for (var i = 0; i < name.length; i++) {
+                        var nameKey = name[i];
+                        if (i === 0 && nameKey !== firstKey) {
+                            isFind = false;
+                            break;
+                        }
+                        if (!currentObj.hasOwnProperty(nameKey)) {
+                            isFind = false;
+                            break;
+                        }
+                        currentObj = currentObj[nameKey];
+                    }
+                    return isFind;
+                };
+                for (var i = 0; i < shouldUpdateClear.length; i++) {
+                    var name_1 = shouldUpdateClear[i];
+                    if (typeof name_1 === "string" && name_1 === key) {
+                        return true;
+                    }
+                    if (Array.isArray(name_1) && isFindName(name_1, changedValues, key)) {
+                        return true;
+                    }
+                }
+                return false;
+            };
             var changeKeys_1 = [];
             var clearHandler_1 = function (keys) {
                 changeKeys_1 = [];
@@ -105,13 +144,15 @@ var Form = function (props, ref) {
                         var shouldUpdateClear = itemsShouldUpdate[nameKey]
                             ? (_a = itemsShouldUpdate[nameKey]) === null || _a === void 0 ? void 0 : _a.keys
                             : [];
-                        if (keys.find(function (key) { return shouldUpdateClear.includes(key); })) {
+                        // if (keys.find((key) => shouldUpdateClear.includes(key))) {
+                        if (keys.find(function (key) { return isInClear_1(shouldUpdateClear, key); })) {
                             // 这里用undefined当清空值得话，会有点问题。
                             // https://github.com/react-component/select/commit/305b3dcfe627482686055a1ec9c34705623d807f
                             // 对于下拉框来说 会报这个警告 `label` of `value` is not same as `label` in Select options.
                             // 暂时不知道如何消除这个警告 用 null 和 "" 都可以
                             // TODO: 暂时改成null
-                            (_b = form === null || form === void 0 ? void 0 : form.setFieldValue) === null || _b === void 0 ? void 0 : _b.call(form, nameKey, null);
+                            var formNameKey = nameKey.split(".");
+                            (_b = form === null || form === void 0 ? void 0 : form.setFieldValue) === null || _b === void 0 ? void 0 : _b.call(form, formNameKey.length === 1 ? nameKey : formNameKey, null);
                             changeKeys_1.push(nameKey);
                             // form?.setFieldsValue?.({
                             //   [nameKey]: undefined,
@@ -120,6 +161,7 @@ var Form = function (props, ref) {
                     });
                 }
                 // 增加递归逻辑，可能字段之间有依赖联系
+                // B字段依赖A字段，C字段依赖B字段。那么清空A字段时，需要判断是否清空B字段和C字段
                 if (changeKeys_1.length > 0) {
                     clearHandler_1(changeKeys_1);
                 }

package/dist/es/formitem/formItem.d.ts

@@ -71,11 +71,11 @@ interface IFormItem extends Omit<FormItemProps, "label"> {
     /**
      * 控制依赖关系
      */
-    shouldUpdateNames?: string[];
+    shouldUpdateNames?: (string[] | string)[];
     /**
      * 依赖关系发生改变是否需要清空 当前item
      */
-    shouldUpdateClear?: boolean | string[];
+    shouldUpdateClear?: boolean | (string[] | string)[];
     /**
      * 是否需要外部参数判断是否渲染组件，编写高性能表单时，可能会用到这个配置
      * 什么场景下需要开启这个配置：

package/dist/es/formitem/formItem.js

@@ -6,6 +6,7 @@ import classNames from '../node_modules/classnames/index.js';
 import '../config/ZtxkContext.js';
 import isEqual from '../config/isEqual.js';
 import '../config/MyStorage.js';
+import { accessObjValue } from '../config/utils.js';
 import QuestionCircleOutlined from '../node_modules/@ant-design/icons/es/icons/QuestionCircleOutlined.js';
 
 var hiddenLabelCol = { span: 0 };
@@ -93,7 +94,8 @@ var FormItem = function (props) {
             ? function (prevValues, curValues, info) {
                 for (var i = 0; i < shouldUpdateNames.length; i++) {
                     var shouldUpdateName = shouldUpdateNames[i];
-                    if (prevValues[shouldUpdateName] !== curValues[shouldUpdateName]) {
+                    if (accessObjValue(prevValues, shouldUpdateName) !==
+                        accessObjValue(curValues, shouldUpdateName)) {
                         return true;
                     }
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmdms-webui",
-  "version": "2.9.9",
+  "version": "3.0.0",
   "private": false,
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",