@teamias/rex-design 0.1.24 → 0.1.25

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

@@ -80,6 +80,20 @@ export default (function () {
       field: 'category',
       action: 'clear'
     }]
+  }, {
+    valueType: 'select',
+    field: 'subProduct',
+    label: '商品（依赖请求）',
+    tooltip: '开启 dependenciesRequest，类别有值后才发起请求，挂载时不会自动请求',
+    api: '/products',
+    dependenciesRequest: true,
+    dependenciesV2: [{
+      field: 'category',
+      action: 'updateData'
+    }, {
+      field: 'category',
+      action: 'clear'
+    }]
   }, {
     valueType: 'input',
     field: 'showField',

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

@@ -65,6 +65,25 @@ var getValueTypeMinWidth = function getValueTypeMinWidth(type) {
   return 100;
 };
 
+/**
+ * 判断依赖参数是否就绪
+ * - dependenciesV2 updateData: 依赖字段未就绪时跳过请求
+ */
+var areDependenciesReady = function areDependenciesReady(dependenciesRequest, dependencies, params) {
+  if (!dependenciesRequest) return true;
+  var updateDataFields = dependencies === null || dependencies === void 0 ? void 0 : dependencies.filter(function (dep) {
+    return dep.action === 'updateData';
+  }).map(function (dep) {
+    return dep.field;
+  });
+  if (updateDataFields !== null && updateDataFields !== void 0 && updateDataFields.length) {
+    return updateDataFields.every(function (k) {
+      return params[k] !== undefined && params[k] !== null && params[k] !== '';
+    });
+  }
+  return true;
+};
+
 /** 渲染组件项 */
 export var renderComponentNode = function renderComponentNode(outConfig, values, form) {
   var fields = outConfig.fields,
@@ -345,27 +364,33 @@ export var renderComponentNode = function renderComponentNode(outConfig, values,
               while (1) switch (_context.prev = _context.next) {
                 case 0:
                   _ref5 = _args.length > 0 && _args[0] !== undefined ? _args[0] : {}, keyWords = _ref5.keyWords, params = _objectWithoutProperties(_ref5, _excluded7);
+                  if (areDependenciesReady(item.dependenciesRequest, item.dependenciesV2, params)) {
+                    _context.next = 3;
+                    break;
+                  }
+                  return _context.abrupt("return", []);
+                case 3:
                   key = JSON.stringify(params);
                   if (!map[key]) {
-                    _context.next = 4;
+                    _context.next = 6;
                     break;
                   }
                   return _context.abrupt("return", map[key]);
-                case 4:
-                  _context.next = 6;
-                  return requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions(item.api, params, item);
                 case 6:
+                  _context.next = 8;
+                  return requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions(item.api, params, item);
+                case 8:
                   _context.t0 = _context.sent;
                   if (_context.t0) {
-                    _context.next = 9;
+                    _context.next = 11;
                     break;
                   }
                   _context.t0 = [];
-                case 9:
+                case 11:
                   res = _context.t0;
                   map[key] = res;
                   return _context.abrupt("return", res);
-                case 12:
+                case 14:
                 case "end":
                   return _context.stop();
               }
@@ -412,7 +437,14 @@ export var renderComponentNode = function renderComponentNode(outConfig, values,
                     case 0:
                       // 拆分参数，keyWords 为搜索关键字，其余为接口参数
                       _params$keyWords = params.keyWords, keyWords = _params$keyWords === void 0 ? '' : _params$keyWords, restParams = _objectWithoutProperties(params, _excluded8);
-                      newParams = restParams; // 处理搜索关键字参数的传递方式
+                      newParams = restParams;
+                      if (areDependenciesReady(item.dependenciesRequest, item.dependenciesV2, newParams)) {
+                        _context2.next = 4;
+                        break;
+                      }
+                      return _context2.abrupt("return", []);
+                    case 4:
+                      // 处理搜索关键字参数的传递方式
                       if (item.apiSearchKey === false) {
                         // 配置为 false，默认传 keyWords 字段
                         newParams.keyWords = keyWords || undefined;
@@ -427,7 +459,7 @@ export var renderComponentNode = function renderComponentNode(outConfig, values,
 
                       // 发起接口请求，返回选项数据
                       return _context2.abrupt("return", (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions(item.api, newParams, item)) || []);
-                    case 4:
+                    case 6:
                     case "end":
                       return _context2.stop();
                   }
@@ -493,8 +525,14 @@ export var renderComponentNode = function renderComponentNode(outConfig, values,
             return _regeneratorRuntime().wrap(function _callee3$(_context3) {
               while (1) switch (_context3.prev = _context3.next) {
                 case 0:
+                  if (areDependenciesReady(item.dependenciesRequest, item.dependenciesV2, params)) {
+                    _context3.next = 2;
+                    break;
+                  }
+                  return _context3.abrupt("return", []);
+                case 2:
                   return _context3.abrupt("return", (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions(item.api, params, item)) || []);
-                case 1:
+                case 3:
                 case "end":
                   return _context3.stop();
               }
@@ -528,8 +566,14 @@ export var renderComponentNode = function renderComponentNode(outConfig, values,
             return _regeneratorRuntime().wrap(function _callee4$(_context4) {
               while (1) switch (_context4.prev = _context4.next) {
                 case 0:
+                  if (areDependenciesReady(item.dependenciesRequest, item.dependenciesV2, params)) {
+                    _context4.next = 2;
+                    break;
+                  }
+                  return _context4.abrupt("return", []);
+                case 2:
                   return _context4.abrupt("return", (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions(item.api, params, item)) || []);
-                case 1:
+                case 3:
                 case "end":
                   return _context4.stop();
               }
@@ -552,8 +596,14 @@ export var renderComponentNode = function renderComponentNode(outConfig, values,
             return _regeneratorRuntime().wrap(function _callee5$(_context5) {
               while (1) switch (_context5.prev = _context5.next) {
                 case 0:
+                  if (areDependenciesReady(item.dependenciesRequest, item.dependenciesV2, params)) {
+                    _context5.next = 2;
+                    break;
+                  }
+                  return _context5.abrupt("return", []);
+                case 2:
                   return _context5.abrupt("return", (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions(item.api, params, item)) || []);
-                case 1:
+                case 3:
                 case "end":
                   return _context5.stop();
               }
@@ -576,8 +626,14 @@ export var renderComponentNode = function renderComponentNode(outConfig, values,
             return _regeneratorRuntime().wrap(function _callee6$(_context6) {
               while (1) switch (_context6.prev = _context6.next) {
                 case 0:
+                  if (areDependenciesReady(item.dependenciesRequest, item.dependenciesV2, params)) {
+                    _context6.next = 2;
+                    break;
+                  }
+                  return _context6.abrupt("return", []);
+                case 2:
                   return _context6.abrupt("return", (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions(item.api, params, item)) || []);
-                case 1:
+                case 3:
                 case "end":
                   return _context6.stop();
               }

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

@@ -82,6 +82,8 @@ export interface IBaseFormFieldItem<T extends TValueType = TValueType> {
         action: Extract<'value' | 'search' | 'visible' | 'disabled', 'search' | 'visible' | 'disabled'>;
     }>;
     dependenciesV2?: IDependenciesV2[];
+    /** 开启依赖字段有值才触发 request 请求 */
+    dependenciesRequest?: boolean;
     /** 选择项 */
     options?: Array<TOption>;
     /** api接口 */

package/package.json

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