@zhubangyun/lowcode-core 5.8.290 → 5.10.81

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

@@ -1,4 +1,5 @@
 import { AxiosInstance, AxiosRequestConfig } from "axios";
+export declare type ValueType = "value" | "field" | "express";
 export interface RestApiOptions {
     /**
      * 超时时间
@@ -12,9 +13,10 @@ export interface RestApiOptions {
 }
 export interface FilterRule {
     connector?: "and" | "or";
-    key: string;
+    key?: string;
     operator?: OperatorType;
-    value: any;
+    valueType?: ValueType;
+    value?: any;
     rules?: FilterRule[];
 }
 export declare type OperatorType = "eq" | "ne" | "gt" | "goe" | "lt" | "loe" | "like" | "notLike" | "in" | "notIn" | "isNull" | "isNotNull" | "between" | "notBetween";
@@ -87,6 +89,7 @@ export interface BaseType {
         id: string;
         fieldId?: string;
         label: string;
+        labelField: string;
     };
     _load?: boolean;
 }
@@ -95,6 +98,7 @@ export interface BaseType {
  */
 export interface BaseResult<DataType> {
     success: boolean;
+    requestId?: string;
     message?: string;
     refs?: Refs;
 }

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

@@ -8,6 +8,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import axios from "axios";
 import { onFulfilled, onRejected } from "./index";
 import { transformerId } from "../data";
+import { showForm } from "../page";
 export var BaseRestApi = /*#__PURE__*/function () {
   function BaseRestApi(uri, options) {
     this.uri = void 0;
@@ -84,7 +85,7 @@ export var BaseRestApi = /*#__PURE__*/function () {
               _context2.next = 12;
               break;
             }
-            this.showError("\u83B7\u53D6{" + id + "}\u5931\u8D25!", res.message).then();
+            this.showError("\u83B7\u53D6{" + id + "}\u5931\u8D25!", res).then();
             _context2.next = 10;
             return options === null || options === void 0 ? void 0 : (_options$onError = options.onError) === null || _options$onError === void 0 ? void 0 : _options$onError.call(options, res);
           case 10:
@@ -125,7 +126,7 @@ export var BaseRestApi = /*#__PURE__*/function () {
               _context3.next = 12;
               break;
             }
-            this.showError("\u63D0\u4EA4\u5931\u8D25!", res.message).then();
+            this.showError("\u63D0\u4EA4\u5931\u8D25!", res).then();
             _context3.next = 10;
             return options === null || options === void 0 ? void 0 : (_options$onError2 = options.onError) === null || _options$onError2 === void 0 ? void 0 : _options$onError2.call(options, res);
           case 10:
@@ -172,7 +173,7 @@ export var BaseRestApi = /*#__PURE__*/function () {
               _context4.next = 12;
               break;
             }
-            this.showError("\u65B0\u589E\u5931\u8D25!", res.message).then();
+            this.showError("\u65B0\u589E\u5931\u8D25!", res).then();
             _context4.next = 10;
             return options === null || options === void 0 ? void 0 : (_options$onError3 = options.onError) === null || _options$onError3 === void 0 ? void 0 : _options$onError3.call(options, res);
           case 10:
@@ -219,7 +220,7 @@ export var BaseRestApi = /*#__PURE__*/function () {
               _context5.next = 12;
               break;
             }
-            this.showError("\u66F4\u65B0\u5931\u8D25!", res.message).then();
+            this.showError("\u66F4\u65B0\u5931\u8D25!", res).then();
             _context5.next = 10;
             return options === null || options === void 0 ? void 0 : (_options$onError4 = options.onError) === null || _options$onError4 === void 0 ? void 0 : _options$onError4.call(options, res);
           case 10:
@@ -266,7 +267,7 @@ export var BaseRestApi = /*#__PURE__*/function () {
               _context6.next = 12;
               break;
             }
-            this.showError("\u5220\u9664{" + id + "}\u5931\u8D25!", res.message).then();
+            this.showError("\u5220\u9664{" + id + "}\u5931\u8D25!", res).then();
             _context6.next = 10;
             return options === null || options === void 0 ? void 0 : (_options$onError5 = options.onError) === null || _options$onError5 === void 0 ? void 0 : _options$onError5.call(options, res);
           case 10:
@@ -323,7 +324,7 @@ export var BaseRestApi = /*#__PURE__*/function () {
               _context7.next = 18;
               break;
             }
-            this.showError("\u5220\u9664\u5931\u8D25!", res.message).then();
+            this.showError("\u5220\u9664\u5931\u8D25!", res).then();
             _context7.next = 16;
             return options === null || options === void 0 ? void 0 : (_options$onError6 = options.onError) === null || _options$onError6 === void 0 ? void 0 : _options$onError6.call(options, res);
           case 16:
@@ -344,62 +345,72 @@ export var BaseRestApi = /*#__PURE__*/function () {
       return _delete2.apply(this, arguments);
     }
     return _delete;
-  }();
-  _proto.showError = /*#__PURE__*/function () {
-    var _showError = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(type, msg) {
-      var props;
+  }() // @ts-ignore
+  ;
+  _proto.showError =
+  /*#__PURE__*/
+  function () {
+    var _showError = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(type, res) {
+      var msg, props, content;
       return _regeneratorRuntime.wrap(function _callee8$(_context8) {
         while (1) switch (_context8.prev = _context8.next) {
           case 0:
-            _context8.prev = 0;
+            msg = res.message;
+            _context8.prev = 1;
             if (!msg) {
-              _context8.next = 18;
+              _context8.next = 21;
               break;
             }
             props = JSON.parse(msg);
-            props.content = props.message;
+            content = /*#__PURE__*/React.createElement(ErrorContent, {
+              requestId: res.requestId,
+              message: props.message
+            });
+            props.content = content;
+            props.message = content;
             if (!props.title) {
               props.title = "" + this.title + type;
             }
             if (!(props.type == "message")) {
-              _context8.next = 10;
+              _context8.next = 13;
               break;
             }
             _message.error(props);
             return _context8.abrupt("return");
-          case 10:
+          case 13:
             if (!(props.type == "modal")) {
-              _context8.next = 15;
+              _context8.next = 18;
               break;
             }
             _Modal.error(props);
             return _context8.abrupt("return");
-          case 15:
+          case 18:
             if (!(props.type == "notification")) {
-              _context8.next = 18;
+              _context8.next = 21;
               break;
             }
             _notification.error(props);
             return _context8.abrupt("return");
-          case 18:
-            _context8.next = 24;
+          case 21:
+            _context8.next = 27;
             break;
-          case 20:
-            _context8.prev = 20;
-            _context8.t0 = _context8["catch"](0);
+          case 23:
+            _context8.prev = 23;
+            _context8.t0 = _context8["catch"](1);
             console.error("" + this.title + type + (msg || ""));
             _Modal.error({
               title: "" + this.title + type,
               centered: true,
-              content: /*#__PURE__*/React.createElement(_Typography.Text, {
-                type: "danger"
-              }, msg || "")
+              content: /*#__PURE__*/React.createElement(ErrorContent, {
+                requestId: res.requestId,
+                message: res.message
+              })
             });
-          case 24:
+          case 27:
           case "end":
             return _context8.stop();
         }
-      }, _callee8, this, [[0, 20]]);
+      }, _callee8, this, [[1, 23]]);
     }));
     function showError(_x15, _x16) {
       return _showError.apply(this, arguments);
@@ -408,13 +419,32 @@ export var BaseRestApi = /*#__PURE__*/function () {
   }();
   return BaseRestApi;
 }();
