@zhubangyun/lowcode-core 6.1.90 → 6.3.20

package/es/components/react-render/index.js

@@ -19,6 +19,10 @@ export var ReactRender = /*#__PURE__*/function (_PureComponent) {
   _proto.render = function render() {
     var _this2 = this;
     var components = this.props.components || window._components;
+    if (!components.Page) {
+      // @ts-ignore
+      components["Page"] = Page;
+    }
     return /*#__PURE__*/React.createElement(ReactRenderFactory, _extends({
       key: this.key
     }, this.props, {
@@ -36,4 +40,10 @@ export var ReactRender = /*#__PURE__*/function (_PureComponent) {
     }));
   };
   return ReactRender;
-}(PureComponent);
+}(PureComponent);
+function Page(props) {
+  return /*#__PURE__*/React.createElement("div", {
+    className: "lce-page",
+    style: props.style
+  }, props.children);
+}

package/es/index.js

@@ -1,5 +1,4 @@
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
+import _message from "antd/es/message";
 import "./index.less";
 import { ReactRender } from "./components/react-render";
 import * as lodash from "lodash";
@@ -10,6 +9,9 @@ export { Layout } from "./components/layout";
 export { ReactRender } from "./components/react-render";
 import utils from "./utils/index";
 import { uniBridge } from "./utils/uni-bridge";
+import { initBarHeight } from "./init/init.bar-height";
+import { initScrollSize } from "./init/init.scroll-size";
+import { initMobileClass } from "./init/init.mobile-class";
 // @ts-ignore
 window.__ReactRender = ReactRender;
 // @ts-ignore
@@ -22,41 +24,17 @@ if (!window.utils) {
   // @ts-ignore
   window.utils = utils;
 }
-window.isMobile = utils.common.isMobile();
-if (window.isMobile) {
-  var classList = window.document.body.classList;
-  if (!classList.contains("mobile")) {
-    classList.add("mobile");
-  }
-}
-var bar_height_key = "bar_height";
+initMobileClass();
+
 // @ts-ignore
 utils.uniBridge = uniBridge;
 // @ts-ignore
 window.uniBridge = uniBridge;
-window.addEventListener("load", function () {
-  setTimeout(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-    var height;
-    return _regeneratorRuntime.wrap(function (_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          _context.next = 1;
-          return uniBridge.getBarHeight();
-        case 1:
-          height = _context.sent;
-          localStorage.setItem(bar_height_key, height);
-          updateBarHeight();
-        case 2:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  })), 100);
+_message.config({
+  top: 150,
+  duration: 5,
+  maxCount: 3
 });
-function updateBarHeight() {
-  if (localStorage.getItem(bar_height_key)) {
-    document.documentElement.style.setProperty('--bar-height', localStorage.getItem(bar_height_key));
-  }
-}
-updateBarHeight();
+initBarHeight();
+initScrollSize();
 export { utils, lodash };

package/es/index.less

@@ -1,7 +1,18 @@
+:root {
+  --scroll-bar-width: 15px;
+  --scroll-bar-height: 15px;
+}
+
+.ant-table-cell-scrollbar {
+  padding: 0 !important;
+  width: var(--scroll-bar-width);
+}
+
 [componentname="Page"] {
   height: 100%;
 }
 
+
 ul {
   margin-bottom: 0;
   padding-left: 0;

package/es/init/init.bar-height.d.ts

@@ -0,0 +1 @@
+export declare function initBarHeight(): void;

package/es/init/init.bar-height.js

@@ -0,0 +1,37 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { uniBridge } from "../utils/uni-bridge";
+var bar_height_key = "bar_height";
+export function initBarHeight() {
+  updateBarHeight();
+  window.onload = function () {
+    setTimeout(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      var height;
+      return _regeneratorRuntime.wrap(function (_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!window.uni) {
+              _context.next = 2;
+              break;
+            }
+            _context.next = 1;
+            return uniBridge.getBarHeight();
+          case 1:
+            height = _context.sent;
+            localStorage.setItem(bar_height_key, height);
+            updateBarHeight();
+          case 2:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    })), 100);
+  };
+}
+function updateBarHeight() {
+  var style = document.documentElement.style;
+  var barHeight = localStorage.getItem(bar_height_key);
+  if (barHeight) {
+    style.setProperty('--bar-height', barHeight);
+  }
+}

package/es/init/init.mobile-class.d.ts

@@ -0,0 +1 @@
+export declare function initMobileClass(): void;

package/es/init/init.mobile-class.js

