@zhubangyun/lowcode-core 5.4.21 → 5.4.102

package/lib/utils/api/RestApi.js

@@ -48,14 +48,16 @@ var BaseRestApi = exports.BaseRestApi = /*#__PURE__*/function () {
             config = {
               params: params
             };
-            (_this$handleRequestCo = this.handleRequestConfig) === null || _this$handleRequestCo === void 0 ? void 0 : _this$handleRequestCo.call(this, config);
-            _context.next = 9;
+            _context.next = 8;
+            return (_this$handleRequestCo = this.handleRequestConfig) === null || _this$handleRequestCo === void 0 ? void 0 : _this$handleRequestCo.call(this, config);
+          case 8:
+            _context.next = 10;
             return this.request.get("", {
               params: params
             });
-          case 9:
-            return _context.abrupt("return", _context.sent);
           case 10:
+            return _context.abrupt("return", _context.sent);
+          case 11:
           case "end":
             return _context.stop();
         }
@@ -82,27 +84,29 @@ var BaseRestApi = exports.BaseRestApi = /*#__PURE__*/function () {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             config = {};
-            (_this$handleRequestCo2 = this.handleRequestConfig) === null || _this$handleRequestCo2 === void 0 ? void 0 : _this$handleRequestCo2.call(this, config);
-            _context2.next = 4;
+            _context2.next = 3;
+            return (_this$handleRequestCo2 = this.handleRequestConfig) === null || _this$handleRequestCo2 === void 0 ? void 0 : _this$handleRequestCo2.call(this, config);
+          case 3:
+            _context2.next = 5;
             return this.request.get(String(id), config);
-          case 4:
+          case 5:
             res = _context2.sent;
             if (res.success) {
-              _context2.next = 11;
+              _context2.next = 12;
               break;
             }
             this.showError("\u83B7\u53D6{" + id + "}\u5931\u8D25!", res.message).then();
-            _context2.next = 9;
+            _context2.next = 10;
             return options === null || options === void 0 ? void 0 : (_options$onError = options.onError) === null || _options$onError === void 0 ? void 0 : _options$onError.call(options, res);
-          case 9:
-            _context2.next = 13;
+          case 10:
+            _context2.next = 14;
             break;
-          case 11:
-            _context2.next = 13;
+          case 12:
+            _context2.next = 14;
             return options === null || options === void 0 ? void 0 : (_options$onSuccess = options.onSuccess) === null || _options$onSuccess === void 0 ? void 0 : _options$onSuccess.call(options, res);
-          case 13:
-            return _context2.abrupt("return", res);
           case 14:
+            return _context2.abrupt("return", res);
+          case 15:
           case "end":
             return _context2.stop();
         }
@@ -121,27 +125,29 @@ var BaseRestApi = exports.BaseRestApi = /*#__PURE__*/function () {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
             config = {};
-            (_this$handleRequestCo3 = this.handleRequestConfig) === null || _this$handleRequestCo3 === void 0 ? void 0 : _this$handleRequestCo3.call(this, config);
-            _context3.next = 4;
+            _context3.next = 3;
+            return (_this$handleRequestCo3 = this.handleRequestConfig) === null || _this$handleRequestCo3 === void 0 ? void 0 : _this$handleRequestCo3.call(this, config);
+          case 3:
+            _context3.next = 5;
             return this.request.post("", data, config);
-          case 4:
+          case 5:
             res = _context3.sent;
             if (res.success) {
-              _context3.next = 11;
+              _context3.next = 12;
               break;
             }
             this.showError("\u63D0\u4EA4\u5931\u8D25!", res.message).then();
-            _context3.next = 9;
+            _context3.next = 10;
             return options === null || options === void 0 ? void 0 : (_options$onError2 = options.onError) === null || _options$onError2 === void 0 ? void 0 : _options$onError2.call(options, res);
-          case 9:
-            _context3.next = 13;
+          case 10:
+            _context3.next = 14;
             break;
-          case 11:
-            _context3.next = 13;
+          case 12:
+            _context3.next = 14;
             return options === null || options === void 0 ? void 0 : (_options$onSuccess2 = options.onSuccess) === null || _options$onSuccess2 === void 0 ? void 0 : _options$onSuccess2.call(options, res);
-          case 13:
-            return _context3.abrupt("return", res);
           case 14:
+            return _context3.abrupt("return", res);
+          case 15:
           case "end":
             return _context3.stop();
         }
