@zhubangyun/lowcode-core 5.4.261 → 5.4.292

package/es/components/page-lading/index.d.ts

@@ -0,0 +1,7 @@
+import "./index.less";
+import { CSSProperties } from "react";
+export interface PageLadingProps {
+    style?: CSSProperties;
+    loading: boolean;
+}
+export declare function PageLading(props: PageLadingProps): import("react").JSX.Element;

package/es/components/page-lading/index.js

@@ -0,0 +1,25 @@
+import "./index.less";
+import { Fragment } from "react";
+export function PageLading(props) {
+  var style = props.style,
+    loading = props.loading;
+  if (!loading) {
+    return /*#__PURE__*/React.createElement(Fragment, null);
+  }
+  return /*#__PURE__*/React.createElement("div", {
+    className: "page-loading",
+    style: style
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "atom-spinner"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "spinner-inner"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "spinner-line"
+  }), /*#__PURE__*/React.createElement("div", {
+    className: "spinner-line"
+  }), /*#__PURE__*/React.createElement("div", {
+    className: "spinner-line"
+  }), /*#__PURE__*/React.createElement("div", {
+    className: "spinner-circle"
+  }))));
+}

package/es/components/page-lading/index.less

@@ -0,0 +1,97 @@
+#fullscreen-loading {
+  position: fixed;
+  width: 100vw;
+  height: 100vh;
+  top: 0;
+  left: 0;
+  z-index: 10;
+  background: white;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  overflow: hidden;
+}
+
+.page-loading {
+  width: 100%;
+  height: 100%;
+  z-index: 10;
+  background: white;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  overflow: hidden;
+}
+
+.atom-spinner, .atom-spinner * {
+  box-sizing: border-box;
+}
+
+.atom-spinner {
+  height: 60px;
+  width: 60px;
+  overflow: hidden;
+}
+
+.atom-spinner .spinner-inner {
+  position: relative;
+  display: block;
+  height: 100%;
+  width: 100%;
+}
+
+.atom-spinner .spinner-circle {
+  display: block;
+  position: absolute;
+  color: #1677ff;
+  font-size: calc(60px * 0.24);
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+}
+
+.atom-spinner .spinner-line {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  border-radius: 50%;
+  border-left-width: calc(60px / 25);
+  border-top-width: calc(60px / 25);
+  border-left-color: #1677ff;
+  border-left-style: solid;
+  border-top-style: solid;
+  border-top-color: transparent;
+}
+
+.atom-spinner .spinner-line:nth-child(1) {
+  animation: atom-spinner-animation-1 1s linear infinite;
+  transform: rotateZ(120deg) rotateX(66deg) rotateZ(0deg);
+}
+
+.atom-spinner .spinner-line:nth-child(2) {
+  animation: atom-spinner-animation-2 1s linear infinite;
+  transform: rotateZ(240deg) rotateX(66deg) rotateZ(0deg);
+}
+
+.atom-spinner .spinner-line:nth-child(3) {
+  animation: atom-spinner-animation-3 1s linear infinite;
+  transform: rotateZ(360deg) rotateX(66deg) rotateZ(0deg);
+}
+
+@keyframes atom-spinner-animation-1 {
+  100% {
+    transform: rotateZ(120deg) rotateX(66deg) rotateZ(360deg);
+  }
+}
+
+@keyframes atom-spinner-animation-2 {
+  100% {
+    transform: rotateZ(240deg) rotateX(66deg) rotateZ(360deg);
+  }
+}
+
+@keyframes atom-spinner-animation-3 {
+  100% {
+    transform: rotateZ(360deg) rotateX(66deg) rotateZ(360deg);
+  }
+}

package/es/index.less

