@zhubangyun/lowcode-core 5.10.221 → 5.12.90

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

@@ -1,15 +1,15 @@
-import { BaseType, FilterRule, Refs } from "./rest-api";
+import { FilterRule, IBaseEntity, Refs } from "./rest-api";
 export declare function convertSaveData(data: any): any;
-export declare function handleEntityLabel(data: BaseType | BaseType[]): void;
 export declare function dataToLabel(value: any): any;
-export declare function assembleAssociationFieldV2(data: BaseType | BaseType[], refs?: Refs): void;
+export declare function assembleAssociationFieldV2(data: IBaseEntity | IBaseEntity[], refs?: Refs): void;
 /**
  * 加载字段
  * @param data
  * @param dataMap
  */
-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 assembleAssociationFieldDataV2(data: IBaseEntity | IBaseEntity[], dataMap: Map<string, IBaseEntity>): void;
+export declare function handleEntityLabel(data: IBaseEntity | IBaseEntity[]): void;
+export declare function assembleAssociationField(data: IBaseEntity | IBaseEntity[], refs?: Refs): void;
 export declare function handleFilterRules(filters: FilterRule[], options: {
     filterNullValue: boolean;
 }): FilterRule[];

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

@@ -34,21 +34,6 @@ function getDataKey(data) {
   }
   return key + "." + data.id;
 }
