ztxkui 6.0.2 → 6.0.3

package/dist/UI/Form/index.js

@@ -162,10 +162,12 @@ function Home() {
             {
                 name: 'test3',
                 label: '测试3',
-                shouldUpdate: function (prevValues, curValues) {
-                    return prevValues.test1 !== curValues.test1;
+                shouldUpdateNames: ['test23'],
+                shouldUpdateBeOutsideState: function () { return true; },
+                isDisplay: function (form) {
+                    console.log(form, form.getFieldValue('test23'));
+                    return form.getFieldValue('test23') === '1';
                 },
-                shouldUpdateBeOutsideState: function () { return false; },
                 render: function (itemProps, formInstance) {
                     return React.createElement(Input, __assign({}, itemProps));
                 },

package/dist/components/ProForm/interface.d.ts

@@ -15,15 +15,15 @@ export interface IFormItem extends FormItemProps {
     /**
      * 是否必填
      */
-    isRequired?: boolean;
+    isRequired?: boolean | ((formInstance: FormInstance<any>) => boolean);
     /**
      * 是否可以修改
      */
-    isChangeable?: boolean;
+    isChangeable?: boolean | ((formInstance: FormInstance<any>) => boolean);
     /**
      * 是否展示
      */
-    isDisplay?: boolean;
+    isDisplay?: boolean | ((formInstance: FormInstance<any>) => boolean);
     /**
      * 前缀
      */

package/dist/components/ProForm/item.js

@@ -30,6 +30,34 @@ function runHandle(form, handle) {
 function Item(item) {
     var _a, _b, _c;
     var render = item.render, isRequired = item.isRequired, isDisplay = item.isDisplay, isChangeable = item.isChangeable, dependencies = item.dependencies, shouldUpdate = item.shouldUpdate, preText = item.preText, nextText = item.nextText, disabled = item.disabled, noBorder = item.noBorder, noLabel = item.noLabel, showBoxBorder = item.showBoxBorder, width = item.width, shouldUpdateNames = item.shouldUpdateNames, shouldUpdateClear = item.shouldUpdateClear, configName = item.configName, index = item.index, itemClassName = item.itemClassName, form = item.form, _isDisplayConfigInfo = item._isDisplayConfigInfo, _isRequireConfigInfo = item._isRequireConfigInfo, _isChangeableConfigInfo = item._isChangeableConfigInfo, outsideState = item.outsideState, shouldUpdateBeOutsideState = item.shouldUpdateBeOutsideState, resetItem = __rest(item, ["render", "isRequired", "isDisplay", "isChangeable", "dependencies", "shouldUpdate", "preText", "nextText", "disabled", "noBorder", "noLabel", "showBoxBorder", "width", "shouldUpdateNames", "shouldUpdateClear", "configName", "index", "itemClassName", "form", "_isDisplayConfigInfo", "_isRequireConfigInfo", "_isChangeableConfigInfo", "outsideState", "shouldUpdateBeOutsideState"]);
+    // 更新是否必填配置
+    var updateIsRequired = function (isRequired) {
+        var _a;
+        var isRequireBoolean = !!isRequired;
+        var rules = Array.isArray(resetItem.rules) ? resetItem.rules : [];
+        // 是否之前就传入了必填非必填逻辑
+        var requiredIndex = rules.findIndex(function (rule) {
+            if (typeof rule === 'function') {
+                return false;
+            }
+            return (rule === null || rule === void 0 ? void 0 : rule.required) === true || (rule === null || rule === void 0 ? void 0 : rule.required) === false;
+        });
+        // 如果找到了 直接替换之前的规则
+        if (requiredIndex !== -1) {
+            var message = (_a = rules[requiredIndex]) === null || _a === void 0 ? void 0 : _a.message;
+            rules.splice(requiredIndex, 1, {
+                required: isRequireBoolean,
+                message: message,
+            });
+        }
+        else {
+            rules.unshift({
+                required: isRequireBoolean,
+                message: resetItem.label + " \u672A\u586B!",
+            });
+        }
+        resetItem.rules = rules;
+    };
     // 处理配置相关逻辑 配置优先代码设置
     // 传入了是否展示配置
     var _isDisplay = typeof _isDisplayConfigInfo === 'undefined'
@@ -125,6 +153,20 @@ function Item(item) {
         return (React.createElement(ItemWrap, { key: key, width: width },
             preText ? preText : null,
             React.createElement(Form.Item, { shouldUpdate: shouldUpdateHandle, noStyle: true }, function (formInstance) {
+                if (typeof isDisplay === 'function') {
+                    var isD = isDisplay(form);
+                    if (!isD) {
+                        return null;
+                    }
+                }
+                if (typeof isRequired === 'function') {
+                    var isR = isRequired(form);
+                    updateIsRequired(isR);
+                }
+                if (typeof isChangeable === 'function') {
+                    var isC = isChangeable(form);
+                    itemProps.disabled = !isC;
+                }
                 return item.name ? (React.createElement(Form.Item, __assign({}, resetItem, { className: itemClasses }), render(itemProps, formInstance))) : (render(itemProps, formInstance));
             }),
             nextText ? nextText : null));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkui",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "private": false,
   "description": "React components library",
   "author": "zt-front-end",
@@ -94,7 +94,8 @@
     "source-map-explorer": "^2.5.2",
     "typescript": "^4.1.2",
     "web-vitals": "^1.0.1",
-    "ztxkutils": "^4.0.1"
+    "ztxkutils": "^2.10.66-32",
+    "ztxkui": "6.0.2"
   },
   "peerDependencies": {
     "axios": ">=0.21.1",
@@ -104,4 +105,4 @@
     "react-dom": ">=16.9.0",
     "ztxkutils": ">=4.0.1"
   }
-}
+}