@@ -1,97 +0,0 @@
-#fullscreen-loading {
-  position: fixed;
-  width: 100vw;
-  height: 100vh;
-  top: 0;
-  left: 0;
-  z-index: 10;
-  background: white;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  overflow: hidden;
-}
-
-.page-loading {
-  width: 100%;
-  height: 100%;
-  z-index: 10;
-  background: white;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  overflow: hidden;
-}
-
-.atom-spinner, .atom-spinner * {
-  box-sizing: border-box;
-}
-
-.atom-spinner {
-  height: 60px;
-  width: 60px;
-  overflow: hidden;
-}
-
-.atom-spinner .spinner-inner {
-  position: relative;
-  display: block;
-  height: 100%;
-  width: 100%;
-}
-
-.atom-spinner .spinner-circle {
-  display: block;
-  position: absolute;
-  color: #1677ff;
-  font-size: calc(60px * 0.24);
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-}
-
-.atom-spinner .spinner-line {
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  border-radius: 50%;
-  border-left-width: calc(60px / 25);
-  border-top-width: calc(60px / 25);
-  border-left-color: #1677ff;
-  border-left-style: solid;
-  border-top-style: solid;
-  border-top-color: transparent;
-}
-
-.atom-spinner .spinner-line:nth-child(1) {
-  animation: atom-spinner-animation-1 1s linear infinite;
-  transform: rotateZ(120deg) rotateX(66deg) rotateZ(0deg);
-}
-
-.atom-spinner .spinner-line:nth-child(2) {
-  animation: atom-spinner-animation-2 1s linear infinite;
-  transform: rotateZ(240deg) rotateX(66deg) rotateZ(0deg);
-}
-
-.atom-spinner .spinner-line:nth-child(3) {
-  animation: atom-spinner-animation-3 1s linear infinite;
-  transform: rotateZ(360deg) rotateX(66deg) rotateZ(0deg);
-}
-
-@keyframes atom-spinner-animation-1 {
-  100% {
-    transform: rotateZ(120deg) rotateX(66deg) rotateZ(360deg);
-  }
-}
-
-@keyframes atom-spinner-animation-2 {
-  100% {
-    transform: rotateZ(240deg) rotateX(66deg) rotateZ(360deg);
-  }
-}
-
-@keyframes atom-spinner-animation-3 {
-  100% {
-    transform: rotateZ(360deg) rotateX(66deg) rotateZ(360deg);
-  }
-}

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

@@ -21,6 +21,7 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
   var _proto = RestFormApi.prototype;
   _proto.initialize = /*#__PURE__*/function () {
     var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      var _this2 = this;
       var res;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -38,10 +39,25 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
             res = _context.sent;
             this.schema = res.data;
             this.initialized = !!this.schema;
-            _context.next = 16;
+            this.title = this.schema.label;
+            if (this.fieldId) {
+              JSON.stringify(this.schema, function (key, value) {
+                var _value$props;
+                if (key == "fdmSchema") {
+                  return undefined;
+                }
+                if ((value === null || value === void 0 ? void 0 : (_value$props = value.props) === null || _value$props === void 0 ? void 0 : _value$props.fieldId) === _this2.fieldId) {
+                  if (value.props.label) {
+                    _this2.title += "." + value.props.label;
+                  }
+                }
+                return value;
+              });
+            }
+            _context.next = 18;
             break;
-          case 12:
-            _context.prev = 12;
+          case 14:
+            _context.prev = 14;
             _context.t0 = _context["catch"](4);
             console.log("获取schema失败!", {
               formId: this.formId,
@@ -49,13 +65,13 @@ export var RestFormApi = /*#__PURE__*/function (_RestApi) {
               mock: this.mock
             }, _context.t0);
             throw _context.t0;
-          case 16:
+          case 18:
             return _context.abrupt("return", this.initialized);
-          case 17:
+          case 19:
           case "end":
             return _context.stop();
         }
-      }, _callee, this, [[4, 12]]);
+      }, _callee, this, [[4, 14]]);
     }));
     function initialize() {
       return _initialize.apply(this, arguments);

package/es/utils/api/index.js

@@ -59,7 +59,9 @@ function _getFormApi() {
               mock = window.__mock;
             }
           }