@@ -166,27 +172,29 @@ var BaseRestApi = exports.BaseRestApi = /*#__PURE__*/function () {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
             config = {};
-            (_this$handleRequestCo4 = this.handleRequestConfig) === null || _this$handleRequestCo4 === void 0 ? void 0 : _this$handleRequestCo4.call(this, config);
-            _context4.next = 4;
+            _context4.next = 3;
+            return (_this$handleRequestCo4 = this.handleRequestConfig) === null || _this$handleRequestCo4 === void 0 ? void 0 : _this$handleRequestCo4.call(this, config);
+          case 3:
+            _context4.next = 5;
             return this.request.post("", data, config);
-          case 4:
+          case 5:
             res = _context4.sent;
             if (res.success) {
-              _context4.next = 11;
+              _context4.next = 12;
               break;
             }
             this.showError("\u65B0\u589E\u5931\u8D25!", res.message).then();
-            _context4.next = 9;
+            _context4.next = 10;
             return options === null || options === void 0 ? void 0 : (_options$onError3 = options.onError) === null || _options$onError3 === void 0 ? void 0 : _options$onError3.call(options, res);
-          case 9:
-            _context4.next = 13;
+          case 10:
+            _context4.next = 14;
             break;
-          case 11:
-            _context4.next = 13;
+          case 12:
+            _context4.next = 14;
             return options === null || options === void 0 ? void 0 : (_options$onSuccess3 = options.onSuccess) === null || _options$onSuccess3 === void 0 ? void 0 : _options$onSuccess3.call(options, res);
-          case 13:
-            return _context4.abrupt("return", res);
           case 14:
+            return _context4.abrupt("return", res);
+          case 15:
           case "end":
             return _context4.stop();
         }
@@ -211,27 +219,29 @@ var BaseRestApi = exports.BaseRestApi = /*#__PURE__*/function () {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
             config = {};
-            (_this$handleRequestCo5 = this.handleRequestConfig) === null || _this$handleRequestCo5 === void 0 ? void 0 : _this$handleRequestCo5.call(this, config);
-            _context5.next = 4;
+            _context5.next = 3;
+            return (_this$handleRequestCo5 = this.handleRequestConfig) === null || _this$handleRequestCo5 === void 0 ? void 0 : _this$handleRequestCo5.call(this, config);
+          case 3:
+            _context5.next = 5;
             return this.request.put(String(id), data, config);
-          case 4:
+          case 5:
             res = _context5.sent;
             if (res.success) {
-              _context5.next = 11;
+              _context5.next = 12;
               break;
             }
             this.showError("\u66F4\u65B0\u5931\u8D25!", res.message).then();
-            _context5.next = 9;
+            _context5.next = 10;
             return options === null || options === void 0 ? void 0 : (_options$onError4 = options.onError) === null || _options$onError4 === void 0 ? void 0 : _options$onError4.call(options, res);
-          case 9:
-            _context5.next = 13;
+          case 10:
+            _context5.next = 14;
             break;
-          case 11:
-            _context5.next = 13;
+          case 12:
+            _context5.next = 14;
             return options === null || options === void 0 ? void 0 : (_options$onSuccess4 = options.onSuccess) === null || _options$onSuccess4 === void 0 ? void 0 : _options$onSuccess4.call(options, res);
-          case 13:
-            return _context5.abrupt("return", res);
           case 14:
+            return _context5.abrupt("return", res);
+          case 15:
           case "end":
             return _context5.stop();
         }