-function getStringId(item) {
-  if (typeof (item === null || item === void 0 ? void 0 : item.id) === "string") {
-    return item.id;
-  } else if (typeof item === "string") {
-    return item;
+function ErrorContent(props) {
+  var content = /*#__PURE__*/React.createElement(_Typography.Text, {
+    type: "danger",
+    style: {
+      whiteSpace: "pre-wrap"
+    }
+  }, props.message || "");
+  if (props.requestId) {
+    return /*#__PURE__*/React.createElement("div", null, content, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("a", {
+      onClick: function onClick() {
+        _Modal.destroyAll();
+        _message.destroy();
+        _notification.destroy();
+        showForm({
+          layout: "modal",
+          form: {
+            id: "form_e3dbb9076a544f86a3bb6ec113e22494"
+          },
+          mode: "detail",
+          dataId: props.requestId
+        }).then();
+      }
+    }, "\u67E5\u770B\u65E5\u5FD7")));
+  } else {
+    return content;
   }
-  return null;
 }
 export var RestApi = /*#__PURE__*/function (_BaseRestApi2) {
   function RestApi(uri, options) {

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

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

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

@@ -0,0 +1,33 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { schema } from "../cache";
+export function getSchema(_x, _x2) {
+  return _getSchema.apply(this, arguments);
+}
+function _getSchema() {
+  _getSchema = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(pageId, mock) {
+    var key;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          if (typeof mock != "boolean") {
+            if (typeof window.__mock == "boolean") {
+              mock = window.__mock;
+            }
+          }
+          key = mock ? pageId + "_mock" : pageId;
+          _context.next = 4;
+          return schema.getInstance(key, {
+            mock: mock,
+            pageId: pageId
+          });
+        case 4:
+          return _context.abrupt("return", _context.sent);
+        case 5:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _getSchema.apply(this, arguments);
+}

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

@@ -0,0 +1 @@
+export declare function loadDts(): Promise<any[]>;

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

@@ -0,0 +1,41 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { getFormApi } from "./index";
+export function loadDts() {
+  return _loadDts.apply(this, arguments);
+}
+function _loadDts() {
+  _loadDts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+    var api, res;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.prev = 0;
+          _context.next = 3;
+          return getFormApi("form_bea7fcc6376c4461965237056f970fb7");
+        case 3:
+          api = _context.sent;
+          _context.next = 6;
+          return api.search({
+            pageSize: 1000,
+            searchFields: [{
+              key: "type",
+              operator: "eq",
+              value: "dts"
+            }]
+          });
+        case 6:
+          res = _context.sent;
+          return _context.abrupt("return", res.data || []);
+        case 10:
+          _context.prev = 10;
+          _context.t0 = _context["catch"](0);
+          return _context.abrupt("return", []);
+        case 13:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[0, 10]]);
+  }));
+  return _loadDts.apply(this, arguments);
+}