-          key = !!mock ? formId + "_mock" : formId;
+          key = [formId, fieldId, mock ? "mock" : ""].filter(function (key) {
+            return !!key;
+          }).join("_");
           _context2.next = 4;
           return formApi.getInstance(key, {
             mock: mock,

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

@@ -10,13 +10,26 @@ export interface RestApiOptions {
      */
     title?: string;
 }
+export interface FilterRule {
+    connector?: "and" | "or";
+    key: string;
+    operator?: OperatorType;
+    value: any;
+    rules?: FilterRule[];
+}
+export declare type OperatorType = "eq" | "ne" | "gt" | "goe" | "lt" | "loe" | "like" | "notLike" | "in" | "notIn" | "isNull" | "isNotNull" | "between" | "notBetween";
+export interface RestSearchParams {
+    page?: number;
+    pageSize?: number;
+    filterRules?: FilterRule[];
+}
 export declare abstract class BaseRestApi<DataType> {
     uri: string;
     title: string;
     request: AxiosInstance;
     protected constructor(uri: string, options?: RestApiOptions);
     abstract handleRequestConfig(config: AxiosRequestConfig): void;
-    search(params?: Record<string, any>, page?: number, pageSize?: number): Promise<ManyResult<DataType>>;
+    search(params?: RestSearchParams): Promise<ManyResult<DataType>>;
     /**
      * 通过id获取
      * @param id

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

@@ -24,42 +24,31 @@ export var BaseRestApi = /*#__PURE__*/function () {
   }
   var _proto = BaseRestApi.prototype;
   _proto.search = /*#__PURE__*/function () {
-    var _search = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(params, page, pageSize) {
+    var _search = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(params) {
       var _this$handleRequestCo;
       var config;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            if (params === void 0) {
-              params = {};
-            }
-            if (page === void 0) {
-              page = 1;
-            }
-            if (pageSize === void 0) {
-              pageSize = 20;
-            }
-            params.page = page;
-            params.pageSize = pageSize;
             config = {
               params: params
             };
-            _context.next = 8;
+            _context.next = 3;
             return (_this$handleRequestCo = this.handleRequestConfig) === null || _this$handleRequestCo === void 0 ? void 0 : _this$handleRequestCo.call(this, config);
-          case 8:
-            _context.next = 10;
+          case 3:
+            _context.next = 5;
             return this.request.get("", {
               params: params
             });
-          case 10:
+          case 5:
             return _context.abrupt("return", _context.sent);
-          case 11:
+          case 6:
           case "end":
             return _context.stop();
         }
       }, _callee, this);
     }));
-    function search(_x, _x2, _x3) {
+    function search(_x) {
       return _search.apply(this, arguments);
     }
     return search;
@@ -108,7 +97,7 @@ export var BaseRestApi = /*#__PURE__*/function () {
         }
       }, _callee2, this);
     }));
-    function getById(_x4, _x5) {
+    function getById(_x2, _x3) {
       return _getById.apply(this, arguments);
     }
     return getById;
@@ -149,7 +138,7 @@ export var BaseRestApi = /*#__PURE__*/function () {
         }
       }, _callee3, this);
     }));
-    function save(_x6, _x7) {
+    function save(_x4, _x5) {
       return _save.apply(this, arguments);
     }
     return save;
@@ -196,7 +185,7 @@ export var BaseRestApi = /*#__PURE__*/function () {
         }
       }, _callee4, this);
     }));
-    function create(_x8, _x9) {
+    function create(_x6, _x7) {
       return _create.apply(this, arguments);
     }
     return create;
@@ -243,7 +232,7 @@ export var BaseRestApi = /*#__PURE__*/function () {
         }
       }, _callee5, this);
     }));
-    function update(_x10, _x11, _x12) {
+    function update(_x8, _x9, _x10) {
       return _update.apply(this, arguments);
     }
     return update;
@@ -290,7 +279,7 @@ export var BaseRestApi = /*#__PURE__*/function () {
         }
       }, _callee6, this);
     }));
-    function deleteById(_x13, _x14) {
+    function deleteById(_x11, _x12) {
       return _deleteById.apply(this, arguments);
     }
     return deleteById;
@@ -308,7 +297,7 @@ export var BaseRestApi = /*#__PURE__*/function () {
         }
       }, _callee7, this);
     }));
-    function showError(_x15, _x16) {
+    function showError(_x13, _x14) {
       return _showError.apply(this, arguments);
     }
     return showError;
@@ -331,7 +320,7 @@ export var RestApi = /*#__PURE__*/function (_BaseRestApi2) {
         }
       }, _callee8);
     }));
