@zhubangyun/lowcode-core 5.8.110 → 5.8.291

package/es/components/load-materials/index.js

@@ -54,7 +54,7 @@ function _loadMaterials() {
           }
           return _context2.abrupt("return");
         case 3:
-          urls = ["prop-types/15.8.1/prop-types.min.js", "lodash/4.6.1/lodash.min.js", "dayjs/dayjs.min.js", "antd/latest/reset.css", "antd/latest/antd.min.js", "antdIcon/1.0.0/antdIcon.min.js", "lowcode/core/index.js", "lowcode/core/index.css", "lowcode/materials/root/view.js", "lowcode/materials/root/view.css", "lowcode/materials/antd/view.js", "lowcode/materials/antd/view.css", "lowcode/materials/antd-pro/view.js", "lowcode/materials/antd-pro/view.css", "lowcode/icon-font/app/iconfont.js"];
+          urls = ["prop-types/15.8.1/prop-types.min.js", "lodash/4.17.15/lodash.min.js", "dayjs/dayjs.min.js", "antd/latest/reset.css", "antd/latest/antd.min.js", "antdIcon/1.0.0/antdIcon.min.js", "lowcode/core/index.js", "lowcode/core/index.css", "lowcode/materials/root/view.js", "lowcode/materials/root/view.css", "lowcode/materials/antd/view.js", "lowcode/materials/antd/view.css", "lowcode/materials/antd-pro/view.js", "lowcode/materials/antd-pro/view.css", "lowcode/icon-font/app/iconfont.js"];
           _context2.next = 6;
           return loadPlugins(urls.map(function (url) {
             return "https://cdn.zhiyunhe.com/plugin/" + url;

package/es/style.js

@@ -1,3 +1,4 @@
+import 'antd/es/typography/style';
 import 'antd/es/notification/style';
 import 'antd/es/modal/style';
 import 'antd/es/message/style';

package/es/utils/api/form-api.d.ts

@@ -9,7 +9,7 @@ export declare class RestFormApi<DataType> extends RestApi<DataType> {
     constructor(formId: string, fieldId?: string, mock?: boolean);
     initialize(): Promise<boolean>;
     handleRequestConfig(config: AxiosRequestConfig): Promise<void>;
-    search(params?: RestSearchParams): Promise<ManyResult<DataType>>;
+    search(searchParams?: RestSearchParams): Promise<ManyResult<DataType>>;
     getById(id: string, options?: BaseRequestOptions<DataType>): Promise<OneResult<DataType>>;
     save(data: DataType, options?: BaseRequestOptions<DataType>): Promise<OneResult<DataType>>;
     create(data: DataType, options?: BaseRequestOptions<DataType>): Promise<OneResult<DataType>>;

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

@@ -23,7 +23,7 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
   _proto.initialize = /*#__PURE__*/function () {
     var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var _this2 = this;
-      var _this$schema$props, res;
+      var _this$schema$children, _this$schema$children2, res;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -40,7 +40,7 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
             res = _context.sent;
             this.schema = res.data;
             this.initialized = !!this.schema;
-            this.title = (_this$schema$props = this.schema.props) === null || _this$schema$props === void 0 ? void 0 : _this$schema$props.label;
+            this.title = (_this$schema$children = this.schema.children[0]) === null || _this$schema$children === void 0 ? void 0 : (_this$schema$children2 = _this$schema$children.props) === null || _this$schema$children2 === void 0 ? void 0 : _this$schema$children2.label;
             if (this.fieldId) {
               JSON.stringify(this.schema, function (key, value) {
                 var _value$props;
@@ -108,13 +108,13 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
     return handleRequestConfig;
   }();
   _proto.search = /*#__PURE__*/function () {
-    var _search = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(params) {
-      var _params, _params2;
-      var config, res;
+    var _search = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(searchParams) {
+      var _searchParams, _searchParams2;
+      var config, res, start;
       return _regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            params = params || {};
+            searchParams = searchParams || {};
             config = {
               params: {
                 description: this.title + "\u67E5\u8BE2",
@@ -125,19 +125,21 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
             _context3.next = 4;
             return this.handleRequestConfig(config);
           case 4:
-            params.filterRules = handleFilterRules(((_params = params) === null || _params === void 0 ? void 0 : _params.filterRules) || [], {
+            searchParams.filterRules = handleFilterRules(((_searchParams = searchParams) === null || _searchParams === void 0 ? void 0 : _searchParams.filterRules) || [], {
               filterNullValue: false
             });
-            params.searchFields = handleFilterRules(((_params2 = params) === null || _params2 === void 0 ? void 0 : _params2.searchFields) || [], {
+            searchParams.searchFields = handleFilterRules(((_searchParams2 = searchParams) === null || _searchParams2 === void 0 ? void 0 : _searchParams2.searchFields) || [], {
               filterNullValue: true
             });
             _context3.next = 8;
-            return this.request.post("search", params, config);
+            return this.request.post("search", searchParams, config);
           case 8:
             res = _context3.sent;
+            start = Date.now();
             assembleAssociationField(res.data, res.refs);
+            console.debug("form.search:" + (Date.now() - start), res);
             return _context3.abrupt("return", res);
-          case 11:
+          case 13:
           case "end":
             return _context3.stop();
         }
@@ -150,7 +152,7 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
   }();
   _proto.getById = /*#__PURE__*/function () {
     var _getById = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(id, options) {
-      var res;
+      var res, start;
       return _regeneratorRuntime.wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -158,10 +160,11 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
             return _RestApi.prototype.getById.call(this, id, options);
           case 2:
             res = _context4.sent;
+            start = Date.now();
             assembleAssociationField(res.data, res.refs);
-            console.debug("formApi.getById", res);
+            console.debug("formApi.getById" + (Date.now() - start), res);
             return _context4.abrupt("return", res);
-          case 6:
+          case 7:
           case "end":
             return _context4.stop();
         }

package/es/utils/api/form-api.utils.d.ts

@@ -1,7 +1,8 @@
 import { BaseType, FilterRule, Refs } from "./rest-api";
 export declare function convertSaveData(data: any): any;
+export declare function assembleAssociationFieldV2(data: BaseType | BaseType[], refs?: Refs): void;
+export declare function assembleAssociationFieldDataV2(data: BaseType | BaseType[], dataMap: Map<string, BaseType>): void;
 export declare function assembleAssociationField(data: BaseType | BaseType[], refs?: Refs): void;
-export declare function assembleAssociationFieldValue(data: BaseType | BaseType[], fieldIdDataMap: Map<string, Map<string, BaseType>>, prefixKey?: string): void;
 export declare function handleFilterRules(filters: FilterRule[], options: {
     filterNullValue: boolean;
-}): any;
+}): FilterRule[];

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

@@ -12,24 +12,94 @@ export function convertSaveData(data) {
     return value;
   }));
 }
-export function assembleAssociationField(data, refs) {
+function getDataKey(data) {
+  var key = data.form.id;
+  if (data.form.fieldId) {
+    key += "." + data.form.fieldId;
+  }
+  return key + "." + data.id;
+}
+export 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);
+}
+export 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;
+      }
+    }
+  }
+}
+export 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;
@@ -47,10 +117,10 @@ export 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);
             }
@@ -61,17 +131,17 @@ export function assembleAssociationField(data, refs) {
   }
   loopAssembleAssociation(data);
 }
-export function assembleAssociationFieldValue(data, fieldIdDataMap, prefixKey) {
+function assembleAssociationFieldValue(data, fieldIdDataMap, prefixKey) {
   var arrayData = [];
   if (Array.isArray(data)) {
     arrayData = data;
   } 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;
@@ -93,7 +163,7 @@ export 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();
     }
   }
@@ -122,6 +192,7 @@ export function handleFilterRules(filters, options) {
     if (cloneRules.length == 0) {
       return undefined;
     }
+    return cloneRules;
   } else {
     return undefined;
   }

package/es/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/es/utils/api/rest-api.js

@@ -1,4 +1,5 @@
 import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
+import _Typography from "antd/es/typography";
 import _notification from "antd/es/notification";
 import _Modal from "antd/es/modal";
 import _message from "antd/es/message";
@@ -357,7 +358,7 @@ export var 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")) {
@@ -381,16 +382,20 @@ export var BaseRestApi = /*#__PURE__*/function () {
             _notification.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 || ""));
-            _message === null || _message === void 0 ? void 0 : _message.error("{" + this.title + "}" + type + (msg || "")).then();
-          case 25:
+            console.error("" + this.title + type + (msg || ""));
+            _Modal.error({
+              title: "" + this.title + type,
+              centered: true,
+              content: /*#__PURE__*/React.createElement(_Typography.Text, {
+                type: "danger"
+              }, msg || "")
+            });
+          case 24:
           case "end":
             return _context8.stop();
         }

package/es/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>;