@zhubangyun/lowcode-core 6.2.30 → 6.3.25

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

@@ -5,11 +5,10 @@ exports.__esModule = true;
 exports.RestFormApi = void 0;
 exports.getFormApi = getFormApi;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _restApi = require("./rest-api");
-var _formApi = require("./form-api.utils");
+var _formApi = require("./form-api/form-api.utils");
 var _cache = require("../cache");
 var _schemaApi = require("./schema-api");
 var _common = require("../common");
@@ -143,7 +142,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
   _proto.search = /*#__PURE__*/function () {
     var _search = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(searchParams) {
       var _searchParams, _searchParams2;
-      var params, config, res, start;
+      var params, config, res;
       return _regenerator["default"].wrap(function (_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -167,14 +166,11 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
             searchParams.searchFields = (0, _formApi.handleFilterRules)(((_searchParams2 = searchParams) === null || _searchParams2 === void 0 ? void 0 : _searchParams2.searchFields) || [], {
               filterNullValue: true
             });
-            config.params = (0, _extends2["default"])({}, params, searchParams);
             _context3.next = 2;
-            return this.request.get("search", config);
+            return this.request.post("search", searchParams, config);
           case 2:
             res = _context3.sent;
-            //const res = await this.request.post<any, ManyResult<DataType>>("search", searchParams, config);
-            start = Date.now();
-            (0, _formApi.assembleAssociationField)(res.data, res.refs);
+            res.assembleTime = (0, _formApi.assembleAssociationField)(res.data, res.refs);
             console.debug("form.search:", res);
             return _context3.abrupt("return", res);
           case 3:
@@ -235,8 +231,8 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
             return _RestApi.prototype.getById.call(this, searchId, options);
           case 5:
             res = _context4.sent;
-            (0, _formApi.assembleAssociationField)(res.data, res.refs);
-            console.debug("formApi.getById", res);
+            res.assembleTime = (0, _formApi.assembleAssociationField)(res.data, res.refs);
+            console.debug("form.getById:", res);
             return _context4.abrupt("return", res);
           case 6:
           case "end":
@@ -273,7 +269,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
                 };
               });
             }
-            (0, _formApi.assembleAssociationField)(res.data, res.refs);
+            res.assembleTime = (0, _formApi.assembleAssociationField)(res.data, res.refs);
             console.debug("formApi.labelToValue", res);
             return _context5.abrupt("return", res);
           case 3:
