@teamias/rex-design 0.1.26 → 0.1.27

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

@@ -237,9 +237,22 @@ export var Core = function Core(props) {
             }
 
             // updateData: 满足一条 updateData 规则则缓存依赖数据
-            dependenciesSearchCacheData[keyStr] = updateData.some(function (ii) {
+            // 当配置了 mappedField 时, 将原始 field key 映射为 mappedField key 作为 request 入参
+            if (updateData.some(function (ii) {
               return ii;
-            }) ? data : undefined;
+            })) {
+              var mapped = _objectSpread({}, data);
+              Object.values(dependMap).forEach(function (dep) {
+                if (dep.action === 'updateData' && dep.mappedField && dep.field in mapped) {
+                  var sourceValue = mapped;
+                  sourceValue[dep.mappedField] = sourceValue[dep.field];
+                  delete sourceValue[dep.field];
+                }
+              });
+              dependenciesSearchCacheData[keyStr] = mapped;
+            } else {
+              dependenciesSearchCacheData[keyStr] = undefined;
+            }
 
             // syncValue: 满足一条 syncValue 规则则同步指定字段的值
             if (syncValue.some(function (ii) {

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

@@ -17,11 +17,13 @@ export default (function () {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _context.next = 2;
+            // 模拟接口请求
+            console.log('mockRequest params:', params);
+            _context.next = 3;
             return sleep(500);
-          case 2:
+          case 3:
             if (!(params.category === 'fruit')) {
-              _context.next = 4;
+              _context.next = 5;
               break;
             }
             return _context.abrupt("return", [{
@@ -34,7 +36,19 @@ export default (function () {
               label: '橙子',
               value: 'orange'
             }]);
-          case 4:
+          case 5:
+            if (!params.dept_id) {
+              _context.next = 7;
+              break;
+            }
+            return _context.abrupt("return", [{
+              label: "\u5C97\u4F4DA\uFF08dept_id=".concat(params.dept_id, "\uFF09"),
+              value: 'job_a'
+            }, {
+              label: "\u5C97\u4F4DB\uFF08dept_id=".concat(params.dept_id, "\uFF09"),
+              value: 'job_b'
+            }]);
+          case 7:
             return _context.abrupt("return", [{
               label: '白菜',
               value: 'cabbage'
@@ -45,7 +59,7 @@ export default (function () {
               label: '土豆',
               value: 'potato'
             }]);
-          case 5:
+          case 8:
           case "end":
             return _context.stop();
         }
@@ -144,6 +158,38 @@ export default (function () {
       field: 'category',
       action: 'clear'
     }]
+  }, {
+    valueType: 'select',
+    field: 'org_id',
+    label: '部门',
+    options: [{
+      label: '研发部',
+      value: 'dev'
+    }, {
+      label: '产品部',
+      value: 'product'
+    }, {
+      label: '设计部',
+      value: 'design'
+    }]
+  }, {
+    valueType: 'select',
+    field: 'job_id',
+    label: '岗位（mappedField）',
+    tooltip: '依赖 org_id，但通过 mappedField 将请求入参 key 从 org_id 映射为 dept_id',
+    api: '/jobs',
+    dependenciesV2: [{
+      field: 'org_id',
+      action: 'updateData',
+      mappedField: 'dept_id'
+    }, {
+      field: 'org_id',
+      action: 'clear'
+    }, {
+      field: 'org_id',
+      action: 'show',
+      op: 'notEmpty'
+    }]
   }];
   return /*#__PURE__*/_jsx(RexProConfigProvider, {
     value: {},

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

@@ -74,7 +74,7 @@ var areDependenciesReady = function areDependenciesReady(dependenciesRequest, de
   var updateDataFields = dependencies === null || dependencies === void 0 ? void 0 : dependencies.filter(function (dep) {
     return dep.action === 'updateData';
   }).map(function (dep) {
-    return dep.field;
+    return dep.mappedField || dep.field;
   });
   if (updateDataFields !== null && updateDataFields !== void 0 && updateDataFields.length) {
     return updateDataFields.every(function (k) {

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

@@ -148,7 +148,7 @@ type TOption = {
     children?: TOption[];
 };
 /** 统一排除属性 */
-type TOmitComponentItemType = 'width';
+type TOmitComponentItemType = 'width' | 'name';
 /** 依赖项 */
 export interface IDependenciesV2 extends Partial<Omit<TButtonFilterItem, 'original'>> {
     /** 依赖字段 */
@@ -165,5 +165,9 @@ export interface IDependenciesV2 extends Partial<Omit<TButtonFilterItem, 'origin
      * - false 类型: updateData disabled hidden show syncValue
      */
     isTouched?: boolean;
+    /**
+     * 针对于 action: updateData 的时候, 需要提供新的字段,作为更新数据的依据
+     */
+    mappedField?: string;
 }
 export {};

package/package.json

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