-    function handleRequestConfig(_x17) {
+    function handleRequestConfig(_x15) {
       return _handleRequestConfig.apply(this, arguments);
     }
     return handleRequestConfig;

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

@@ -1,4 +1,4 @@
-export declare function handleFormSchema(schema: FormSchema): void;
+export declare function handleFormSchema(schema: any): void;
 /**
  * 遍历schema
  * @param schema
@@ -14,7 +14,7 @@ export interface FormSchema {
     tableName?: string;
     schemaName?: string;
     columnName?: string;
-    fdmSchema?: FormSchema;
+    fdmSchema?: any;
     props: FormSchemaProps;
     children?: FormSchema[];
 }

package/es/utils/cache/schema.js

@@ -5,9 +5,11 @@ export function handleFormSchema(schema) {
   schema.methods = schema.methods || {};
   forEachFormSchema(schema, function (field) {
     if (field.fdmSchema) {
-      var _field$fdmSchema;
+      var _field$fdmSchema, _field$fdmSchema2;
       fdmItems.push(field);
       field.fdmSchema.props = ((_field$fdmSchema = field.fdmSchema) === null || _field$fdmSchema === void 0 ? void 0 : _field$fdmSchema.props) || {};
+      field.fdmSchema.props.style = ((_field$fdmSchema2 = field.fdmSchema) === null || _field$fdmSchema2 === void 0 ? void 0 : _field$fdmSchema2.props.style) || {};
+      field.fdmSchema.props.style.height = "100%";
       // @ts-ignore
       field.fdmSchema.props.noContainer = true;
     }
@@ -27,6 +29,7 @@ export function handleFormSchema(schema) {
       if (findSchema) {
         field.componentName = findSchema.componentName;
         field.props = Object.assign({}, JSON.parse(JSON.stringify(findSchema.props)), field.props);
+        //处理子表查询
         if (findSchema.componentName == "SubFormField") {
           if (findSchema.fdmSchema) {
             var subFormFdmSchema = JSON.parse(JSON.stringify(findSchema.fdmSchema));
@@ -39,6 +42,7 @@ export function handleFormSchema(schema) {
             // @ts-ignore
             field.props.fdmSchema = subFormFdmSchema;
             field.children = subFormFdmSchema.children[0].children;
+            console.log(subFormFdmSchema);
           }
         }
       }

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

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

package/es/utils/index.d.ts

@@ -2,9 +2,11 @@ import * as common from "./common";
 import * as api from "./api";
 import * as designer from "./designer";
 import * as page from "./page";
+import * as cache from "./cache";
 declare const _default: {
     api: typeof api;
     page: typeof page;
+    cache: typeof cache;
     designer: typeof designer;
     common: typeof common;
 };

package/es/utils/index.js

@@ -2,9 +2,11 @@ import * as common from "./common";
 import * as api from "./api";
 import * as designer from "./designer";
 import * as page from "./page";
+import * as cache from "./cache";
 export default {
   api: api,
   page: page,
+  cache: cache,
   designer: designer,
   common: common
 };

package/es/utils/page/page-load-schema.js

@@ -2,6 +2,7 @@ import _Result from "antd/es/result";
 import _message from "antd/es/message";
 import { useEffect, useState } from "react";
 import { getSchema } from "../api";
+import { PageLading } from "../../components/page-lading";
 export function PageLoadSchema(props) {
   var pageId = props.pageId,
     children = props.children;
@@ -32,21 +33,12 @@ export function PageLoadSchema(props) {
     }
   }, []);
   if (loading) {
-    return /*#__PURE__*/React.createElement("div", {
-      className: "page-loading"
-    }, /*#__PURE__*/React.createElement("div", {
-      className: "atom-spinner"
-    }, /*#__PURE__*/React.createElement("div", {
-      className: "spinner-inner"
-    }, /*#__PURE__*/React.createElement("div", {
-      className: "spinner-line"
-    }), /*#__PURE__*/React.createElement("div", {
-      className: "spinner-line"
-    }), /*#__PURE__*/React.createElement("div", {
-      className: "spinner-line"
-    }), /*#__PURE__*/React.createElement("div", {
-      className: "spinner-circle"
-    }))));
+    return /*#__PURE__*/React.createElement(PageLading, {
+      loading: true,
+      style: {
+        background: "white"
+      }
+    });
   }
   if (!schema) {
     return /*#__PURE__*/React.createElement(_Result, {

package/lib/components/page-lading/index.d.ts

@@ -0,0 +1,7 @@
+import "./index.less";
+import { CSSProperties } from "react";
+export interface PageLadingProps {
+    style?: CSSProperties;
+    loading: boolean;
+}
+export declare function PageLading(props: PageLadingProps): import("react").JSX.Element;

package/lib/components/page-lading/index.js

@@ -0,0 +1,29 @@
+"use strict";
+
+exports.__esModule = true;
+exports.PageLading = PageLading;
+require("./index.less");
+var _react = require("react");
+function PageLading(props) {
+  var style = props.style,
+    loading = props.loading;
+  if (!loading) {
+    return /*#__PURE__*/React.createElement(_react.Fragment, null);
+  }
+  return /*#__PURE__*/React.createElement("div", {
+    className: "page-loading",
+    style: style
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "atom-spinner"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "spinner-inner"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "spinner-line"
+  }), /*#__PURE__*/React.createElement("div", {
+    className: "spinner-line"
+  }), /*#__PURE__*/React.createElement("div", {
+    className: "spinner-line"
+  }), /*#__PURE__*/React.createElement("div", {
+    className: "spinner-circle"
+  }))));
+}

