@zhubangyun/lowcode-core 6.2.30 → 6.3.25

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

@@ -1,6 +1,6 @@
 export declare abstract class SingletonInstanceMap<Value, Options> {
-    private readonly valueMap;
-    private readonly lockMap;
+    protected readonly valueMap: Map<string, Value>;
+    protected readonly lockMap: Map<string, boolean>;
     getInstance(key: string, options: Options): Promise<Value>;
     get(key: string): Value;
     clear(): void;

package/es/utils/data/index.d.ts

@@ -1 +1,3 @@
-export declare function transformerId(value: any): any;
+export declare function transformerId(value: any, options?: {
+    includeNull?: boolean;
+}): any;

package/es/utils/data/index.js

@@ -1,11 +1,18 @@
-export function transformerId(value) {
+export function transformerId(value, options) {
   if (value == null) {
     return null;
   }
   if (Array.isArray(value)) {
-    return value.map(transformerId).filter(function (value) {
-      return !!value;
+    var values = value.map(function (item) {
+      return transformerId(item, options);
     });
+    if (options !== null && options !== void 0 && options.includeNull) {
+      return values;
+    } else {
+      return values.filter(function (v) {
+        return !!v;
+      });
+    }
   }
   if (typeof value == "object") {
     return (value === null || value === void 0 ? void 0 : value.id) || (value === null || value === void 0 ? void 0 : value.value) || value;

package/es/utils/page/index.d.ts

@@ -1,3 +1,4 @@
+export { createForm, getSchema } from "./page-create-element";
 export { print, getFormPrintTemplates } from "./print-form";
 export { showForm } from "./page-form";
 export { showFormGroup } from "./page-form-group";

package/es/utils/page/index.js

@@ -1,6 +1,7 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { uniBridge } from "../uni-bridge";
+export { createForm, getSchema } from "./page-create-element";
 export { print, getFormPrintTemplates } from "./print-form";
 export { showForm } from "./page-form";
 export { showFormGroup } from "./page-form-group";
@@ -55,7 +56,6 @@ function _hideLoading() {
     return _regeneratorRuntime.wrap(function (_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          console.log("page.hide.loading");
           loading = document.getElementById("fullscreen-loading");
           if (loading) {
             loading.style.display = "none";

package/es/utils/page/page-create-element.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="react" />
+export interface PageCreateOptions {
+    formId: string;
+}
+export declare function getSchema(pageId: string): import("../api/schema.util").Schema & import("../api/rest-api").IBaseEntity;
+export declare function createForm(options: PageCreateOptions): JSX.Element;

package/es/utils/page/page-create-element.js

@@ -0,0 +1,23 @@
+import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
+var _excluded = ["formId"];
+import { getSchemaFromCache } from "../api/schema-api";
+import React from "react";
+import { ReactRender } from "../../components/react-render";
+export function getSchema(pageId) {
+  var _getSchemaFromCache;
+  return (_getSchemaFromCache = getSchemaFromCache(pageId)) === null || _getSchemaFromCache === void 0 ? void 0 : _getSchemaFromCache.data;
+}
+export function createForm(options) {
+  var formId = options.formId,
+    restProps = _objectWithoutPropertiesLoose(options, _excluded);
+  var schemaRes = getSchemaFromCache(formId, window.__mock);
+  if (schemaRes !== null && schemaRes !== void 0 && schemaRes.success) {
+    var schema = schemaRes.data;
+    return /*#__PURE__*/React.createElement(ReactRender, _extends({
+      schema: schema,
+      components: window._components || window.components || window.__components
+    }, restProps));
+  }
+  return null;
+}

package/es/utils/page/page-form-group.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-var _excluded = ["layout", "form", "items", "onClose"],
+var _excluded = ["layout", "form", "onClose", "onSubmitOk"],
   _excluded2 = ["container", "onClose"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { PageLayout } from "./page-layout";
@@ -55,8 +55,8 @@ var FormGroupRender = /*#__PURE__*/function (_Component) {
     var _this$props = this.props,
       layout = _this$props.layout,
       form = _this$props.form,
-      items = _this$props.items,
       onClose = _this$props.onClose,
+      onSubmitOk = _this$props.onSubmitOk,
       restProps = _objectWithoutPropertiesLoose(_this$props, _excluded);
     // @ts-ignore
     restProps.layout = layout || "modal";
@@ -66,6 +66,12 @@ var FormGroupRender = /*#__PURE__*/function (_Component) {
       (_self$layoutRef = self.layoutRef) === null || _self$layoutRef === void 0 ? void 0 : _self$layoutRef.close();
       onClose === null || onClose === void 0 ? void 0 : onClose();
     };
+    // @ts-ignore
+    restProps.onSubmitOk = function (data) {
+      var _self$layoutRef2;
+      onSubmitOk === null || onSubmitOk === void 0 ? void 0 : onSubmitOk(data);
+      (_self$layoutRef2 = self.layoutRef) === null || _self$layoutRef2 === void 0 ? void 0 : _self$layoutRef2.close();
+    };
     return /*#__PURE__*/React.createElement(PageLayout, {
       ref: function ref(layout) {
         return _this2.layoutRef = layout;
@@ -85,9 +91,9 @@ var FormGroupRender = /*#__PURE__*/function (_Component) {
           children: [{
             componentName: "PageFormGroup",
             props: {
+              mode: "show",
               title: schema.label,
-              form: form,
-              items: items
+              form: form
             }
           }]
         }

package/es/utils/page/page-render.js

@@ -23,7 +23,7 @@ export function renderElement(options) {
                 resolve(data || null);
               },
               onClose: function onClose() {
-                resolve(false);
+                resolve(null);
                 //等待动画结束
                 setTimeout(function () {
                   root.unmount();

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

@@ -1,4 +1,18 @@
 import _extends from "@babel/runtime/helpers/extends";
+function replacer(key, value) {
+  if (value == null) {
+    return null;
+  } else if (Array.isArray(value)) {
+    return value;
+  } else if (value !== null && value !== void 0 && value.id) {
+    return {
+      id: value.id,
+      label: value.label,
+      form: value.form
+    };
+  }
+  return value;
+}
 export function cloneDataView(dataView, extraProps) {
   if (!dataView) {
     return {};
@@ -60,10 +74,13 @@ function compileFilterRules(rules) {
         if (value === "") {
           value = "undefined";
         }
-      } else if (rule.valueType == "value" || !rule.valueType || typeof value === "object") {
-        value = JSON.stringify(value);
+      } else if (rule.valueType == "value" || rule.valueType == "column" || !rule.valueType || typeof value === "object") {
+        value = JSON.stringify(value, replacer);
       }
       scripts.push("\"key\":\"" + rule.key + "\",");
+      if (rule.valueType) {
+        scripts.push("\"valueType\":\"" + rule.valueType + "\",");
+      }
       scripts.push("\"operator\":\"" + rule.operator + "\",");
       scripts.push("\"value\":" + value + ",");
     }

package/es/utils/page/print-form.d.ts

@@ -4,6 +4,6 @@ interface PrintOptions {
     mode?: "print" | "export" | "cloud_print";
     data: any;
 }
-export declare function getFormPrintTemplates(formId: string): Promise<any>;
+export declare function getFormPrintTemplates(formId: string, disableCache?: boolean): Promise<any>;
 export declare function print(options: PrintOptions): Promise<void>;
 export {};

package/es/utils/page/print-form.js

@@ -5,15 +5,19 @@ import { apiRequest } from "../api";
 import { FormIds } from "../formIds";
 import { hideLoading, showLoading } from "./index";
 var cache = new Map();
-export function getFormPrintTemplates(_x) {
+export function getFormPrintTemplates(_x, _x2) {
   return _getFormPrintTemplates.apply(this, arguments);
 }
 function _getFormPrintTemplates() {
-  _getFormPrintTemplates = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(formId) {
+  _getFormPrintTemplates = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(formId, disableCache) {
     var res;
     return _regeneratorRuntime.wrap(function (_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
+          if (disableCache) {
+            _context2.next = 1;
+            break;
+          }
           if (!cache.has(formId)) {
             _context2.next = 1;
             break;
@@ -50,7 +54,7 @@ function _getFormPrintTemplates() {
   }));
   return _getFormPrintTemplates.apply(this, arguments);
 }
-export function print(_x2) {
+export function print(_x3) {
   return _print.apply(this, arguments);
 }
 function _print() {
@@ -103,7 +107,7 @@ function _print() {
   }));
   return _print.apply(this, arguments);
 }
-function openPrint(_x3, _x4) {
+function openPrint(_x4, _x5) {
   return _openPrint.apply(this, arguments);
 }
 function _openPrint() {
@@ -198,7 +202,7 @@ function _openPrint() {
                 }
               }, _callee5);
             }));
-            return function (_x6, _x7) {
+            return function (_x7, _x8) {
               return _ref.apply(this, arguments);
             };
           }()));
@@ -268,7 +272,9 @@ var CloudPrinter = /*#__PURE__*/function () {
             });
           case 3:
             res = _context.sent;
-            if (!res.success) {
+            if (res.success) {
+              _message.success(res.message);
+            } else {
               _message.error(res.message);
             }
           case 4:
@@ -277,7 +283,7 @@ var CloudPrinter = /*#__PURE__*/function () {
         }
       }, _callee, this);
     }));
-    function post(_x5) {
+    function post(_x6) {
       return _post.apply(this, arguments);
     }
     return post;

package/es/utils/uni-bridge.js

@@ -124,13 +124,11 @@ var UniBridge = /*#__PURE__*/function () {
           case 1:
             messageId = v7();
             return _context5.abrupt("return", new Promise(function (resolve, reject) {
-              console.log("UniBridge.doAction", messageId, action, options);
               _this.callbacks[messageId] = {
                 resolve: resolve,
                 reject: reject
               };
               try {
-                console.log("postMessage", messageId, action, options);
                 uni.postMessage({
                   data: {
                     action: action,
@@ -157,7 +155,7 @@ var UniBridge = /*#__PURE__*/function () {
   _proto.receiveMessage = function receiveMessage(message) {
     var callback = this.callbacks[message.messageId];
     console.log('客户端收到 UniApp 消息:', JSON.stringify(message));
-    console.log('客户端收到 UniApp 消息:callbacks', this.callbacks);
+    console.log('客户端收到 UniApp 消息:callbacks', JSON.stringify(Object.keys(this.callbacks)), callback);
     if (callback) {
       if (message.success) {
         callback.resolve(message.data);

package/es/utils/util.common.d.ts

@@ -1 +1 @@
-export declare function isTemplate(): boolean;
+export declare function isTemplateHost(): boolean;

package/es/utils/util.common.js

@@ -1,4 +1,3 @@
-export function isTemplate() {
-  return false;
+export function isTemplateHost() {
   return location.host == "templates.zhiyunhe.com";
 }

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

@@ -24,6 +24,10 @@ var ReactRender = exports.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["default"], (0, _extends2["default"])({
       key: this.key
     }, this.props, {
@@ -41,4 +45,10 @@ var ReactRender = exports.ReactRender = /*#__PURE__*/function (_PureComponent) {
     }));
   };
   return ReactRender;
-}(_react.PureComponent);
+}(_react.PureComponent);
+function Page(props) {
+  return /*#__PURE__*/React.createElement("div", {
+    className: "lce-page",
+    style: props.style
+  }, props.children);
+}

package/lib/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/lib/utils/api/form-api/form-api.assemble-entity.js

@@ -0,0 +1,105 @@
+"use strict";
+
+exports.__esModule = true;
+exports.formApiAssembleEntity = formApiAssembleEntity;
+var _formApi = require("./form-api.entity-map");
+var _formApi2 = require("./form-api.utils");
+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; }
+function formApiAssembleEntity(data, refs) {
+  if (!data || !refs) return;
+  var dataMap = new _formApi.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: 3,
+      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: 3,
+        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
+          });
+        }
+      }
+    } else if (typeof value == "object") {
+      if (dataMap.needLoad(value)) {
+        if (dataMap.hasEntity(value)) {
+          values[key] = dataMap.getEntity(value);
+        }
+      } else if (key == "parent") {
+        //values.parent = dataMap.getEntity(value);
+        Object.defineProperty(values, "parent", {
+          value: dataMap.getEntity(value),
+          writable: true
+        });
+      }
+    }
+  }
+}
+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 = (0, _formApi2.dataToLabel)((0, _formApi2.safeGet)(data, labelField));
+  }
+}

package/lib/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/lib/utils/api/form-api/form-api.entity-map.js

@@ -0,0 +1,54 @@
+"use strict";
+
+exports.__esModule = true;
+exports.FormApiEntityMap = void 0;
+var FormApiEntityMap = exports.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/lib/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/lib/utils/api/{form-api.utils.js → form-api/form-api.utils.js}

@@ -9,20 +9,47 @@ exports.convertSaveData = convertSaveData;
 exports.dataToLabel = dataToLabel;
 exports.handleEntityLabel = handleEntityLabel;
 exports.handleFilterRules = handleFilterRules;
+exports.safeGet = safeGet;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _data = require("../data");
+var _data = require("../../data");
+var _common = require("../../common");
+var _formApi = require("./form-api.assemble-entity");
+var _util = require("../../util.common");
 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; }
 var SimpleSerialFieldNames = ["parent", "instance"];
 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 (key == "form") {
+        return value;
+      }
+      if (SimpleSerialFieldNames.includes(key)) {
+        var id = value === null || value === void 0 ? void 0 : value.id;
+        return id ? {
+          id: id,
+          form: value === null || value === void 0 ? void 0 : value.form
+        } : undefined;
+      } else if (seen.has(value)) {
+        if (value.id && value.form) {
+          return {
+            id: value.id,
+            form: value.form
+          };
+        } else {
+          return value;
+        }
+      } else {
+        seen.add(value);
+      }
+      return value;
     }
     return value;
   }));
@@ -145,23 +172,14 @@ function handleEntityLabel(data) {
     }
   }
 }
-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) {
+  var start = Date.now();
+  if ((0, _common.isLocalhost)() || (0, _util.isTemplateHost)() || window.__mock) {
+    (0, _formApi.formApiAssembleEntity)(data, refs);
+    return Date.now() - start;
+  }
   assembleAssociationFieldV2(data, refs);
+  return Date.now() - start;
 }
 function handleFilterRules(filters, options) {
   var filterNullValue = options.filterNullValue;
@@ -170,13 +188,19 @@ function handleFilterRules(filters, options) {
       return !!rule;
     }).map(function (rule) {
       return (0, _extends2["default"])({}, rule, {
-        value: (0, _data.transformerId)(rule.value),
+        value: (0, _data.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;
           }