@@ -0,0 +1,10 @@
+import { isMobile } from "../utils/common";
+export function initMobileClass() {
+  window.isMobile = isMobile();
+  if (window.isMobile) {
+    var classList = window.document.body.classList;
+    if (!classList.contains("mobile")) {
+      classList.add("mobile");
+    }
+  }
+}

package/es/init/init.scroll-size.d.ts

@@ -0,0 +1,5 @@
+export declare function initScrollSize(): void;
+export declare function getScrollbarSize(): {
+    width?: number;
+    height?: number;
+};

package/es/init/init.scroll-size.js

@@ -0,0 +1,26 @@
+var scrollbarSize = {};
+
+// @ts-ignore
+window.scrollbarSize = scrollbarSize;
+export function initScrollSize() {
+  var size = getScrollbarSize();
+  var style = document.documentElement.style;
+  style.setProperty('--scroll-bar-height', size.height + "px");
+  style.setProperty('--scroll-bar-width', size.width + "px");
+}
+export function getScrollbarSize() {
+  if (typeof scrollbarSize.height == "number" && typeof scrollbarSize.width == "number") {
+    return scrollbarSize;
+  }
+  var outer = document.createElement('div');
+  outer.style.cssText = "\n    visibility: hidden;\n    overflow: scroll;\n    position: absolute;\n    top: -9999px;\n    width: 50px;\n    height: 50px;\n  ";
+  document.body.appendChild(outer);
+  var inner = document.createElement('div');
+  inner.style.width = '100%';
+  inner.style.height = '100%';
+  outer.appendChild(inner);
+  scrollbarSize.width = outer.offsetWidth - inner.offsetWidth;
+  scrollbarSize.height = outer.offsetHeight - inner.offsetHeight;
+  document.body.removeChild(outer);
+  return scrollbarSize;
+}

package/es/style.js

@@ -1,8 +1,8 @@
+import 'antd/es/message/style';
 import 'antd/es/config-provider/style';
 
 import 'antd/es/notification/style';
 import 'antd/es/modal/style';
-import 'antd/es/message/style';
 import 'antd/es/typography/style';
 import 'antd/es/drawer/style';
 import 'antd/es/result/style';

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

@@ -0,0 +1,2 @@
+import { IBaseEntity, Refs } from "../rest-api";
+export declare function formApiAssembleEntity(data: IBaseEntity | IBaseEntity[], refs?: Refs): void;

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