package/lib/components/page-lading/index.less

@@ -0,0 +1,97 @@
+#fullscreen-loading {
+  position: fixed;
+  width: 100vw;
+  height: 100vh;
+  top: 0;
+  left: 0;
+  z-index: 10;
+  background: white;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  overflow: hidden;
+}
+
+.page-loading {
+  width: 100%;
+  height: 100%;
+  z-index: 10;
+  background: white;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  overflow: hidden;
+}
+
+.atom-spinner, .atom-spinner * {
+  box-sizing: border-box;
+}
+
+.atom-spinner {
+  height: 60px;
+  width: 60px;
+  overflow: hidden;
+}
+
+.atom-spinner .spinner-inner {
+  position: relative;
+  display: block;
+  height: 100%;
+  width: 100%;
+}
+
+.atom-spinner .spinner-circle {
+  display: block;
+  position: absolute;
+  color: #1677ff;
+  font-size: calc(60px * 0.24);
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+}
+
+.atom-spinner .spinner-line {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  border-radius: 50%;
+  border-left-width: calc(60px / 25);
+  border-top-width: calc(60px / 25);
+  border-left-color: #1677ff;
+  border-left-style: solid;
+  border-top-style: solid;
+  border-top-color: transparent;
+}
+
+.atom-spinner .spinner-line:nth-child(1) {
+  animation: atom-spinner-animation-1 1s linear infinite;
+  transform: rotateZ(120deg) rotateX(66deg) rotateZ(0deg);
+}
+
+.atom-spinner .spinner-line:nth-child(2) {
+  animation: atom-spinner-animation-2 1s linear infinite;
+  transform: rotateZ(240deg) rotateX(66deg) rotateZ(0deg);
+}
+
+.atom-spinner .spinner-line:nth-child(3) {
+  animation: atom-spinner-animation-3 1s linear infinite;
+  transform: rotateZ(360deg) rotateX(66deg) rotateZ(0deg);
+}
+
+@keyframes atom-spinner-animation-1 {
+  100% {
+    transform: rotateZ(120deg) rotateX(66deg) rotateZ(360deg);
+  }
+}
+
+@keyframes atom-spinner-animation-2 {
+  100% {
+    transform: rotateZ(240deg) rotateX(66deg) rotateZ(360deg);
+  }
+}
+
+@keyframes atom-spinner-animation-3 {
+  100% {
+    transform: rotateZ(360deg) rotateX(66deg) rotateZ(360deg);
+  }
+}

package/lib/index.less