package/es/utils/cache/schema.js

@@ -19,14 +19,20 @@ function _handleFormSchema() {
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
+          if (!((schema === null || schema === void 0 ? void 0 : schema.componentName) != "Page")) {
+            _context.next = 2;
+            break;
+          }
+          return _context.abrupt("return");
+        case 2:
           formFieldSchema = new FormFieldSchema(schema.children[0], null);
           fdmItems = [];
           fieldIdMap = new Map();
           schema.state = schema.state || {};
           schema.methods = schema.methods || {};
-          _context.next = 7;
+          _context.next = 9;
           return handleAssociationForm(formFieldSchema, schema);
-        case 7:
+        case 9:
           //初次处理
           forEachFormSchema(schema, function (field) {
             if (field.fdmSchema) {
@@ -47,15 +53,15 @@ function _handleFormSchema() {
 
           //处理查询列
           _i = 0, _fdmItems = fdmItems;
-        case 9:
+        case 11:
           if (!(_i < _fdmItems.length)) {
-            _context.next = 17;
+            _context.next = 19;
             break;
           }
           fdmField = _fdmItems[_i];
-          _context.next = 13;
+          _context.next = 15;
           return handleFdmAssociationAttributeFields(formFieldSchema, fdmField.fdmSchema);
-        case 13:
+        case 15:
           forEachFormSchema(fdmField.fdmSchema, function (field) {
             var _field$props;
             var findSchema = fieldIdMap.get((_field$props = field.props) === null || _field$props === void 0 ? void 0 : _field$props.fieldId);
@@ -92,11 +98,11 @@ function _handleFormSchema() {
             }
             return true;
           });
-        case 14:
+        case 16:
           _i++;
-          _context.next = 9;
+          _context.next = 11;
           break;
-        case 17:
+        case 19:
         case "end":
           return _context.stop();
       }

package/es/utils/common/LoadPlugins.js

@@ -62,15 +62,10 @@ function _loadStyle() {
         case 2:
           return _context3.abrupt("return", new Promise( /*#__PURE__*/function () {
             var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(resolve) {
-              var callback, target;
+              var target;
               return _regeneratorRuntime.wrap(function _callee2$(_context2) {
                 while (1) switch (_context2.prev = _context2.next) {
                   case 0:
-                    callback = function _callback(status) {
-                      setTimeout(function () {
-                        resolve(status);
-                      }, 10);
-                    };
                     //加载式样
                     target = doc.querySelector("link[href='" + src + "']");
                     if (!target) {
@@ -78,16 +73,16 @@ function _loadStyle() {
                       target.href = src;
                       target.rel = "stylesheet";
                       target.onload = function () {
-                        return callback(true);
+                        resolve(true);
                       };
                       target.onerror = function () {
-                        return callback(false);
+                        resolve(false);
                       };
                       doc.head.appendChild(target);
                     } else {
-                      callback(true);
+                      resolve(true);
                     }
-                  case 3:
+                  case 2:
                   case "end":
                     return _context2.stop();
                 }
@@ -125,10 +120,8 @@ function _loadScript() {
               return _regeneratorRuntime.wrap(function _callee4$(_context4) {
                 while (1) switch (_context4.prev = _context4.next) {
                   case 0:
-                    callback = function _callback2(status) {
-                      setTimeout(function () {
-                        resolve(status);
-                      }, 10);
+                    callback = function _callback(status) {
+                      resolve(status);
                     };
                     //加载脚本
                     target = doc.querySelector("script[src='" + src + "']");
@@ -139,10 +132,10 @@ function _loadScript() {
                       }
                       target.src = src;
                       target.onload = function () {
-                        return callback(true);
+                        callback(true);
                       };
                       target.onerror = function () {
-                        return callback(false);
+                        callback(false);
                       };
                       doc.body.appendChild(target);
                     } else {

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

@@ -1,2 +1,3 @@
 export { loadPlugins } from "./LoadPlugins";
 export declare function uuid(prefix?: string, separator?: string): string;
+export declare function toArray(data: any): any[];

package/es/utils/common/index.js

@@ -1,7 +1,19 @@
 import { v4 } from "uuid";
 export { loadPlugins } from "./LoadPlugins";
 export function uuid(prefix, separator) {
+  if (!prefix && !separator) {
+    return v4();
+  }
   return [prefix, separator, v4()].filter(function (v) {
     return !!v;
   }).join("");
+}
+export function toArray(data) {
+  if (!data) {
+    return [];
+  } else if (Array.isArray(data)) {
+    return data;
+  } else {
+    return [data];
+  }
 }

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

@@ -1,5 +1,6 @@
 export { showForm } from "./page-form";
 export { showFormDataManager } from "./page-form-data-manager";
+export { showFormDataManagerGroup } from "./page-form-data-manager-group";
 export declare function showLoading(): Promise<void>;
 export declare function hideLoading(): Promise<void>;
 export declare function openPage(url: string, target?: string): Promise<any>;

package/es/utils/page/index.js

@@ -2,6 +2,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 export { showForm } from "./page-form";
 export { showFormDataManager } from "./page-form-data-manager";
+export { showFormDataManagerGroup } from "./page-form-data-manager-group";
 var timerRef;
 function debounceHide() {
   if (timerRef) {

package/es/utils/page/page-form-data-manager-group.d.ts

@@ -0,0 +1,17 @@
+import { PageLayoutType } from "./page-layout";
+export declare type PageFormDataManagerModeType = "page" | "selectOne" | "selectMore";
+export interface ShowFormDataManagerGroupProps {
+    container?: HTMLDivElement;
+    layout?: PageLayoutType;
+    mode?: PageFormDataManagerModeType;
+    items: any[];
+    extraProps?: any;
+    defaultSelectedRows?: any[];
+    onClose?: () => void | Promise<void>;
+    onSearch?: (params: any[]) => void | Promise<void>;
+    onLoadData?: (response: {
+        data: any[];
+        total: number;
+    }) => void | Promise<void>;
+}
+export declare function showFormDataManagerGroup(options: ShowFormDataManagerGroupProps): Promise<any | any[]>;

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

@@ -0,0 +1,104 @@
+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", "items", "onSelectOk", "onClose"],
+  _excluded2 = ["container", "onClose"];
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { PageLayout } from "./page-layout";
+import React, { Component } from "react";
+import { ReactRender } from "../../components/react-render";
+import { cloneDataView } from "./page-schema-utils";
+import { renderElement } from "./page-render";
+import { v4 } from "uuid";
+export function showFormDataManagerGroup(_x) {
+  return _showFormDataManagerGroup.apply(this, arguments);
+}
+function _showFormDataManagerGroup() {
+  _showFormDataManagerGroup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(options) {
+    var container, onClose, props;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          container = options.container, onClose = options.onClose, props = _objectWithoutPropertiesLoose(options, _excluded2);
+          return _context.abrupt("return", renderElement({
+            container: container,
+            onClose: onClose,
+            element: {
+              component: FormDataManagerRender,
+              props: props
+            }
+          }));
+        case 2:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _showFormDataManagerGroup.apply(this, arguments);
+}
+var FormDataManagerRender = /*#__PURE__*/function (_Component) {
+  function FormDataManagerRender() {
+    var _this;
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    _this = _Component.call.apply(_Component, [this].concat(args)) || this;
+    _this.layoutRef = void 0;
+    return _this;
+  }
+  _inheritsLoose(FormDataManagerRender, _Component);
+  var _proto = FormDataManagerRender.prototype;
+  _proto.render = function render() {
+    var _this2 = this;
+    var self = this;
+    var _this$props = this.props,
+      layout = _this$props.layout,
+      items = _this$props.items,
+      onSelectOk = _this$props.onSelectOk,
+      onClose = _this$props.onClose,
+      restProps = _objectWithoutPropertiesLoose(_this$props, _excluded);
+    // @ts-ignore
+    restProps.layout = layout || "modal";
+    // @ts-ignore
+    restProps.onClose = function () {
+      var _self$layoutRef;
+      (_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.onSelectOk = function (data) {
+      var _self$layoutRef2;
+      (_self$layoutRef2 = self.layoutRef) === null || _self$layoutRef2 === void 0 ? void 0 : _self$layoutRef2.close();
+      onSelectOk === null || onSelectOk === void 0 ? void 0 : onSelectOk(data);
+    };
+    var fdmItems = (items === null || items === void 0 ? void 0 : items.map(function (item) {
+      return _extends({}, item, {
+        dataView: cloneDataView(_this2.props.extraProps, item.dataView)
+      });
+    })) || [];
+    return /*#__PURE__*/React.createElement(PageLayout, {
+      layout: layout,
+      ref: function ref(layout) {
+        return _this2.layoutRef = layout;
+      }
+    }, /*#__PURE__*/React.createElement(ReactRender, _extends({}, restProps, {
+      components: window._components || window.components || window.__components,
+      schema: {
+        id: v4(),
+        componentName: "Page",
+        props: {},
+        state: {},
+        children: [{
+          componentName: "PageFdmGroup",
+          props: {
+            mode: restProps.mode,
+            defaultSelectedRows: restProps.defaultSelectedRows,
+            items: fdmItems
+          }
+        }]
+      }
+    })));
+  };
+  return FormDataManagerRender;
+}(Component);

package/es/utils/page/page-form-data-manager.d.ts

@@ -1,4 +1,5 @@
 import { PageLayoutType } from "./page-layout";
+import { FilterRule } from "../api/rest-api";
 export declare type PageFormDataManagerModeType = "associationField" | "dataManager" | "selectOne" | "selectMore";
 export interface ShowPageFormDataManagerProps {
     container?: HTMLDivElement;
@@ -8,6 +9,11 @@ export interface ShowPageFormDataManagerProps {
         fieldId?: string;
     };
     mode?: PageFormDataManagerModeType;
+    dataView?: {
+        filterRules?: FilterRule[];
+        searchFields?: FilterRule[];
+        orderRules?: any[];
+    };
     extraProps?: any;
     onClose?: () => void | Promise<void>;
     onSearch?: (params: any[]) => void | Promise<void>;