@teamias/rex-design 0.0.17 → 0.0.19

package/dist/components/base-form/base-form.js

@@ -101,15 +101,13 @@ export var BaseForm = function BaseForm(props) {
         return /*#__PURE__*/_jsx(ProFormDependency, {
           name: allFields,
           children: function children(data, form) {
-            var _config$item;
             // 依赖规则可能有多条，且可能作用于同一类型（如多个 hidden、disabled 等），这里需要全部规则都满足才生效
-            var _ref2 = [],
-              hidden = _ref2[0],
-              disabled = _ref2[1],
-              clear = _ref2[2],
-              updateData = _ref2[3],
-              show = _ref2[4],
-              syncValue = _ref2[5];
+            var hidden = [],
+              disabled = [],
+              clear = [],
+              updateData = [],
+              show = [],
+              syncValue = [];
 
             /** 条件判断 */
             var judge = function judge(inlineItem) {
@@ -137,23 +135,48 @@ export var BaseForm = function BaseForm(props) {
               var _dependItem$isTouched;
               switch (dependItem.action) {
                 case 'hidden':
-                  // 多条 hidden 规则，只有全部为 true 时才隐藏（即“与”关系）
-                  if (typeof hidden === 'undefined' || hidden) hidden = isTouchedFn(dependItem.field, dependItem.isTouched) && judge(dependItem);
+                  hidden.push(isTouchedFn(dependItem.field, dependItem.isTouched) && judge(dependItem));
+                  // if (typeof hidden === 'undefined' || hidden)
+                  //   hidden =
+                  //     isTouchedFn(dependItem.field, dependItem.isTouched) &&
+                  //     judge(dependItem);
                   break;
                 case 'show':
-                  if (typeof show === 'undefined' || show) show = isTouchedFn(dependItem.field, dependItem.isTouched) && judge(dependItem);
+                  show.push(isTouchedFn(dependItem.field, dependItem.isTouched) && judge(dependItem));
+                  // if (typeof show === 'undefined' || show)
+                  //   show =
+                  //     isTouchedFn(dependItem.field, dependItem.isTouched) &&
+                  //     judge(dependItem);
                   break;
                 case 'disabled':
-                  if (typeof disabled === 'undefined' || disabled) disabled = isTouchedFn(dependItem.field, dependItem.isTouched) && judge(dependItem);
+                  disabled.push(isTouchedFn(dependItem.field, dependItem.isTouched) && judge(dependItem));
+                  // if (typeof disabled === 'undefined' || disabled)
+                  //   disabled =
+                  //     isTouchedFn(dependItem.field, dependItem.isTouched) &&
+                  //     judge(dependItem);
                   break;
                 case 'clear':
-                  if (typeof clear === 'undefined' || clear) clear = isTouchedFn(dependItem.field, (_dependItem$isTouched = dependItem.isTouched) !== null && _dependItem$isTouched !== void 0 ? _dependItem$isTouched : true) && judge(dependItem);
+                  clear.push(isTouchedFn(dependItem.field, (_dependItem$isTouched = dependItem.isTouched) !== null && _dependItem$isTouched !== void 0 ? _dependItem$isTouched : true) && judge(dependItem));
+                  // if (typeof clear === 'undefined' || clear)
+                  //   clear =
+                  //     isTouchedFn(
+                  //       dependItem.field,
+                  //       dependItem.isTouched ?? true,
+                  //     ) && judge(dependItem);
                   break;
                 case 'updateData':
-                  if (typeof updateData === 'undefined' || updateData) updateData = isTouchedFn(dependItem.field, dependItem.isTouched) && judge(dependItem);
+                  updateData.push(isTouchedFn(dependItem.field, dependItem.isTouched) && judge(dependItem));
+                  // if (typeof updateData === 'undefined' || updateData)
+                  //   updateData =
+                  //     isTouchedFn(dependItem.field, dependItem.isTouched) &&
+                  //     judge(dependItem);
                   break;
                 case 'syncValue':
-                  if (typeof syncValue === 'undefined' || syncValue) syncValue = isTouchedFn(dependItem.field, dependItem.isTouched) && judge(dependItem);
+                  syncValue.push(isTouchedFn(dependItem.field, dependItem.isTouched) && judge(dependItem));
+                  // if (typeof syncValue === 'undefined' || syncValue)
+                  //   syncValue =
+                  //     isTouchedFn(dependItem.field, dependItem.isTouched) &&
+                  //     judge(dependItem);
                   break;
                 default:
                   console.error('Wrong dependenciesV2 action configure');
@@ -161,19 +184,38 @@ export var BaseForm = function BaseForm(props) {
               }
             });
 
-            // 处理冲突：hidden 优先级最高，满足则直接 return null，不渲染
-            if (hidden) return null;
-            // show 存在时，只有全部 show 规则都为 true 才显示，否则 return null
-            if (typeof show === 'boolean' && !show) return null;
+            // hidden: 满足一条 hidden 规则则隐藏
+            if (hidden.some(function (ii) {
+              return ii;
+            })) return null;
+            // show: 满足一条 show 规则则显示
+            if (show.length && !show.some(function (ii) {
+              return ii;
+            })) return null;
 
             // 实时修改 fieldProps，disabled 联动
-            var fieldProps = ((_config$item = config.item) === null || _config$item === void 0 ? void 0 : _config$item.fieldProps) || {};
-            config.item.fieldProps = _objectSpread(_objectSpread({}, fieldProps), {}, {
-              disabled: disabled
-            });
+            if (disabled.length) {
+              if (disabled.some(function (ii) {
+                return ii;
+              })) {
+                var _config$item;
+                var fieldProps = ((_config$item = config.item) === null || _config$item === void 0 ? void 0 : _config$item.fieldProps) || {};
+                config.item.fieldProps = _objectSpread(_objectSpread({}, fieldProps), {}, {
+                  disabled: true
+                });
+              } else {
+                var _config$item2;
+                var _fieldProps = ((_config$item2 = config.item) === null || _config$item2 === void 0 ? void 0 : _config$item2.fieldProps) || {};
+                config.item.fieldProps = _objectSpread(_objectSpread({}, _fieldProps), {}, {
+                  disabled: false
+                });
+              }
+            }
 
-            // clear 联动，满足全部 clear 规则时清空当前字段
-            if (clear) {
+            // clear: 满足一条 clear 规则则清除
+            if (clear.some(function (ii) {
+              return ii;
+            })) {
               setTimeout(function () {
                 form.setFields([{
                   name: keyStr,
@@ -184,11 +226,15 @@ export var BaseForm = function BaseForm(props) {
               });
             }
 
-            // updateData 联动，满足全部 updateData 规则时缓存依赖数据
-            dependenciesSearchCacheData[keyStr] = updateData ? data : undefined;
+            // updateData: 满足一条 updateData 规则则缓存依赖数据
+            dependenciesSearchCacheData[keyStr] = updateData.some(function (ii) {
+              return ii;
+            }) ? data : undefined;
 
-            // syncValue 联动，满足全部 syncValue 规则时同步指定字段的值
-            if (syncValue) {
+            // syncValue: 满足一条 syncValue 规则则同步指定字段的值
+            if (syncValue.some(function (ii) {
+              return ii;
+            })) {
               // 只取第一个 syncValue 规则对应的字段
               var key = item.dependenciesV2.find(function (ii) {
                 return ii.action === 'syncValue';
@@ -224,8 +270,8 @@ export var BaseForm = function BaseForm(props) {
               return values[field] !== undefined && values[field] !== false && values[field].length !== 0;
             });
             if ((disabledFields === null || disabledFields === void 0 ? void 0 : disabledFields.length) > 0 && shouldDisabled) {
-              var _config$item2;
-              var fieldProps = ((_config$item2 = config.item) === null || _config$item2 === void 0 ? void 0 : _config$item2.fieldProps) || {};
+              var _config$item3;
+              var fieldProps = ((_config$item3 = config.item) === null || _config$item3 === void 0 ? void 0 : _config$item3.fieldProps) || {};
               config.item.fieldProps = _objectSpread(_objectSpread({}, fieldProps), {}, {
                 disabled: true
               });

package/dist/components/base-form/demo/BaseFormBasicDepend.js

@@ -66,11 +66,6 @@ var s2 = function s2(params) {
 };
 export default (function () {
   var fields = [{
-    valueType: 'dateRange',
-    field: ['dateRange-start', 'dateRange-end'],
-    label: 'dateRange',
-    defaultValue: -6
-  }, {
     valueType: 'selectDim',
     field: 'selectDim',
     label: 'selectDim',
@@ -80,18 +75,16 @@ export default (function () {
   }, {
     valueType: 'select',
     field: 'select',
-    label: 'select(updateData)',
+    label: '1.selectDim 改变后更新接口数据 (updateData)',
     api: '/selectData',
     dependenciesV2: [{
       field: 'selectDim',
-      action: 'updateData',
-      op: 'eq',
-      target: '2'
+      action: 'updateData'
     }]
   }, {
     valueType: 'input',
     field: 'input111',
-    label: 'input (selectDim === 2 显示)',
+    label: '2.selectDim === 2 显示',
     dependenciesV2: [{
       field: 'selectDim',
       action: 'show',
@@ -101,7 +94,7 @@ export default (function () {
   }, {
     valueType: 'input',
     field: 'input222',
-    label: 'input (selectDim 为空时隐藏)',
+    label: '3.selectDim 为空时隐藏',
     dependenciesV2: [{
       field: 'selectDim',
       action: 'hidden',
@@ -110,15 +103,18 @@ export default (function () {
   }, {
     valueType: 'input',
     field: 'input333',
-    label: 'input (selectDim 改变时,清空值)',
+    label: '4.(selectDim 和 1.) 改变时,清空值',
     dependenciesV2: [{
       field: 'selectDim',
       action: 'clear'
+    }, {
+      field: 'select',
+      action: 'clear'
     }]
   }, {
     valueType: 'input',
     field: 'input444',
-    label: 'input (selectDim 改变时同步赋值)',
+    label: '5.selectDim 改变时同步赋值',
     dependenciesV2: [{
       field: 'selectDim',
       action: 'syncValue'
@@ -126,7 +122,7 @@ export default (function () {
   }, {
     valueType: 'input',
     field: 'input555',
-    label: 'input (selectDim 非空disabled)',
+    label: '6.selectDim 非空 disabled',
     dependenciesV2: [{
       field: 'selectDim',
       action: 'disabled',
@@ -135,28 +131,6 @@ export default (function () {
       field: 'selectDim',
       action: 'syncValue'
     }]
-  }, {
-    label: '订单类型',
-    field: 'order_type',
-    valueType: 'select',
-    multiple: false,
-    api: '/selectData',
-    defaultParams: {
-      type: 1
-    }
-  }, {
-    label: '状态',
-    field: 'status',
-    valueType: 'select',
-    multiple: false,
-    api: '/selectData',
-    dependenciesV2: [{
-      field: 'order_type',
-      action: 'updateData'
-    }]
-    // "defaultParams": {
-    //   "order_type": 2
-    // }
   }];
   var initialValues = getFieldsDefaultValues(fields);
   // console.log(initialValues);

package/dist/components/base-form/demo/BaseFormCustomContent.js

@@ -14,9 +14,14 @@ import { getFieldsDefaultValues } from "../modules/handlerData";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export default (function () {
+  var t = 'hidden';
   var _useStateData = useStateData(function () {
       return {
         fields: [{
+          valueType: 'hidden',
+          field: 'www.hidden',
+          initialValue: 'I am hidden'
+        }, {
           valueType: 'multipleComponents',
           compact: false,
           label: '尺寸',

package/dist/components/base-form/types.d.ts

@@ -5,7 +5,7 @@ import { ReactNode } from 'react';
 /** 组件props */
 export interface IBaseFormProps {
     /** 字段配置 */
-    fields?: Array<TInputProps | TDateRangeProps | TSelectProps | TSelectInputProps | TSelectDimProps | TCustomProps | TSelectDateRangeProps | TCascaderProps | TTreeSelectProps | TCheckboxProps | TCheckboxGroupProps | TRadioGroupProps | TInputNumberProps | TInputNumberRangeProps | TTextAreaProps | TSelectRadioProps | TMultipleComponentsProps | TSwitchProps | TDatePickerProps>;
+    fields?: Array<TInputProps | TDateRangeProps | TSelectProps | TSelectInputProps | TSelectDimProps | TCustomProps | TSelectDateRangeProps | TCascaderProps | TTreeSelectProps | TCheckboxProps | TCheckboxGroupProps | TRadioGroupProps | TInputNumberProps | TInputNumberRangeProps | TTextAreaProps | TSelectRadioProps | TMultipleComponentsProps | TSwitchProps | TDatePickerProps | THiddenProps>;
     /** 字段对应的本地代码配置 */
     fieldProps?: Record<string, Exclude<IBaseFormProps['fields'], undefined>[number]>;
     /**
@@ -40,6 +40,7 @@ export type TTextAreaProps = IBaseFormFieldItem<'textArea'> & Omit<GetProps<type
 export type TSelectRadioProps = IBaseFormFieldItem<'selectRadio'> & Omit<GetProps<typeof ProFormSelect>, TOmitComponentItemType>;
 export type TSwitchProps = IBaseFormFieldItem<'switch'> & Omit<GetProps<typeof ProFormSwitch>, TOmitComponentItemType>;
 export type TDatePickerProps = IBaseFormFieldItem<'datePicker'> & Omit<GetProps<typeof ProFormDatePicker>, TOmitComponentItemType>;
+export type THiddenProps = IBaseFormFieldItem<'hidden'> & Omit<GetProps<typeof ProFormText>, TOmitComponentItemType>;
 export type TSelectInputProps = IBaseFormFieldItem<'selectInput'> & Omit<GetProps<typeof ProFormText>, TOmitComponentItemType>;
 export type TSelectDateRangeProps = IBaseFormFieldItem<'selectDateRange'> & Omit<GetProps<typeof ProFormDateRangePicker>, TOmitComponentItemType>;
 export type TMultipleComponentsProps = IBaseFormFieldItem<'multipleComponents'> & GetProps<typeof Form.Item> & {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamias/rex-design",
-  "version": "0.0.17",
+  "version": "0.0.19",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",