@@ -1,97 +0,0 @@
-#fullscreen-loading {
-  position: fixed;
-  width: 100vw;
-  height: 100vh;
-  top: 0;
-  left: 0;
-  z-index: 10;
-  background: white;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  overflow: hidden;
-}
-
-.page-loading {
-  width: 100%;
-  height: 100%;
-  z-index: 10;
-  background: white;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  overflow: hidden;
-}
-
-.atom-spinner, .atom-spinner * {
-  box-sizing: border-box;
-}
-
-.atom-spinner {
-  height: 60px;
-  width: 60px;
-  overflow: hidden;
-}
-
-.atom-spinner .spinner-inner {
-  position: relative;
-  display: block;
-  height: 100%;
-  width: 100%;
-}
-
-.atom-spinner .spinner-circle {
-  display: block;
-  position: absolute;
-  color: #1677ff;
-  font-size: calc(60px * 0.24);
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-}
-
-.atom-spinner .spinner-line {
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  border-radius: 50%;
-  border-left-width: calc(60px / 25);
-  border-top-width: calc(60px / 25);
-  border-left-color: #1677ff;
-  border-left-style: solid;
-  border-top-style: solid;
-  border-top-color: transparent;
-}
-
-.atom-spinner .spinner-line:nth-child(1) {
-  animation: atom-spinner-animation-1 1s linear infinite;
-  transform: rotateZ(120deg) rotateX(66deg) rotateZ(0deg);
-}
-
-.atom-spinner .spinner-line:nth-child(2) {
-  animation: atom-spinner-animation-2 1s linear infinite;
-  transform: rotateZ(240deg) rotateX(66deg) rotateZ(0deg);
-}
-
-.atom-spinner .spinner-line:nth-child(3) {
-  animation: atom-spinner-animation-3 1s linear infinite;
-  transform: rotateZ(360deg) rotateX(66deg) rotateZ(0deg);
-}
-
-@keyframes atom-spinner-animation-1 {
-  100% {
-    transform: rotateZ(120deg) rotateX(66deg) rotateZ(360deg);
-  }
-}
-
-@keyframes atom-spinner-animation-2 {
-  100% {
-    transform: rotateZ(240deg) rotateX(66deg) rotateZ(360deg);
-  }
-}
-
-@keyframes atom-spinner-animation-3 {
-  100% {
-    transform: rotateZ(360deg) rotateX(66deg) rotateZ(360deg);
-  }
-}

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

@@ -26,6 +26,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
   var _proto = RestFormApi.prototype;
   _proto.initialize = /*#__PURE__*/function () {
     var _initialize = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+      var _this2 = this;
       var res;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -43,10 +44,25 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
             res = _context.sent;
             this.schema = res.data;
             this.initialized = !!this.schema;
-            _context.next = 16;
+            this.title = this.schema.label;
+            if (this.fieldId) {
+              JSON.stringify(this.schema, function (key, value) {
+                var _value$props;
+                if (key == "fdmSchema") {
+                  return undefined;
+                }
+                if ((value === null || value === void 0 ? void 0 : (_value$props = value.props) === null || _value$props === void 0 ? void 0 : _value$props.fieldId) === _this2.fieldId) {
+                  if (value.props.label) {
+                    _this2.title += "." + value.props.label;
+                  }
+                }
+                return value;
+              });
+            }
+            _context.next = 18;
             break;
-          case 12:
-            _context.prev = 12;
+          case 14:
+            _context.prev = 14;
             _context.t0 = _context["catch"](4);
             console.log("获取schema失败!", {
               formId: this.formId,
@@ -54,13 +70,13 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
               mock: this.mock
             }, _context.t0);
             throw _context.t0;
-          case 16:
+          case 18:
             return _context.abrupt("return", this.initialized);
-          case 17:
+          case 19:
           case "end":
             return _context.stop();
         }
-      }, _callee, this, [[4, 12]]);
+      }, _callee, this, [[4, 14]]);
     }));
     function initialize() {
       return _initialize.apply(this, arguments);

package/lib/utils/api/index.js

@@ -72,7 +72,9 @@ function _getFormApi() {
               mock = window.__mock;
             }
           }