-function handleEntityLabel(data) {
-  if (!Array.isArray(data)) {
-    data = [data];
-  }
-  for (var _iterator = _createForOfIteratorHelperLoose(data), _step; !(_step = _iterator()).done;) {
-    var _item$form;
-    var item = _step.value;
-    var labelField = (_item$form = item.form) === null || _item$form === void 0 ? void 0 : _item$form.labelField;
-    if (labelField) {
-      // @ts-ignore
-      var value = safeGet(item, labelField);
-      item.label = dataToLabel(value);
-    }
-  }
-}
 function dataToLabel(value) {
   if (value == null) {
     return "";
@@ -72,44 +57,44 @@ function dataToLabel(value) {
 function assembleAssociationFieldV2(data, refs) {
   if (!data || !refs) return;
   var dataMap = new Map();
-  for (var _iterator2 = _createForOfIteratorHelperLoose(refs), _step2; !(_step2 = _iterator2()).done;) {
-    var ref = _step2.value;
-    for (var _iterator4 = _createForOfIteratorHelperLoose(ref.data), _step4; !(_step4 = _iterator4()).done;) {
-      var datum = _step4.value;
+  for (var _iterator = _createForOfIteratorHelperLoose(refs), _step; !(_step = _iterator()).done;) {
+    var ref = _step.value;
+    ref.label = ref.form.label;
+    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 _iterator3 = _createForOfIteratorHelperLoose(dataMap.values()), _step3; !(_step3 = _iterator3()).done;) {
-    var item = _step3.value;
+  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);
     }
   }
-  handleEntityLabel([].concat(dataMap.values()));
   function loopAssembleAssociation(value) {
+    var _value$form;
     if (Array.isArray(value)) {
       value.forEach(function (item) {
         return loopAssembleAssociation(item);
       });
-    } else if (value !== null && value !== void 0 && value.id) {
-      handleEntityLabel(value);
+    } else if (value !== null && value !== void 0 && value.id && (_value$form = value.form) !== null && _value$form !== void 0 && _value$form.id) {
+      if (value._load) return;
       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") {
+        if (subValues !== null && typeof subValues == "object") {
           loopAssembleAssociation(subValues);
         }
       }
     }
   }
   loopAssembleAssociation(data);
+  handleEntityLabel(data);
+  dataMap.clear();
 }
 
 /**
@@ -118,28 +103,62 @@ function assembleAssociationFieldV2(data, refs) {
  * @param dataMap
  */
 function assembleAssociationFieldDataV2(data, dataMap) {
-  if (data == null) {
-    return;
-  }
+  if (data == null || typeof data != "object") return;
   if (Array.isArray(data)) {
     data.forEach(function (item) {
       return assembleAssociationFieldDataV2(item, dataMap);
     });
   } else {
-    if (data._load == false) {
+    if (!data._load) {
       var _data$form3;
-      if (data !== null && data !== void 0 && (_data$form3 = data.form) !== null && _data$form3 !== void 0 && _data$form3.id && data !== null && data !== void 0 && data.id) {
-        delete data._load;
+      if (data !== null && data !== void 0 && data.id && data !== null && data !== void 0 && (_data$form3 = data.form) !== null && _data$form3 !== void 0 && _data$form3.id) {
         var key = getDataKey(data);
         var value = dataMap.get(key);
         if (value) {
-          Object.assign(data, value);
-          delete data._load;
+          Object.assign(data, JSON.parse(JSON.stringify(value)));
         }
+        data._load = true;
       }
     }
   }
 }
+function handleEntityLabel(data) {
+  if (Array.isArray(data)) {
+    data.forEach(function (item) {
+      return handleEntityLabel(item);
+    });
+  } else if (typeof data == "object") {
+    var form = data === null || data === void 0 ? void 0 : data.form;
+    if (form) {
+      var labelField = form === null || form === void 0 ? void 0 : form.labelField;
+      if (labelField) {
+        // @ts-ignore
+        var label = safeGet(data, labelField);
+        data.label = dataToLabel(label);
+      }
+      for (var _i3 = 0, _Object$keys2 = Object.keys(data); _i3 < _Object$keys2.length; _i3++) {
+        var key = _Object$keys2[_i3];
+        // @ts-ignore
+        handleEntityLabel(data[key]);
+      }
+    }
+  }
+}
+function valueToFormDataArray(value) {
+  if (typeof value == null || typeof value !== "object") {
+    return [];
+  }
+  if (Array.isArray(value)) {
+    return value === null || value === void 0 ? void 0 : value.filter(function (item) {
+      var _item$form;
+      return (item === null || item === void 0 ? void 0 : item.id) && (item === null || item === void 0 ? void 0 : (_item$form = item.form) === null || _item$form === void 0 ? void 0 : _item$form.id);
+    });
+  } else if (typeof value == "object" && value !== null) {
+    return valueToFormDataArray([value]);
+  } else {
+    return [];
+  }
+}
 function assembleAssociationField(data, refs) {
   assembleAssociationFieldV2(data, refs);
 }

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

@@ -1,10 +1,11 @@
 export { RestApi } from "./rest-api";
 export { getFormApi, RestFormApi } from "./form-api";
+import { AxiosResponse } from "axios/index";
 export { getSchema } from "./schema-api";
-export { loadUserInfo } from "./user-info";
+export { getUserinfo } from "./user-info";
 export * as files from "./file-api";
 export * as scrips from "./script-api";
 export declare const apiRequest: import("axios").AxiosInstance;
-export declare const request: <T = any, R = import("axios").AxiosResponse<T, any>, D = any>(config: import("axios").AxiosRequestConfig<D>) => Promise<R>;
-export declare function onFulfilled(res: any): any;
+export declare const request: <T = any, R = AxiosResponse<T, any>, D = any>(config: import("axios").AxiosRequestConfig<D>) => Promise<R>;
+export declare function onFulfilled(res: AxiosResponse): any;
 export declare function onRejected(error: any): any;

package/lib/utils/api/index.js

@@ -2,7 +2,7 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
-exports.loadUserInfo = exports.getSchema = exports.getFormApi = exports.files = exports.apiRequest = exports.RestFormApi = exports.RestApi = void 0;
+exports.getUserinfo = exports.getSchema = exports.getFormApi = exports.files = exports.apiRequest = exports.RestFormApi = exports.RestApi = void 0;
 exports.onFulfilled = onFulfilled;
 exports.onRejected = onRejected;
 exports.scrips = exports.request = void 0;
@@ -15,7 +15,7 @@ exports.RestFormApi = _formApi.RestFormApi;
 var _schemaApi = require("./schema-api");
 exports.getSchema = _schemaApi.getSchema;
 var _userInfo = require("./user-info");
-exports.loadUserInfo = _userInfo.loadUserInfo;
+exports.getUserinfo = _userInfo.getUserinfo;
 var _files = _interopRequireWildcard(require("./file-api"));
 exports.files = _files;
 var _scrips = _interopRequireWildcard(require("./script-api"));
@@ -25,7 +25,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 var apiRequest = exports.apiRequest = _axios["default"].create({
   baseURL: "/api",
   // 基础URL
-  timeout: 10000,
+  timeout: 600000,
   // 请求超时时间（毫秒）
   headers: {
     'Content-Type': 'application/json;charset=UTF-8'
@@ -34,6 +34,13 @@ var apiRequest = exports.apiRequest = _axios["default"].create({
 apiRequest.interceptors.response.use(onFulfilled, onRejected);
 var request = exports.request = apiRequest.request;
 function onFulfilled(res) {
+  if (typeof res.data == "object") {
+    if ("success" in res.data) {
+      if (res.headers["Request-Id"]) {
+        res.data.requestId = res.headers["Request-Id"];
+      }
+    }
+  }
   return res.data;
 }
 function onRejected(error) {

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

@@ -19,6 +19,10 @@ export interface FilterRule {
     value?: any;
     rules?: FilterRule[];
 }
+export interface OrderRule {
+    key: string;
+    direction: "asc" | "desc";
+}
 export type OperatorType = "eq" | "ne" | "gt" | "goe" | "lt" | "loe" | "like" | "notLike" | "in" | "notIn" | "isNull" | "isNotNull" | "between" | "notBetween";
 export interface RestSearchParams {
     page?: number;
@@ -60,7 +64,7 @@ export declare class RestApi<DataType> extends BaseRestApi<DataType> {
     constructor(uri: string, options?: RestApiOptions);
     handleRequestConfig(config: AxiosRequestConfig): Promise<void>;
 }
-export interface BaseType {
+export interface IBaseEntity {
     /**
      * 对象id
      */
@@ -103,19 +107,20 @@ export interface BaseResult<DataType> {
     refs?: Refs;
 }
 export interface Ref {
+    label: string;
     form: {
         id: string;
         fieldId?: string;
+        label: string;
     };
-    fieldIds: string[];
-    data: BaseType[];
+    data: IBaseEntity[];
 }
 export type Refs = Ref[];
 export interface OneResult<DataType> extends BaseResult<DataType> {
-    data: DataType & BaseType;
+    data: DataType & IBaseEntity;
 }
 export interface ManyResult<DataType> extends BaseResult<DataType> {
-    data: (DataType & BaseType)[];
+    data: (DataType & IBaseEntity)[];
     total: number;
 }
 export interface BaseRequestOptions<DataType> {

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

@@ -23,7 +23,7 @@ var BaseRestApi = exports.BaseRestApi = /*#__PURE__*/function () {
     this.request = _axios["default"].create({
       baseURL: "/api/" + uri,
       // 基础URL
-      timeout: 10000,
+      timeout: 60000,
       // 请求超时时间（毫秒）
       headers: {
         'Content-Type': 'application/json;charset=UTF-8'

package/lib/utils/api/schema.util.d.ts

@@ -0,0 +1,14 @@
+/**
+ * 遍历schema
+ * @param schema
+ * @param callback 返回true 继续往下遍历
+ */
+export declare function forEachSchema(schema: Schema, callback: (child: Schema, index: number, children: any[]) => boolean): void;
+export declare function forEachFormSchema(schema: Schema, fdm: boolean, callback: (child: Schema) => void): void;
+interface Schema {
+    componentName: string;
+    props: any;
+    children?: Schema[];
+    fdmSchema?: Schema;
+}
+export {};

package/lib/utils/api/schema.util.js

@@ -0,0 +1,37 @@
+"use strict";
+
+exports.__esModule = true;
+exports.forEachFormSchema = forEachFormSchema;
+exports.forEachSchema = forEachSchema;
+/**
+ * 遍历schema
+ * @param schema
+ * @param callback 返回true 继续往下遍历
+ */
+function forEachSchema(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) {
+      forEachSchema(child, callback);
+    }
+  });
+}
+function forEachFormSchema(schema, fdm, callback) {
+  forEachSchema(schema, function (child) {
+    if (["PageForm", "SubFormField"].includes(child.componentName)) {
+      callback(child);
+      if (fdm) {
+        if (child.fdmSchema) {
+          forEachSchema(child.fdmSchema, function (fdmChild) {
+            if (fdmChild.componentName == "PageFdm") {
+              callback(child);
+            }
+            return true;
+          });
+        }
+      }
+    }
+    return true;
+  });
+}

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

@@ -17,7 +17,7 @@ function _loadDts() {
         case 0:
           _context.prev = 0;
           _context.next = 3;
-          return (0, _index.getFormApi)("form_bea7fcc6376c4461965237056f970fb7");
+          return (0, _index.getFormApi)("c40772eb-864b-42bb-ae31-9921d8ede97f");
         case 3:
           api = _context.sent;
           _context.next = 6;

package/lib/utils/api/user-info.d.ts

@@ -1,9 +1,19 @@
-export interface UserInfo {
-    userId: string;
-    userName: string;
+import { IBaseEntity } from "./rest-api";
+export interface Userinfo {
+    id: string;
+    label: string;
+    username: string;
     staffId: string;
     staffName: string;
-    roleIds: string[];
-    deptIds: string[];
+    form: {
+        id: string;
+    };
+    depts: IBaseEntity[];
+    roles: IBaseEntity[];
+    corp: {
+        id: string;
+        name: string;
+        shortName: string;
+    };
 }
-export declare function loadUserInfo(): Promise<UserInfo | false>;
+export declare function getUserinfo(): Promise<Userinfo | null>;

package/lib/utils/api/user-info.js

@@ -2,43 +2,54 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
-exports.loadUserInfo = loadUserInfo;
+exports.getUserinfo = getUserinfo;
 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);
+var userinfoKey = "userinfo";
+function getUserinfo() {
+  return _getUserinfo.apply(this, arguments);
 }
-function _loadUserInfo() {
-  _loadUserInfo = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-    var res;
+function _getUserinfo() {
+  _getUserinfo = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+    var userinfo, cache, res;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          if (!window.userInfo) {
-            _context.next = 4;
+          userinfo = null;
+          cache = sessionStorage.getItem(userinfoKey);
+          if (cache) {
+            try {
+              userinfo = JSON.parse(cache);
+            } catch (e) {}
+          }
+          if (userinfo) {
+            _context.next = 8;
             break;
           }
-          return _context.abrupt("return", (0, _extends2["default"])({}, window.userInfo));
-        case 4:
           _context.next = 6;
-          return _index.apiRequest.get("userInfo");
+          return _index.apiRequest.get("auths/userinfo");
         case 6:
           res = _context.sent;
-          if (!res.success) {
-            _context.next = 12;
-            break;
+          if (res.success) {
+            sessionStorage.setItem(userinfoKey, JSON.stringify(res.data));
+            userinfo = res.data;
+          }
+        case 8:
+          if (userinfo) {
+            Object.defineProperty(window, "userinfo", {
+              value: userinfo
+            });
+            Object.defineProperty(window, "corp", {
+              value: userinfo.corp
+            });
           }
-          window.userInfo = res.data;
-          return _context.abrupt("return", (0, _extends2["default"])({}, res.data));
-        case 12:
-          return _context.abrupt("return", false);
-        case 13:
+          return _context.abrupt("return", userinfo);
+        case 10:
         case "end":
           return _context.stop();
       }
     }, _callee);
   }));
-  return _loadUserInfo.apply(this, arguments);
+  return _getUserinfo.apply(this, arguments);
 }

package/lib/utils/cache/index.js

@@ -8,7 +8,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
 var _SingletonInstanceMap3 = require("../common/SingletonInstanceMap");
 var _api = require("../api");
-var _schema = require("./schema");
+var _schema = require("../api/schema.util");
 var SchemaCache = exports.SchemaCache = /*#__PURE__*/function (_SingletonInstanceMap) {
   function SchemaCache() {
     return _SingletonInstanceMap.apply(this, arguments) || this;
@@ -17,7 +17,7 @@ var SchemaCache = exports.SchemaCache = /*#__PURE__*/function (_SingletonInstanc
   var _proto = SchemaCache.prototype;
   _proto.createInstance = /*#__PURE__*/function () {
     var _createInstance = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(key, options) {
-      var mock, pageId, res;
+      var mock, pageId, schemaRes, schema, permissionRes, permission;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -29,16 +29,27 @@ var SchemaCache = exports.SchemaCache = /*#__PURE__*/function (_SingletonInstanc
               }
             });
           case 3:
-            res = _context.sent;
-            if (!res.success) {
-              _context.next = 7;
+            schemaRes = _context.sent;
+            schema = schemaRes.data;
+            if (!(typeof schema == "object")) {
+              _context.next = 11;
               break;
             }
-            _context.next = 7;
-            return (0, _schema.handleFormSchema)(res.data);
-          case 7:
-            return _context.abrupt("return", res);
+            _context.next = 8;
+            return _api.apiRequest.get("pages/" + pageId + "/permission");
           case 8:
+            permissionRes = _context.sent;
+            permission = permissionRes.data;
+            if (typeof permission == "object") {
+              (0, _schema.forEachFormSchema)(schema, true, function (child) {
+                child.props = child.props || {};
+                child.props.permission = permission;
+              });
+            }
+          case 11:
+            console.log("schemaRes", schemaRes);
+            return _context.abrupt("return", schemaRes);
+          case 13:
           case "end":
             return _context.stop();
         }

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

@@ -1,8 +1,6 @@
-export declare function handleFormSchema(schema: any): Promise<void>;
 /**
  * 遍历schema
  * @param schema
  * @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>;