@zhubangyun/lowcode-core 5.8.110 → 5.8.290

package/lib/utils/api/form-api.utils.js

@@ -3,7 +3,8 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
 exports.assembleAssociationField = assembleAssociationField;
-exports.assembleAssociationFieldValue = assembleAssociationFieldValue;
+exports.assembleAssociationFieldDataV2 = assembleAssociationFieldDataV2;
+exports.assembleAssociationFieldV2 = assembleAssociationFieldV2;
 exports.convertSaveData = convertSaveData;
 exports.handleFilterRules = handleFilterRules;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
@@ -20,24 +21,94 @@ function convertSaveData(data) {
     return value;
   }));
 }
-function assembleAssociationField(data, refs) {
+function getDataKey(data) {
+  var key = data.form.id;
+  if (data.form.fieldId) {
+    key += "." + data.form.fieldId;
+  }
+  return key + "." + data.id;
+}
+function assembleAssociationFieldV2(data, refs) {
   if (!data || !refs) return;
-  var fieldIdDataMap = new Map();
+  var dataMap = new Map();
   for (var _iterator = _createForOfIteratorHelperLoose(refs), _step; !(_step = _iterator()).done;) {
     var ref = _step.value;
+    for (var _iterator3 = _createForOfIteratorHelperLoose(ref.data), _step3; !(_step3 = _iterator3()).done;) {
+      var datum = _step3.value;
+      var key = getDataKey(datum);
+      dataMap.set(key, datum);
+    }
+  }
+
+  //组装refs的关联属性
+  for (var _iterator2 = _createForOfIteratorHelperLoose(dataMap.values()), _step2; !(_step2 = _iterator2()).done;) {
+    var item = _step2.value;
+    for (var _i2 = 0, _Object$keys = Object.keys(item); _i2 < _Object$keys.length; _i2++) {
+      var _key = _Object$keys[_i2];
+      // @ts-ignore
+      var value = item[_key];
+      assembleAssociationFieldDataV2(value, dataMap);
+    }
+  }
+  function loopAssembleAssociation(value) {
+    if (Array.isArray(value)) {
+      value.forEach(function (item) {
+        return loopAssembleAssociation(item);
+      });
+    } else if (value !== null && value !== void 0 && value.id) {
+      assembleAssociationFieldDataV2(value, dataMap);
+      //处理子表
+      for (var _i = 0, _Object$values = Object.values(value); _i < _Object$values.length; _i++) {
+        var subValues = _Object$values[_i];
+        if (typeof subValues == "object") {
+          loopAssembleAssociation(subValues);
+        }
+      }
+    }
+  }
+  loopAssembleAssociation(data);
+}
+function assembleAssociationFieldDataV2(data, dataMap) {
+  if (data == null) {
+    return;
+  }
+  if (Array.isArray(data)) {
+    data.forEach(function (item) {
+      return assembleAssociationFieldDataV2(item, dataMap);
+    });
+  } else {
+    var _data$form;
+    if (data !== null && data !== void 0 && (_data$form = data.form) !== null && _data$form !== void 0 && _data$form.id && data !== null && data !== void 0 && data.id) {
+      delete data._load;
+      var key = getDataKey(data);
+      var value = dataMap.get(key);
+      if (value) {
+        Object.assign(data, value);
+        delete data._load;
+      }
+    }
+  }
+}
+function assembleAssociationField(data, refs) {
+  assembleAssociationFieldV2(data, refs);
+  return;
+  if (!data || !refs) return;
+  var fieldIdDataMap = new Map();
+  for (var _iterator4 = _createForOfIteratorHelperLoose(refs), _step4; !(_step4 = _iterator4()).done;) {
+    var ref = _step4.value;
     var dataMap = new Map();
-    for (var _iterator4 = _createForOfIteratorHelperLoose(ref.data), _step4; !(_step4 = _iterator4()).done;) {
-      var datum = _step4.value;
+    for (var _iterator7 = _createForOfIteratorHelperLoose(ref.data), _step7; !(_step7 = _iterator7()).done;) {
+      var datum = _step7.value;
       dataMap.set(datum.id, datum);
     }
-    for (var _iterator5 = _createForOfIteratorHelperLoose(ref.fieldIds), _step5; !(_step5 = _iterator5()).done;) {
-      var fieldId = _step5.value;
+    for (var _iterator8 = _createForOfIteratorHelperLoose(ref.fieldIds), _step8; !(_step8 = _iterator8()).done;) {
+      var fieldId = _step8.value;
       fieldIdDataMap.set(fieldId + "Id", dataMap);
     }
   }
   //组装refs的关联属性
-  for (var _iterator2 = _createForOfIteratorHelperLoose(refs), _step2; !(_step2 = _iterator2()).done;) {
-    var _ref = _step2.value;
+  for (var _iterator5 = _createForOfIteratorHelperLoose(refs), _step5; !(_step5 = _iterator5()).done;) {
+    var _ref = _step5.value;
     var key = _ref.form.id;
     if (_ref.form.fieldId) {
       key += "." + _ref.form.fieldId;
@@ -55,10 +126,10 @@ function assembleAssociationField(data, refs) {
       if ((_values$ = values[0]) !== null && _values$ !== void 0 && _values$.id) {
         assembleAssociationFieldValue(values, fieldIdDataMap);
         //处理子表
-        for (var _iterator3 = _createForOfIteratorHelperLoose(values), _step3; !(_step3 = _iterator3()).done;) {
-          var value = _step3.value;
-          for (var _i = 0, _Object$values = Object.values(value); _i < _Object$values.length; _i++) {
-            var subValues = _Object$values[_i];
+        for (var _iterator6 = _createForOfIteratorHelperLoose(values), _step6; !(_step6 = _iterator6()).done;) {
+          var value = _step6.value;
+          for (var _i3 = 0, _Object$values2 = Object.values(value); _i3 < _Object$values2.length; _i3++) {
+            var subValues = _Object$values2[_i3];
             if (Array.isArray(subValues)) {
               loopAssembleAssociation(subValues);
             }
@@ -76,10 +147,10 @@ function assembleAssociationFieldValue(data, fieldIdDataMap, prefixKey) {
   } else if (typeof data == "object") {
     arrayData = [data];
   }
-  for (var _iterator6 = _createForOfIteratorHelperLoose(arrayData), _step6; !(_step6 = _iterator6()).done;) {
-    var item = _step6.value;
+  for (var _iterator9 = _createForOfIteratorHelperLoose(arrayData), _step9; !(_step9 = _iterator9()).done;) {
+    var item = _step9.value;
     var _loop = function _loop() {
-      var fieldIdName = _Object$keys[_i2];
+      var fieldIdName = _Object$keys2[_i4];
       var fieldIdKey = fieldIdName;
       if (prefixKey) {
         fieldIdKey = prefixKey + "." + fieldIdName;
@@ -101,7 +172,7 @@ function assembleAssociationFieldValue(data, fieldIdDataMap, prefixKey) {
         item[fieldIdName.slice(0, -2)] = fieldValue;
       }
     };
-    for (var _i2 = 0, _Object$keys = Object.keys(item); _i2 < _Object$keys.length; _i2++) {
+    for (var _i4 = 0, _Object$keys2 = Object.keys(item); _i4 < _Object$keys2.length; _i4++) {
       _loop();
     }
   }
@@ -130,6 +201,7 @@ function handleFilterRules(filters, options) {
     if (cloneRules.length == 0) {
       return undefined;
     }
+    return cloneRules;
   } else {
     return undefined;
   }

package/lib/utils/api/rest-api.d.ts

@@ -83,6 +83,12 @@ export interface BaseType {
      * 修改日期
      */
     updated_at: string;
+    form: {
+        id: string;
+        fieldId?: string;
+        label: string;
+    };
+    _load?: boolean;
 }
 /**
  * 基础返回结果

package/lib/utils/api/rest-api.js

@@ -5,6 +5,7 @@ exports.__esModule = true;
 exports.RestApi = exports.BaseRestApi = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
+var _typography = _interopRequireDefault(require("antd/lib/typography"));
 var _notification2 = _interopRequireDefault(require("antd/lib/notification"));
 var _modal = _interopRequireDefault(require("antd/lib/modal"));
 var _message2 = _interopRequireDefault(require("antd/lib/message"));
@@ -362,7 +363,7 @@ var BaseRestApi = exports.BaseRestApi = /*#__PURE__*/function () {
             }
             props = JSON.parse(msg);
             props.content = props.message;
-            if (props.title) {
+            if (!props.title) {
               props.title = "" + this.title + type;
             }
             if (!(props.type == "message")) {
@@ -386,16 +387,20 @@ var BaseRestApi = exports.BaseRestApi = /*#__PURE__*/function () {
             _notification2["default"].error(props);
             return _context8.abrupt("return");
           case 18:
-            _context8.next = 23;
+            _context8.next = 24;
             break;
           case 20:
             _context8.prev = 20;
             _context8.t0 = _context8["catch"](0);
-            console.log("`showError`解析异常:", _context8.t0);
-          case 23:
-            console.error("{" + this.title + "}" + type + (msg || ""));
-            _message2["default"] === null || _message2["default"] === void 0 ? void 0 : _message2["default"].error("{" + this.title + "}" + type + (msg || "")).then();
-          case 25:
+            console.error("" + this.title + type + (msg || ""));
+            _modal["default"].error({
+              title: "" + this.title + type,
+              centered: true,
+              content: /*#__PURE__*/React.createElement(_typography["default"].Text, {
+                type: "danger"
+              }, msg || "")
+            });
+          case 24:
           case "end":
             return _context8.stop();
         }

package/lib/utils/cache/schema.d.ts

@@ -5,3 +5,4 @@ export declare function handleFormSchema(schema: any): Promise<void>;
  * @param callback 返回true 继续往下遍历
  */
 export declare function forEachFormSchema(schema: any, callback: (child: any, index: number, children: any[]) => boolean): void;
+export declare function getAdminFormSchema(id: string): Promise<any>;