@@ -256,27 +266,29 @@ var BaseRestApi = exports.BaseRestApi = /*#__PURE__*/function () {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
             config = {};
-            (_this$handleRequestCo6 = this.handleRequestConfig) === null || _this$handleRequestCo6 === void 0 ? void 0 : _this$handleRequestCo6.call(this, config);
-            _context6.next = 4;
+            _context6.next = 3;
+            return (_this$handleRequestCo6 = this.handleRequestConfig) === null || _this$handleRequestCo6 === void 0 ? void 0 : _this$handleRequestCo6.call(this, config);
+          case 3:
+            _context6.next = 5;
             return this.request["delete"](String(id), config);
-          case 4:
+          case 5:
             res = _context6.sent;
             if (res.success) {
-              _context6.next = 11;
+              _context6.next = 12;
               break;
             }
             this.showError("\u5220\u9664{" + id + "}\u5931\u8D25!", res.message).then();
-            _context6.next = 9;
+            _context6.next = 10;
             return options === null || options === void 0 ? void 0 : (_options$onError5 = options.onError) === null || _options$onError5 === void 0 ? void 0 : _options$onError5.call(options, res);
-          case 9:
-            _context6.next = 13;
+          case 10:
+            _context6.next = 14;
             break;
-          case 11:
-            _context6.next = 13;
+          case 12:
+            _context6.next = 14;
             return options === null || options === void 0 ? void 0 : (_options$onSuccess5 = options.onSuccess) === null || _options$onSuccess5 === void 0 ? void 0 : _options$onSuccess5.call(options, res);
-          case 13:
-            return _context6.abrupt("return", res);
           case 14:
+            return _context6.abrupt("return", res);
+          case 15:
           case "end":
             return _context6.stop();
         }
@@ -313,7 +325,21 @@ var RestApi = exports.RestApi = /*#__PURE__*/function (_BaseRestApi2) {
   }
   (0, _inheritsLoose2["default"])(RestApi, _BaseRestApi2);
   var _proto2 = RestApi.prototype;