@@ -0,0 +1,95 @@
+function _createForOfIteratorHelperLoose(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (t) return (t = t.call(r)).next.bind(t); if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var o = 0; return function () { return o >= r.length ? { done: !0 } : { done: !1, value: r[o++] }; }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+import { FormApiEntityMap } from "./form-api.entity-map";
+import { dataToLabel, safeGet } from "./form-api.utils";
+export function formApiAssembleEntity(data, refs) {
+  if (!data || !refs) return;
+  var dataMap = new FormApiEntityMap();
+  for (var _iterator = _createForOfIteratorHelperLoose(refs), _step; !(_step = _iterator()).done;) {
+    var ref = _step.value;
+    ref.label = ref.form.label;
+    dataMap.addEntities(ref.data);
+  }
+  assembleRefs(refs, dataMap);
+  var dataArray = Array.isArray(data) ? data : [data];
+  assembleData(dataArray, dataMap);
+}
+
+/**
+ * 装配数据
+ */
+function assembleData(data, dataMap) {
+  for (var _iterator2 = _createForOfIteratorHelperLoose(data), _step2; !(_step2 = _iterator2()).done;) {
+    var item = _step2.value;
+    assembleObject(item, dataMap, {
+      maxDepth: 5,
+      depth: 1
+    });
+  }
+}
+
+/**
+ * 装配相关数据
+ */
+function assembleRefs(refs, dataMap) {
+  for (var _iterator3 = _createForOfIteratorHelperLoose(refs), _step3; !(_step3 = _iterator3()).done;) {
+    var ref = _step3.value;
+    ref.label = ref.form.label;
+    var data = ref.data;
+    for (var _iterator4 = _createForOfIteratorHelperLoose(data), _step4; !(_step4 = _iterator4()).done;) {
+      var item = _step4.value;
+      assembleObject(item, dataMap, {
+        maxDepth: 2,
+        depth: 1
+      });
+    }
+  }
+}
+function assembleObject(values, dataMap, options) {
+  var depth = options.depth,
+    maxDepth = options.maxDepth;
+  if (options.depth >= options.maxDepth) {
+    return;
+  }
+  if (dataMap.isEntity(values)) {
+    handleEntityLabel(values);
+  }
+  for (var _i = 0, _Object$keys = Object.keys(values); _i < _Object$keys.length; _i++) {
+    var key = _Object$keys[_i];
+    var value = values[key];
+    if (Array.isArray(value)) {
+      if (dataMap.needLoad(value[0])) {
+        //需要加载的属性
+        values[key] = value.map(function (item) {
+          if (dataMap.hasEntity(item)) {
+            return dataMap.getEntity(item);
+          }
+          return item;
+        });
+      } else if (dataMap.isEntity(value[0])) {
+        //子表属性
+        for (var _iterator5 = _createForOfIteratorHelperLoose(value), _step5; !(_step5 = _iterator5()).done;) {
+          var valueElement = _step5.value;
+          assembleObject(valueElement, dataMap, {
+            maxDepth: maxDepth,
+            depth: depth + 1
+          });
+        }
+      }
+    } else if (typeof value == "object") {
+      if (dataMap.needLoad(value)) {
+        if (dataMap.hasEntity(value)) {
+          values[key] = dataMap.getEntity(value);
+        }
+      }
+    }
+  }
+}
+function handleEntityLabel(data) {
+  var _data$form;
+  var labelField = data === null || data === void 0 ? void 0 : (_data$form = data.form) === null || _data$form === void 0 ? void 0 : _data$form.labelField;
+  if (labelField) {
+    data.label = dataToLabel(safeGet(data, labelField));
+  }
+}

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

@@ -0,0 +1,12 @@
+import { IBaseEntity } from "../rest-api";
+export declare class FormApiEntityMap {
+    dataMap: Map<string, IBaseEntity>;
+    hasEntity(entity: IBaseEntity): boolean;
+    getEntity(entity: IBaseEntity): IBaseEntity;
+    addEntity(entity: IBaseEntity): void;
+    addEntities(entities: IBaseEntity[]): void;
+    isEntity(value: any): boolean;
+    needLoad(entity: IBaseEntity): boolean;
+    destroy(): void;
+    private createEntityKey;
+}

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

@@ -0,0 +1,50 @@
+export var FormApiEntityMap = /*#__PURE__*/function () {
+  function FormApiEntityMap() {
+    this.dataMap = new Map();
+  }
+  var _proto = FormApiEntityMap.prototype;
+  _proto.hasEntity = function hasEntity(entity) {
+    var key = this.createEntityKey(entity);
+    return this.dataMap.has(key);
+  };
+  _proto.getEntity = function getEntity(entity) {
+    var key = this.createEntityKey(entity);
+    return this.dataMap.get(key);
+  };
+  _proto.addEntity = function addEntity(entity) {
+    var key = this.createEntityKey(entity);
+    this.dataMap.set(key, entity);
+  };
+  _proto.addEntities = function addEntities(entities) {
+    var _this = this;
+    entities === null || entities === void 0 ? void 0 : entities.forEach(function (item) {
+      return _this.addEntity(item);
+    });
+  };
+  _proto.isEntity = function isEntity(value) {
+    if (value == null) {
+      return false;
+    } else if (Array.isArray(value)) {
+      return false;
+    } else if (typeof value == "object") {
+      var _value$form;
+      return !!value.id && !!((_value$form = value.form) !== null && _value$form !== void 0 && _value$form.id);
+    }
+    return false;
+  };
+  _proto.needLoad = function needLoad(entity) {
+    return this.isEntity(entity) && entity._load == false;
+  };
+  _proto.destroy = function destroy() {
+    this.dataMap.clear();
+  };
+  _proto.createEntityKey = function createEntityKey(entity) {
+    var _entity$form, _entity$form2;
+    var key = (_entity$form = entity.form) === null || _entity$form === void 0 ? void 0 : _entity$form.id;
+    if ((_entity$form2 = entity.form) !== null && _entity$form2 !== void 0 && _entity$form2.fieldId) {
+      key += "." + entity.form.fieldId;
+    }
+    return key + "." + entity.id;
+  };
+  return FormApiEntityMap;
+}();

package/es/utils/api/{form-api.utils.d.ts → form-api/form-api.utils.d.ts}

@@ -1,4 +1,4 @@
-import { FilterRule, IBaseEntity, Refs } from "./rest-api";
+import { FilterRule, IBaseEntity, Refs } from "../rest-api";
 export declare function convertSaveData(data: any): any;
 export declare function dataToLabel(value: any): any;
 export declare function assembleAssociationFieldV2(data: IBaseEntity | IBaseEntity[], refs?: Refs): void;
@@ -9,7 +9,8 @@ export declare function assembleAssociationFieldV2(data: IBaseEntity | IBaseEnti
  */
 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 assembleAssociationField(data: IBaseEntity | IBaseEntity[], refs?: Refs): number;
 export declare function handleFilterRules(filters: FilterRule[], options: {
     filterNullValue: boolean;
 }): FilterRule[];
+export declare function safeGet(value: any, key: string | null): any;

package/es/utils/api/{form-api.utils.js → form-api/form-api.utils.js}

@@ -2,16 +2,37 @@ import _extends from "@babel/runtime/helpers/extends";
 function _createForOfIteratorHelperLoose(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (t) return (t = t.call(r)).next.bind(t); if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var o = 0; return function () { return o >= r.length ? { done: !0 } : { done: !1, value: r[o++] }; }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-import { transformerId } from "../data";
+import { transformerId } from "../../data";
+import { isLocalhost } from "../../common";
+import { formApiAssembleEntity } from "./form-api.assemble-entity";
+import { isTemplateHost } from "../../util.common";
 var SimpleSerialFieldNames = ["parent", "instance"];
 export function convertSaveData(data) {
   if (!data) return data;
+  var seen = new WeakSet(); // WeakSet 只存储对象，非常适合检测引用
   return JSON.parse(JSON.stringify(data, function (key, value) {
-    if (SimpleSerialFieldNames.includes(key)) {
-      var id = value === null || value === void 0 ? void 0 : value.id;
-      return id ? {
-        id: id
-      } : undefined;
+    if (value == null) {
+      return null;
+    } else if (Array.isArray(value)) {
+      return value;
+    } else if (typeof value == "object") {
+      if (SimpleSerialFieldNames.includes(key)) {
+        var id = value === null || value === void 0 ? void 0 : value.id;
+        return id ? {
+          id: id
+        } : undefined;
+      } else if (seen.has(value)) {
+        if (value.id) {
+          return {
+            id: value.id
+          };
+        } else {
+          return value;
+        }
+      } else {
+        seen.add(value);
+      }
+      return value;
     }
     return value;
   }));
@@ -150,7 +171,13 @@ function valueToFormDataArray(value) {
   }
 }
 export function assembleAssociationField(data, refs) {
+  var start = Date.now();
+  if (isLocalhost() || isTemplateHost()) {
+    formApiAssembleEntity(data, refs);
+    return Date.now() - start;
+  }
   assembleAssociationFieldV2(data, refs);
+  return Date.now() - start;
 }
 export function handleFilterRules(filters, options) {
   var filterNullValue = options.filterNullValue;
@@ -159,13 +186,19 @@ export function handleFilterRules(filters, options) {
       return !!rule;
     }).map(function (rule) {
       return _extends({}, rule, {
-        value: transformerId(rule.value),
+        value: transformerId(rule.value, {
+          includeNull: true
+        }),
         rules: handleFilterRules(rule.rules || [], options)
       });
     });
     if (filterNullValue) {
       cloneRules = cloneRules.filter(function (rule) {
         if (rule.value == null) {
+          var _rule$rules;
+          if ((_rule$rules = rule.rules) !== null && _rule$rules !== void 0 && _rule$rules.length) {
+            return true;
+          }
           if (rule.operator != "isNull" && rule.operator != "isNotNull") {
             return false;
           }
@@ -181,7 +214,7 @@ export function handleFilterRules(filters, options) {
     return undefined;
   }
 }
-function safeGet(value, key) {
+export function safeGet(value, key) {
   if (typeof value !== "object") {
     return null;
   }

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

@@ -16,5 +16,6 @@ export declare class RestFormApi<DataType> extends RestApi<DataType> {
     save(data: DataType, options?: BaseRequestOptions<DataType>): Promise<OneResult<DataType>>;
     create(data: DataType, options?: BaseRequestOptions<DataType>): Promise<OneResult<DataType>>;
     update(id: string, data: DataType, options?: BaseRequestOptions<DataType>): Promise<OneResult<DataType>>;
+    fieldFilters(searchParams?: RestSearchParams): Promise<ManyResult<DataType>>;
     serviceUpdate(data: DataType, options?: BaseRequestOptions<DataType>): Promise<import("axios").AxiosResponse<any, any, {}>>;
 }