-          key = !!mock ? formId + "_mock" : formId;
+          key = [formId, fieldId, mock ? "mock" : ""].filter(function (key) {
+            return !!key;
+          }).join("_");
           _context2.next = 4;
           return _cache.formApi.getInstance(key, {
             mock: mock,

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

@@ -10,13 +10,26 @@ export interface RestApiOptions {
      */
     title?: string;
 }
+export interface FilterRule {
+    connector?: "and" | "or";
+    key: string;
+    operator?: OperatorType;
+    value: any;
+    rules?: FilterRule[];
+}
+export declare type OperatorType = "eq" | "ne" | "gt" | "goe" | "lt" | "loe" | "like" | "notLike" | "in" | "notIn" | "isNull" | "isNotNull" | "between" | "notBetween";
+export interface RestSearchParams {
+    page?: number;
+    pageSize?: number;
+    filterRules?: FilterRule[];
+}
 export declare abstract class BaseRestApi<DataType> {
     uri: string;
     title: string;
     request: AxiosInstance;
     protected constructor(uri: string, options?: RestApiOptions);
     abstract handleRequestConfig(config: AxiosRequestConfig): void;
-    search(params?: Record<string, any>, page?: number, pageSize?: number): Promise<ManyResult<DataType>>;
+    search(params?: RestSearchParams): Promise<ManyResult<DataType>>;
     /**
      * 通过id获取
      * @param id

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

@@ -29,42 +29,31 @@ var BaseRestApi = exports.BaseRestApi = /*#__PURE__*/function () {
   }
   var _proto = BaseRestApi.prototype;
   _proto.search = /*#__PURE__*/function () {
-    var _search = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(params, page, pageSize) {
+    var _search = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(params) {
       var _this$handleRequestCo;
       var config;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            if (params === void 0) {
-              params = {};
-            }
-            if (page === void 0) {
-              page = 1;
-            }
-            if (pageSize === void 0) {
-              pageSize = 20;
-            }
-            params.page = page;
-            params.pageSize = pageSize;
             config = {
               params: params
             };
-            _context.next = 8;
+            _context.next = 3;
             return (_this$handleRequestCo = this.handleRequestConfig) === null || _this$handleRequestCo === void 0 ? void 0 : _this$handleRequestCo.call(this, config);
-          case 8:
-            _context.next = 10;
+          case 3:
+            _context.next = 5;
             return this.request.get("", {
               params: params
             });
-          case 10:
+          case 5:
             return _context.abrupt("return", _context.sent);
-          case 11:
+          case 6:
           case "end":
             return _context.stop();
         }
       }, _callee, this);
     }));
-    function search(_x, _x2, _x3) {
+    function search(_x) {
       return _search.apply(this, arguments);
     }
     return search;
@@ -113,7 +102,7 @@ var BaseRestApi = exports.BaseRestApi = /*#__PURE__*/function () {
         }
       }, _callee2, this);
     }));
-    function getById(_x4, _x5) {
+    function getById(_x2, _x3) {
       return _getById.apply(this, arguments);
     }
     return getById;
@@ -154,7 +143,7 @@ var BaseRestApi = exports.BaseRestApi = /*#__PURE__*/function () {
         }
       }, _callee3, this);
     }));
-    function save(_x6, _x7) {
+    function save(_x4, _x5) {
       return _save.apply(this, arguments);
     }
     return save;
@@ -201,7 +190,7 @@ var BaseRestApi = exports.BaseRestApi = /*#__PURE__*/function () {
         }
       }, _callee4, this);
     }));
-    function create(_x8, _x9) {
+    function create(_x6, _x7) {
       return _create.apply(this, arguments);
     }
     return create;
@@ -248,7 +237,7 @@ var BaseRestApi = exports.BaseRestApi = /*#__PURE__*/function () {
         }
       }, _callee5, this);
     }));
-    function update(_x10, _x11, _x12) {
+    function update(_x8, _x9, _x10) {
       return _update.apply(this, arguments);
     }
     return update;
@@ -295,7 +284,7 @@ var BaseRestApi = exports.BaseRestApi = /*#__PURE__*/function () {
         }
       }, _callee6, this);
     }));
-    function deleteById(_x13, _x14) {
+    function deleteById(_x11, _x12) {
       return _deleteById.apply(this, arguments);
     }
     return deleteById;
@@ -313,7 +302,7 @@ var BaseRestApi = exports.BaseRestApi = /*#__PURE__*/function () {
         }
       }, _callee7, this);
     }));
-    function showError(_x15, _x16) {
+    function showError(_x13, _x14) {
       return _showError.apply(this, arguments);
     }
     return showError;
@@ -336,7 +325,7 @@ var RestApi = exports.RestApi = /*#__PURE__*/function (_BaseRestApi2) {
         }
       }, _callee8);
     }));