-  _proto2.handleRequestConfig = function handleRequestConfig(config) {};
+  _proto2.handleRequestConfig = /*#__PURE__*/function () {
+    var _handleRequestConfig = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8(config) {
+      return _regenerator["default"].wrap(function _callee8$(_context8) {
+        while (1) switch (_context8.prev = _context8.next) {
+          case 0:
+          case "end":
+            return _context8.stop();
+        }
+      }, _callee8);
+    }));
+    function handleRequestConfig(_x17) {
+      return _handleRequestConfig.apply(this, arguments);
+    }
+    return handleRequestConfig;
+  }();
   return RestApi;
 }(BaseRestApi);
 /**

package/lib/utils/{common → api}/UserInfo.d.ts

@@ -6,4 +6,4 @@ export interface UserInfo {
     roleIds: string[];
     deptIds: string[];
 }
-export declare function loadUserInfo(): Promise<UserInfo>;
+export declare function loadUserInfo(): Promise<UserInfo | false>;

package/lib/utils/{common → api}/UserInfo.js

@@ -4,17 +4,37 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.loadUserInfo = loadUserInfo;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _index = require("./index");
 function loadUserInfo() {
   return _loadUserInfo.apply(this, arguments);
 }
 function _loadUserInfo() {
   _loadUserInfo = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+    var res;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          return _context.abrupt("return", {});
-        case 1:
+          if (!window.userInfo) {
+            _context.next = 4;
+            break;
+          }
+          return _context.abrupt("return", (0, _extends2["default"])({}, window.userInfo));
+        case 4:
+          _context.next = 6;
+          return _index.apiRequest.get("userInfo");
+        case 6:
+          res = _context.sent;
+          if (!res.success) {
+            _context.next = 12;
+            break;
+          }
+          window.userInfo = res.data;
+          return _context.abrupt("return", (0, _extends2["default"])({}, res.data));
+        case 12:
+          return _context.abrupt("return", false);
+        case 13:
         case "end":
           return _context.stop();
       }

package/lib/utils/api/index.d.ts

@@ -1,5 +1,6 @@
 import { OneResult } from "./RestApi";
 import { RestFormApi } from "../form/form.api";
-export declare const request: import("axios").AxiosInstance;
-export declare function getSchema(schemaId: string, mock?: boolean): Promise<OneResult<any>>;
-export declare function getFormApi(schemaId: string, mock?: boolean): Promise<RestFormApi<any>>;
+export { loadUserInfo } from "./UserInfo";
+export declare const apiRequest: import("axios").AxiosInstance;
+export declare function getSchema(pageId: string, mock?: boolean): Promise<OneResult<any>>;
+export declare function getFormApi(formId: string, fieldId?: string, mock?: boolean): Promise<RestFormApi<any>>;

package/lib/utils/api/index.js

@@ -2,15 +2,18 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
+exports.apiRequest = void 0;
 exports.getFormApi = getFormApi;
 exports.getSchema = getSchema;
-exports.request = void 0;
+exports.loadUserInfo = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _axios = _interopRequireDefault(require("axios"));
 var _Request = require("./Request");
 var _cache = require("../cache");
-var request = exports.request = _axios["default"].create({
+var _UserInfo = require("./UserInfo");
+exports.loadUserInfo = _UserInfo.loadUserInfo;
+var apiRequest = exports.apiRequest = _axios["default"].create({
   baseURL: "/api",
   // 基础URL
   timeout: 10000,
@@ -19,22 +22,30 @@ var request = exports.request = _axios["default"].create({
     'Content-Type': 'application/json;charset=UTF-8'
   }
 });
-request.interceptors.response.use(_Request.onFulfilled, _Request.onRejected);
+apiRequest.interceptors.response.use(_Request.onFulfilled, _Request.onRejected);
 function getSchema(_x, _x2) {
   return _getSchema.apply(this, arguments);
 }
 function _getSchema() {
-  _getSchema = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(schemaId, mock) {
+  _getSchema = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(pageId, mock) {
     var key;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          key = mock ? schemaId + "_mock" : schemaId;
-          _context.next = 3;
-          return _cache.schema.getInstance(key);
-        case 3:
-          return _context.abrupt("return", _context.sent);
+          if (typeof mock != "boolean") {
+            if (typeof window.__mock == "boolean") {
+              mock = window.__mock;
+            }
+          }
+          key = mock ? pageId + "_mock" : pageId;
+          _context.next = 4;
+          return _cache.schema.getInstance(key, {
+            mock: mock,
+            pageId: pageId
+          });
         case 4:
+          return _context.abrupt("return", _context.sent);
+        case 5:
         case "end":
           return _context.stop();
       }
@@ -42,11 +53,11 @@ function _getSchema() {
   }));
   return _getSchema.apply(this, arguments);
 }
-function getFormApi(_x3, _x4) {
+function getFormApi(_x3, _x4, _x5) {
   return _getFormApi.apply(this, arguments);
 }
 function _getFormApi() {
-  _getFormApi = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(schemaId, mock) {
+  _getFormApi = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(formId, fieldId, mock) {
     var key;
     return _regenerator["default"].wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -56,9 +67,13 @@ function _getFormApi() {
               mock = window.__mock;
             }
           }
-          key = !!mock ? schemaId + "_mock" : schemaId;
+          key = !!mock ? formId + "_mock" : formId;
           _context2.next = 4;
-          return _cache.formApi.getInstance(key);
+          return _cache.formApi.getInstance(key, {
+            mock: mock,
+            fieldId: fieldId,
+            formId: formId
+          });
         case 4:
           return _context2.abrupt("return", _context2.sent);
         case 5:

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

@@ -1,9 +1,17 @@
 import { SingletonInstanceMap } from "../common/SingletonInstanceMap";
-export declare class SchemaCache extends SingletonInstanceMap<any> {
-    createInstance(key: string): Promise<any>;
+import { RestFormApi } from "../form/form.api";
+export declare class SchemaCache extends SingletonInstanceMap<any, {
+    mock?: boolean;
+    pageId: string;
+}> {
+    createInstance(key: string, options: any): Promise<any>;
 }
 export declare const schema: SchemaCache;
-export declare class FormApiCache extends SingletonInstanceMap<any> {
-    createInstance(key: string): Promise<any>;
+export declare class FormApiCache extends SingletonInstanceMap<RestFormApi<any>, {
+    formId: string;
+    fieldId?: string;
+    mock?: boolean;
+}> {
+    createInstance(key: string, options?: any): Promise<RestFormApi<any>>;
 }
 export declare const formApi: FormApiCache;

package/lib/utils/cache/index.js

@@ -7,8 +7,9 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
 var _SingletonInstanceMap3 = require("../common/SingletonInstanceMap");
-var _api = require("../api");
 var _form = require("../form/form.api");
+var _schema = require("./schema");
+var _api = require("../api");
 var SchemaCache = exports.SchemaCache = /*#__PURE__*/function (_SingletonInstanceMap) {
   function SchemaCache() {
     return _SingletonInstanceMap.apply(this, arguments) || this;
@@ -16,28 +17,31 @@ var SchemaCache = exports.SchemaCache = /*#__PURE__*/function (_SingletonInstanc
   (0, _inheritsLoose2["default"])(SchemaCache, _SingletonInstanceMap);
   var _proto = SchemaCache.prototype;
   _proto.createInstance = /*#__PURE__*/function () {
-    var _createInstance = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(key) {
-      var mock, pageId;
+    var _createInstance = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(key, options) {
+      var mock, pageId, res;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            mock = key.endsWith("_mock");
-            pageId = key.replace("_mock", "");
-            _context.next = 4;
-            return _api.request.get("pages/" + pageId + "/schema", {
+            mock = options.mock, pageId = options.pageId;
+            _context.next = 3;
+            return _api.apiRequest.get("pages/" + pageId + "/schema", {
               params: {
                 mock: mock
               }
             });
-          case 4:
-            return _context.abrupt("return", _context.sent);
-          case 5:
+          case 3:
+            res = _context.sent;
+            if (res.success) {
+              (0, _schema.handleFormSchema)(res.data);
+            }
+            return _context.abrupt("return", res);
+          case 6:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
-    function createInstance(_x) {
+    function createInstance(_x, _x2) {
       return _createInstance.apply(this, arguments);
     }
     return createInstance;
@@ -52,14 +56,16 @@ var FormApiCache = exports.FormApiCache = /*#__PURE__*/function (_SingletonInsta
   (0, _inheritsLoose2["default"])(FormApiCache, _SingletonInstanceMap2);
   var _proto2 = FormApiCache.prototype;
   _proto2.createInstance = /*#__PURE__*/function () {
-    var _createInstance2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(key) {
-      var mock, formId, formApi;
+    var _createInstance2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(key, options) {
+      var _options, formId, fieldId, mock, formApi;
       return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            mock = key.endsWith("_mock");
-            formId = key.replace("_mock", "");
-            formApi = new _form.RestFormApi(formId, mock);
+            if (options === void 0) {
+              options = {};
+            }
+            _options = options, formId = _options.formId, fieldId = _options.fieldId, mock = _options.mock;
+            formApi = new _form.RestFormApi(formId, fieldId, mock);
             _context2.next = 5;
             return formApi.initialize();
           case 5:
@@ -70,7 +76,7 @@ var FormApiCache = exports.FormApiCache = /*#__PURE__*/function (_SingletonInsta
         }
       }, _callee2);
     }));
-    function createInstance(_x2) {
+    function createInstance(_x3, _x4) {
       return _createInstance2.apply(this, arguments);
     }
     return createInstance;

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

@@ -0,0 +1,29 @@
+export declare function handleFormSchema(schema: FormSchema): void;
+/**
+ * 遍历schema
+ * @param schema
+ * @param callback 返回true 继续往下遍历
+ */
+export declare function forEachFormSchema(schema: FormSchema, callback: (child: FormSchema, index: number, children: any[]) => boolean): void;
+export interface FormSchema {
+    id?: string;
+    componentName: string;
+    formId?: string;
+    tableName?: string;
+    schemaName?: string;
+    columnName?: string;
+    fdmSchema?: FormSchema;
+    props: FormSchemaProps;
+    children?: FormSchema[];
+}
+export interface FormSchemaProps {
+    fieldId: string;
+    label: string;
+    fieldSchema?: any;
+    columnName: string;
+    array: boolean;
+    associationForm: {
+        id: string;
+        fieldId: string;
+    };
+}

package/lib/utils/cache/schema.js

@@ -0,0 +1,47 @@
+"use strict";
+
+exports.__esModule = true;
+exports.forEachFormSchema = forEachFormSchema;
+exports.handleFormSchema = handleFormSchema;
+function handleFormSchema(schema) {
+  var fdmItems = [];
+  var fieldIdMap = new Map();
+  forEachFormSchema(schema, function (field) {
+    if (field.fdmSchema) {
+      fdmItems.push(field);
+    }
+    if (field.props.fieldId) {
+      //删除children防止循环
+      var copyField = JSON.parse(JSON.stringify(field));
+      delete copyField.children;
+      fieldIdMap.set(field.props.fieldId, copyField);
+    }
+    return true;
+  });
+  fdmItems.forEach(function (fdmField) {
+    forEachFormSchema(fdmField.fdmSchema, function (field) {
+      var _field$props;
+      var findSchema = fieldIdMap.get((_field$props = field.props) === null || _field$props === void 0 ? void 0 : _field$props.fieldId);
+      if (findSchema) {
+        field.componentName = findSchema.componentName;
+        Object.assign(field.props, findSchema.props);
+      }
+      return true;
+    });
+  });
+}
+
+/**
+ * 遍历schema
+ * @param schema
+ * @param callback 返回true 继续往下遍历
+ */
+function forEachFormSchema(schema, callback) {
+  var _schema$children;
+  schema === null || schema === void 0 ? void 0 : (_schema$children = schema.children) === null || _schema$children === void 0 ? void 0 : _schema$children.forEach(function (child, index, children) {
+    var ctn = callback(child, index, children);
+    if (ctn) {
+      forEachFormSchema(child, callback);
+    }
+  });
+}

package/lib/utils/common/SingletonInstanceMap.d.ts

@@ -1,7 +1,7 @@
-export declare abstract class SingletonInstanceMap<Value> {
+export declare abstract class SingletonInstanceMap<Value, Options> {
     private readonly valueMap;
     private readonly lockMap;
-    getInstance(key: string): Promise<Value>;
+    getInstance(key: string, options: Options): Promise<Value>;
     clear(): void;
-    abstract createInstance(key: string): Promise<Value>;
+    abstract createInstance(key: string, options: Options): Promise<Value>;
 }

package/lib/utils/common/SingletonInstanceMap.js

@@ -12,7 +12,7 @@ var SingletonInstanceMap = exports.SingletonInstanceMap = /*#__PURE__*/function
   }
   var _proto = SingletonInstanceMap.prototype;
   _proto.getInstance = /*#__PURE__*/function () {
-    var _getInstance = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(key) {
+    var _getInstance = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(key, options) {
       var self, value;
       return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -33,19 +33,19 @@ var SingletonInstanceMap = exports.SingletonInstanceMap = /*#__PURE__*/function
                 return _regenerator["default"].wrap(function _callee$(_context) {
                   while (1) switch (_context.prev = _context.next) {
                     case 0:
-                      resolve(self.getInstance(key));
+                      resolve(self.getInstance(key, options));
                     case 1:
                     case "end":
                       return _context.stop();
                   }
                 }, _callee);
-              })), 1000);
+              })), 500);
             }));
           case 9:
             _context2.prev = 9;
             this.lockMap.set(key, true);
             _context2.next = 13;
-            return this.createInstance(key);
+            return this.createInstance(key, options);
           case 13:
             value = _context2.sent;
             this.valueMap.set(key, value);
@@ -65,7 +65,7 @@ var SingletonInstanceMap = exports.SingletonInstanceMap = /*#__PURE__*/function
         }
       }, _callee2, this, [[9, 19, 22, 25]]);
     }));
-    function getInstance(_x) {
+    function getInstance(_x, _x2) {
       return _getInstance.apply(this, arguments);
     }
     return getInstance;

package/lib/utils/designer/assets/assets.data.base.js

@@ -42,7 +42,7 @@ var BaseAssets = {
   utils: [],
   "components": [],
   "sort": {
-    "categoryList": ["布局", "通用", "导航", "数据录入", "数据展示", "反馈", "大屏组件", "图表", "基础元素", "表格类", "表单详情类", "帮助类", "对话框类", "业务类", "引导", "信息输入", "信息展示", "信息反馈", "布局容器类", "增强组件", "工具组件"],
+    "categoryList": ["布局", "通用", "导航", "数据录入", "数据展示", "反馈", "大屏组件", "图表", "基础元素", "表格类", "表单详情类", "帮助类", "对话框类", "业务类", "引导", "信息输入", "信息展示", "信息反馈", "布局容器类", "增强组件", "工具组件", "普通", "范围", "高级"],
     "groupList": ["", "原子组件", "精选组件", "增强分组", "图表组件", "默认分组"]
   }
 };