@@ -341,7 +337,7 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
   _proto.fieldFilters = /*#__PURE__*/function () {
     var _fieldFilters = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee9(searchParams) {
       var _searchParams3, _searchParams4;
-      var params, config, res;
+      var params, config;
       return _regenerator["default"].wrap(function (_context9) {
         while (1) switch (_context9.prev = _context9.next) {
           case 0:
@@ -365,13 +361,10 @@ var RestFormApi = exports.RestFormApi = /*#__PURE__*/function (_RestApi) {
             searchParams.searchFields = (0, _formApi.handleFilterRules)(((_searchParams4 = searchParams) === null || _searchParams4 === void 0 ? void 0 : _searchParams4.searchFields) || [], {
               filterNullValue: true
             });
-            config.params = (0, _extends2["default"])({}, params, searchParams);
             _context9.next = 2;
-            return this.request.get("fieldFilters", config);
+            return this.request.post("fieldFilters", searchParams, config);
           case 2:
-            res = _context9.sent;
-            console.debug("form.fieldFilters:", res);
-            return _context9.abrupt("return", res);
+            return _context9.abrupt("return", _context9.sent);
           case 3:
           case "end":
             return _context9.stop();

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

@@ -6,6 +6,11 @@ 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 = AxiosResponse<T, any, {}>, D = any>(config: import("axios").AxiosRequestConfig<D>) => Promise<R>;
+interface RequestResult {
+    success: boolean;
+    message?: string;
+    data: any;
+}
+export declare const request: (config: import("axios").AxiosRequestConfig<any>) => Promise<RequestResult>;
 export declare function onFulfilled(res: AxiosResponse): any;
 export declare function onRejected(error: any): any;

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

@@ -1,5 +1,5 @@
 import { AxiosInstance, AxiosRequestConfig } from "axios";
-export type ValueType = "value" | "field" | "express";
+export type ValueType = "value" | "field" | "express" | "column";
 export interface RestApiOptions {
     /**
      * 超时时间
@@ -98,6 +98,7 @@ export interface IBaseEntity {
         labelField: string;
     };
     _load?: boolean;
+    _process?: boolean;
 }
 /**
  * 基础返回结果
@@ -106,6 +107,7 @@ export interface BaseResult<DataType> {
     success: boolean;
     message?: string;
     requestId: string;
+    assembleTime: number;
     refs?: Refs;
 }
 export interface Ref {

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

@@ -1,3 +1,4 @@
 import { OneResult } from "./rest-api";
+import { Schema } from "./schema.util";
 export declare function getSchema(pageId: string, mock?: boolean): Promise<OneResult<any>>;
-export declare function getSchemaFromCache(pageId?: string, mock?: boolean): any;
+export declare function getSchemaFromCache(pageId?: string, mock?: boolean): OneResult<Schema>;

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

@@ -17,7 +17,7 @@ function _getSchema() {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           mock = getMock(mock);
-          key = mock ? pageId + ":mock" : pageId;
+          key = mock ? pageId + "_mock" : pageId;
           _context.next = 1;
           return _cache.schema.getInstance(key, {
             mock: mock,

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

@@ -5,6 +5,7 @@
  */
 export declare function forEachSchema(schema: Schema, callback: (child: Schema, index: number, children: any[]) => boolean): void;
 export declare function findFormSchemas(schema: Schema): Schema[];
+export declare function findLoadRefSchemas(schema: Schema): Schema[];
 export declare function findFdmSchemas(schema?: Schema): Schema[];
 export interface Schema {
     componentName: string;

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

@@ -3,6 +3,7 @@
 exports.__esModule = true;
 exports.findFdmSchemas = findFdmSchemas;
 exports.findFormSchemas = findFormSchemas;
+exports.findLoadRefSchemas = findLoadRefSchemas;
 exports.forEachSchema = forEachSchema;
 /**
  * 遍历schema
@@ -28,6 +29,16 @@ function findFormSchemas(schema) {
   });
   return schemas;
 }
+function findLoadRefSchemas(schema) {
+  var schemas = [];
+  forEachSchema(schema, function (child) {
+    if (["ProcessGroupField"].includes(child.componentName)) {
+      schemas.push(child);
+    }
+    return true;
+  });
+  return schemas;
+}
 function findFdmSchemas(schema) {
   var schemas = [];
   if (!schema) {

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

@@ -12,7 +12,6 @@ export declare class FormApiCache extends SingletonInstanceMap<RestFormApi<any>,
     fieldId?: string;
     mock?: boolean;
 }> {
-    apiMap: Map<string, RestFormApi<any>>;
     createInstance(key: string, options?: any): Promise<RestFormApi<any>>;
 }
 export declare const formApi: FormApiCache;

package/lib/utils/cache/index.js

@@ -9,6 +9,9 @@ var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inh
 var _SingletonInstanceMap3 = require("../common/SingletonInstanceMap");
 var _api = require("../api");
 var _schema = require("../api/schema.util");
+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 SchemaCache = exports.SchemaCache = /*#__PURE__*/function (_SingletonInstanceMap) {
   function SchemaCache() {
     return _SingletonInstanceMap.apply(this, arguments) || this;
@@ -17,28 +20,24 @@ 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, schemaRes, schema, handleCommonSchema, permission, printTemplates, workflow, cloneSchema, _t;
+      var mock, pageId, params, schemaRes, schema, handleCommonSchema, permission, printTemplates, workflow, cloneSchema, refs, _iterator, _step, _ref$props, _ref$props$fieldProps, _ref$props$fieldProps2, ref, refPageId, _key, _t;
       return _regenerator["default"].wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             mock = options.mock, pageId = options.pageId;
+            params = {};
+            if (mock) {
+              params.mock = mock;
+            }
             _context.next = 1;
             return _api.apiRequest.get("pages/" + pageId + "/schema", {
-              params: {
-                mock: mock
-              }
+              params: params
             });
           case 1:
             schemaRes = _context.sent;
-            if (schemaRes.succss) {
-              _context.next = 2;
-              break;
-            }
-            return _context.abrupt("return", schemaRes);
-          case 2:
-            schema = schemaRes.data;
-            if (!(schema != null && typeof schema == "object")) {
-              _context.next = 8;
+            schema = schemaRes === null || schemaRes === void 0 ? void 0 : schemaRes.data;
+            if (!schema) {
+              _context.next = 9;
               break;
             }
             handleCommonSchema = function handleCommonSchema(schema) {
@@ -51,29 +50,29 @@ var SchemaCache = exports.SchemaCache = /*#__PURE__*/function (_SingletonInstanc
             permission = null; //处理打印
             workflow = null;
             if (location.pathname.startsWith("/print")) {
-              _context.next = 7;
+              _context.next = 6;
               break;
             }
-            _context.next = 3;
+            _context.next = 2;
             return _api.apiRequest.get("pages/" + pageId + "/permission");
-          case 3:
+          case 2:
             permission = _context.sent.data;
             if (!((schema === null || schema === void 0 ? void 0 : schema.type) == "form")) {
-              _context.next = 7;
+              _context.next = 6;
               break;
             }
-            _context.prev = 4;
-            _context.next = 5;
+            _context.prev = 3;
+            _context.next = 4;
             return _api.apiRequest.get("pages/" + pageId + "/printTemplates");
-          case 5:
+          case 4:
             printTemplates = _context.sent.data;
-            _context.next = 7;
+            _context.next = 6;
             break;
-          case 6:
-            _context.prev = 6;
-            _t = _context["catch"](4);
+          case 5:
+            _context.prev = 5;
+            _t = _context["catch"](3);
             console.log(_t);
-          case 7:
+          case 6:
             (0, _schema.findFormSchemas)(schema).forEach(function (formSchema) {
               handleCommonSchema(formSchema);
               (0, _schema.findFdmSchemas)(formSchema.fdmSchema).forEach(function (fdmSchema) {
@@ -87,13 +86,43 @@ var SchemaCache = exports.SchemaCache = /*#__PURE__*/function (_SingletonInstanc
                 fdmSchema.props.formElement = cloneSchema;
               });
             });
+            refs = (0, _schema.findLoadRefSchemas)(schema);
+            if (!refs.length) {
+              _context.next = 9;
+              break;
+            }
+            _iterator = _createForOfIteratorHelperLoose(refs);
+          case 7:
+            if ((_step = _iterator()).done) {
+              _context.next = 9;
+              break;
+            }
+            ref = _step.value;
+            refPageId = (_ref$props = ref.props) === null || _ref$props === void 0 ? void 0 : (_ref$props$fieldProps = _ref$props.fieldProps) === null || _ref$props$fieldProps === void 0 ? void 0 : (_ref$props$fieldProps2 = _ref$props$fieldProps.associationForm) === null || _ref$props$fieldProps2 === void 0 ? void 0 : _ref$props$fieldProps2.id;
+            if (!(typeof refPageId == "string" && refPageId !== pageId)) {
+              _context.next = 8;
+              break;
+            }
+            if (this.valueMap.has(refPageId)) {
+              _context.next = 8;
+              break;
+            }
+            _key = mock ? refPageId + "_mock" : refPageId;
+            _context.next = 8;
+            return this.getInstance(_key, {
+              mock: mock,
+              pageId: refPageId
+            });
           case 8:
-            return _context.abrupt("return", schemaRes);
+            _context.next = 7;
+            break;
           case 9:
+            return _context.abrupt("return", schemaRes);
+          case 10:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[4, 6]]);
+      }, _callee, this, [[3, 5]]);
     }));
     function createInstance(_x, _x2) {
       return _createInstance.apply(this, arguments);
@@ -105,13 +134,7 @@ var SchemaCache = exports.SchemaCache = /*#__PURE__*/function (_SingletonInstanc
 var schema = exports.schema = new SchemaCache();
 var FormApiCache = exports.FormApiCache = /*#__PURE__*/function (_SingletonInstanceMap2) {
   function FormApiCache() {
-    var _this;
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    _this = _SingletonInstanceMap2.call.apply(_SingletonInstanceMap2, [this].concat(args)) || this;
-    _this.apiMap = new Map();
-    return _this;
+    return _SingletonInstanceMap2.apply(this, arguments) || this;
   }
   (0, _inheritsLoose2["default"])(FormApiCache, _SingletonInstanceMap2);
   var _proto2 = FormApiCache.prototype;

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

@@ -0,0 +1,9 @@
+import { Dexie, type EntityTable } from "dexie";
+export interface Friend {
+    page_id: string;
+    schema: any;
+}
+declare const db_cache: Dexie & {
+    page_schemas: EntityTable<Friend, 'page_id'>;
+};
+export default db_cache;

package/lib/utils/cache/index_db_cache.js

@@ -0,0 +1,11 @@
+"use strict";
+
+exports.__esModule = true;
+exports["default"] = void 0;
+var _dexie = require("dexie");
+var db_cache = new _dexie.Dexie('cache');
+db_cache.version(1).stores({
+  page_schemas: 'page_id,schema'
+});
+var page_schemas = db_cache.page_schemas;
+var _default = exports["default"] = db_cache;

package/lib/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/lib/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/lib/utils/data/index.js

@@ -2,14 +2,21 @@
 
 exports.__esModule = true;
 exports.transformerId = transformerId;
-function transformerId(value) {
+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/lib/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/lib/utils/page/index.js

@@ -3,7 +3,7 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
 exports.closePage = closePage;
-exports.getFormPrintTemplates = void 0;
+exports.getSchema = exports.getFormPrintTemplates = exports.createForm = void 0;
 exports.hideLoading = hideLoading;
 exports.openPage = openPage;
 exports.showFormGroup = exports.showFormDataManagerGroup = exports.showFormDataManager = exports.showForm = exports.show = exports.print = void 0;
@@ -11,6 +11,9 @@ exports.showLoading = showLoading;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _uniBridge = require("../uni-bridge");
+var _pageCreateElement = require("./page-create-element");
+exports.createForm = _pageCreateElement.createForm;
+exports.getSchema = _pageCreateElement.getSchema;
 var _printForm = require("./print-form");
 exports.print = _printForm.print;
 exports.getFormPrintTemplates = _printForm.getFormPrintTemplates;
@@ -72,7 +75,6 @@ function _hideLoading() {
     return _regenerator["default"].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/lib/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/lib/utils/page/page-create-element.js

@@ -0,0 +1,29 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+exports.__esModule = true;
+exports.createForm = createForm;
+exports.getSchema = getSchema;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
+var _schemaApi = require("../api/schema-api");
+var _react = _interopRequireDefault(require("react"));
+var _reactRender = require("../../components/react-render");
+var _excluded = ["formId"];
+function getSchema(pageId) {
+  var _getSchemaFromCache;
+  return (_getSchemaFromCache = (0, _schemaApi.getSchemaFromCache)(pageId)) === null || _getSchemaFromCache === void 0 ? void 0 : _getSchemaFromCache.data;
+}
+function createForm(options) {
+  var formId = options.formId,
+    restProps = (0, _objectWithoutPropertiesLoose2["default"])(options, _excluded);
+  var schemaRes = (0, _schemaApi.getSchemaFromCache)(formId, window.__mock);
+  if (schemaRes !== null && schemaRes !== void 0 && schemaRes.success) {
+    var schema = schemaRes.data;
+    return /*#__PURE__*/_react["default"].createElement(_reactRender.ReactRender, (0, _extends2["default"])({
+      schema: schema,
+      components: window._components || window.components || window.__components
+    }, restProps));
+  }
+  return null;
+}

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

@@ -14,7 +14,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _reactRender = require("../../components/react-render");
 var _pageLoadSchema = require("./page-load-schema");
 var _common = require("../common");
-var _excluded = ["layout", "form", "items", "onClose"],
+var _excluded = ["layout", "form", "onClose", "onSubmitOk"],
   _excluded2 = ["container", "onClose"];
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function showFormGroup(_x) {
@@ -61,8 +61,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 = (0, _objectWithoutPropertiesLoose2["default"])(_this$props, _excluded);
     // @ts-ignore
     restProps.layout = layout || "modal";
@@ -72,6 +72,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["default"].createElement(_pageLayout.PageLayout, {
       ref: function ref(layout) {
         return _this2.layoutRef = layout;
@@ -91,9 +97,9 @@ var FormGroupRender = /*#__PURE__*/function (_Component) {
           children: [{
             componentName: "PageFormGroup",
             props: {
+              mode: "show",
               title: schema.label,
-              form: form,
-              items: items
+              form: form
             }
           }]
         }

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

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

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

@@ -4,6 +4,20 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.cloneDataView = cloneDataView;
 var _extends2 = _interopRequireDefault(require("@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;
+}
 function cloneDataView(dataView, extraProps) {
   if (!dataView) {
     return {};
@@ -65,10 +79,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/lib/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/lib/utils/page/print-form.js

@@ -11,15 +11,19 @@ var _api = require("../api");
 var _formIds = require("../formIds");
 var _index = require("./index");
 var cache = new Map();
-function getFormPrintTemplates(_x) {
+function getFormPrintTemplates(_x, _x2) {
   return _getFormPrintTemplates.apply(this, arguments);
 }
 function _getFormPrintTemplates() {
-  _getFormPrintTemplates = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(formId) {
+  _getFormPrintTemplates = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(formId, disableCache) {
     var res;
     return _regenerator["default"].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;
@@ -56,7 +60,7 @@ function _getFormPrintTemplates() {
   }));
   return _getFormPrintTemplates.apply(this, arguments);
 }
-function print(_x2) {
+function print(_x3) {
   return _print.apply(this, arguments);
 }
 function _print() {
@@ -109,7 +113,7 @@ function _print() {
   }));
   return _print.apply(this, arguments);
 }
-function openPrint(_x3, _x4) {
+function openPrint(_x4, _x5) {
   return _openPrint.apply(this, arguments);
 }
 function _openPrint() {
@@ -204,7 +208,7 @@ function _openPrint() {
                 }
               }, _callee5);
             }));
-            return function (_x6, _x7) {
+            return function (_x7, _x8) {
               return _ref.apply(this, arguments);
             };
           }()));
@@ -274,7 +278,9 @@ var CloudPrinter = /*#__PURE__*/function () {
             });
           case 3:
             res = _context.sent;
-            if (!res.success) {
+            if (res.success) {
+              _message2["default"].success(res.message);
+            } else {
               _message2["default"].error(res.message);
             }
           case 4:
@@ -283,7 +289,7 @@ var CloudPrinter = /*#__PURE__*/function () {
         }
       }, _callee, this);
     }));
-    function post(_x5) {
+    function post(_x6) {
       return _post.apply(this, arguments);
     }
     return post;