-    function handleRequestConfig(_x17) {
+    function handleRequestConfig(_x15) {
       return _handleRequestConfig.apply(this, arguments);
     }
     return handleRequestConfig;

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

@@ -1,4 +1,4 @@
-export declare function handleFormSchema(schema: FormSchema): void;
+export declare function handleFormSchema(schema: any): void;
 /**
  * 遍历schema
  * @param schema
@@ -14,7 +14,7 @@ export interface FormSchema {
     tableName?: string;
     schemaName?: string;
     columnName?: string;
-    fdmSchema?: FormSchema;
+    fdmSchema?: any;
     props: FormSchemaProps;
     children?: FormSchema[];
 }

package/lib/utils/cache/schema.js

@@ -10,9 +10,11 @@ function handleFormSchema(schema) {
   schema.methods = schema.methods || {};
   forEachFormSchema(schema, function (field) {
     if (field.fdmSchema) {
-      var _field$fdmSchema;
+      var _field$fdmSchema, _field$fdmSchema2;
       fdmItems.push(field);
       field.fdmSchema.props = ((_field$fdmSchema = field.fdmSchema) === null || _field$fdmSchema === void 0 ? void 0 : _field$fdmSchema.props) || {};
+      field.fdmSchema.props.style = ((_field$fdmSchema2 = field.fdmSchema) === null || _field$fdmSchema2 === void 0 ? void 0 : _field$fdmSchema2.props.style) || {};
+      field.fdmSchema.props.style.height = "100%";
       // @ts-ignore
       field.fdmSchema.props.noContainer = true;
     }
@@ -32,6 +34,7 @@ function handleFormSchema(schema) {
       if (findSchema) {
         field.componentName = findSchema.componentName;
         field.props = Object.assign({}, JSON.parse(JSON.stringify(findSchema.props)), field.props);
+        //处理子表查询
         if (findSchema.componentName == "SubFormField") {
           if (findSchema.fdmSchema) {
             var subFormFdmSchema = JSON.parse(JSON.stringify(findSchema.fdmSchema));
@@ -44,6 +47,7 @@ function handleFormSchema(schema) {
             // @ts-ignore
             field.props.fdmSchema = subFormFdmSchema;
             field.children = subFormFdmSchema.children[0].children;
+            console.log(subFormFdmSchema);
           }
         }
       }

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

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

package/lib/utils/index.d.ts

@@ -2,9 +2,11 @@ import * as common from "./common";
 import * as api from "./api";
 import * as designer from "./designer";
 import * as page from "./page";
+import * as cache from "./cache";
 declare const _default: {
     api: typeof api;
     page: typeof page;
+    cache: typeof cache;
     designer: typeof designer;
     common: typeof common;
 };

package/lib/utils/index.js

@@ -6,11 +6,13 @@ var common = _interopRequireWildcard(require("./common"));
 var api = _interopRequireWildcard(require("./api"));
 var designer = _interopRequireWildcard(require("./designer"));
 var page = _interopRequireWildcard(require("./page"));
+var cache = _interopRequireWildcard(require("./cache"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 var _default = exports["default"] = {
   api: api,
   page: page,
+  cache: cache,
   designer: designer,
   common: common
 };

package/lib/utils/page/page-load-schema.js

@@ -7,6 +7,7 @@ var _result = _interopRequireDefault(require("antd/lib/result"));
 var _message2 = _interopRequireDefault(require("antd/lib/message"));
 var _react = require("react");
 var _api = require("../api");
+var _pageLading = require("../../components/page-lading");
 function PageLoadSchema(props) {
   var pageId = props.pageId,
     children = props.children;
@@ -37,21 +38,12 @@ function PageLoadSchema(props) {
     }
   }, []);
   if (loading) {
-    return /*#__PURE__*/React.createElement("div", {
-      className: "page-loading"
-    }, /*#__PURE__*/React.createElement("div", {
-      className: "atom-spinner"
-    }, /*#__PURE__*/React.createElement("div", {
-      className: "spinner-inner"
-    }, /*#__PURE__*/React.createElement("div", {
-      className: "spinner-line"
-    }), /*#__PURE__*/React.createElement("div", {
-      className: "spinner-line"
-    }), /*#__PURE__*/React.createElement("div", {
-      className: "spinner-line"
-    }), /*#__PURE__*/React.createElement("div", {
-      className: "spinner-circle"
-    }))));
+    return /*#__PURE__*/React.createElement(_pageLading.PageLading, {
+      loading: true,
+      style: {
+        background: "white"
+      }
+    });
   }
   if (!schema) {
     return /*#__PURE__*/React.createElement(_result["default"], {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhubangyun/lowcode-core",
-  "version": "5.4.261",
+  "version": "5.4.292",
   "description": "低代码核心",
   "files": [
     "lib",