@zhubangyun/lowcode-core 5.8.290 → 5.10.81

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

@@ -6,93 +6,35 @@ var _excluded = ["layout", "form", "onSelectOk", "onClose"],
   _excluded2 = ["container", "onClose"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { PageLayout } from "./page-layout";
-import ReactDOM from "react-dom";
 import React, { Component } from "react";
 import { PageLoadSchema } from "./page-load-schema";
 import { ReactRender } from "../../components/react-render";
-import { openPage } from "./index";
 import { forEachFormSchema } from "../cache/schema";
+import { cloneDataView } from "./page-schema-utils";
+import { renderElement } from "./page-render";
 export function showFormDataManager(_x) {
   return _showFormDataManager.apply(this, arguments);
 }
 function _showFormDataManager() {
-  _showFormDataManager = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(options) {
-    return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
+  _showFormDataManager = _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:
-          return _context3.abrupt("return", new Promise( /*#__PURE__*/function () {
-            var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(resolve, reject) {
-              var container, onClose, restProps, unmount, _options$form, paths, mode, _params, url, page;
-              return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-                while (1) switch (_context2.prev = _context2.next) {
-                  case 0:
-                    container = options.container, onClose = options.onClose, restProps = _objectWithoutPropertiesLoose(options, _excluded2); //容器不存在需要手动取消挂载
-                    unmount = !container;
-                    if (container) {
-                      _context2.next = 15;
-                      break;
-                    }
-                    if (!(options.layout == "page")) {
-                      _context2.next = 13;
-                      break;
-                    }
-                    paths = window.location.pathname.split("/");
-                    mode = options.mode;
-                    _params = new URLSearchParams();
-                    url = "/" + paths[1] + "/" + paths[2] + "/" + ((_options$form = options.form) === null || _options$form === void 0 ? void 0 : _options$form.id) + "/" + mode + "?" + _params.toString();
-                    _context2.next = 10;
-                    return openPage(url, url);
-                  case 10:
-                    page = _context2.sent;
-                    console.debug("openPage", page);
-                    return _context2.abrupt("return");
-                  case 13:
-                    container = document.createElement("div");
-                    document.body.append(container);
-                  case 15:
-                    ReactDOM.render( /*#__PURE__*/React.createElement(FormDataManagerRender, _extends({}, restProps, {
-                      onSelectOk: function onSelectOk(data) {
-                        resolve(data || null);
-                      },
-                      onClose: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-                        return _regeneratorRuntime.wrap(function _callee$(_context) {
-                          while (1) switch (_context.prev = _context.next) {
-                            case 0:
-                              resolve(null);
-                              setTimeout(function () {
-                                ReactDOM.unmountComponentAtNode(container);
-                              }, 10);
-                              if (unmount) {
-                                //等待动画结束
-                                setTimeout(function () {
-                                  var _container;
-                                  //移除
-                                  (_container = container) === null || _container === void 0 ? void 0 : _container.remove();
-                                }, 100);
-                              }
-                              onClose === null || onClose === void 0 ? void 0 : onClose();
-                            case 4:
-                            case "end":
-                              return _context.stop();
-                          }
-                        }, _callee);
-                      }))
-                    })), container);
-                  case 16:
-                  case "end":
-                    return _context2.stop();
-                }
-              }, _callee2);
-            }));
-            return function (_x2, _x3) {
-              return _ref.apply(this, arguments);
-            };
-          }()));
-        case 1:
+          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 _context3.stop();
+          return _context.stop();
       }
-    }, _callee3);
+    }, _callee);
   }));
   return _showFormDataManager.apply(this, arguments);
 }
@@ -117,7 +59,6 @@ var FormDataManagerRender = /*#__PURE__*/function (_Component) {
       onSelectOk = _this$props.onSelectOk,
       onClose = _this$props.onClose,
       restProps = _objectWithoutPropertiesLoose(_this$props, _excluded);
-
     // @ts-ignore
     restProps.layout = layout || "modal";
     // @ts-ignore
@@ -132,6 +73,7 @@ var FormDataManagerRender = /*#__PURE__*/function (_Component) {
       (_self$layoutRef2 = self.layoutRef) === null || _self$layoutRef2 === void 0 ? void 0 : _self$layoutRef2.close();
       onSelectOk === null || onSelectOk === void 0 ? void 0 : onSelectOk(data);
     };
+    var dataView = cloneDataView(this.props.dataView, this.props.extraProps);
     return /*#__PURE__*/React.createElement(PageLayout, {
       layout: layout,
       ref: function ref(layout) {
@@ -150,10 +92,13 @@ var FormDataManagerRender = /*#__PURE__*/function (_Component) {
           return true;
         });
       }
-      return /*#__PURE__*/React.createElement(ReactRender, _extends({
+      return /*#__PURE__*/React.createElement(ReactRender, _extends({}, restProps, {
         schema: fdmSchema,
         components: window._components || window.components || window.__components
-      }, restProps));
+        // @ts-ignore
+        ,
+        dataView: dataView
+      }));
     }));
   };
   return FormDataManagerRender;

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

@@ -13,4 +13,4 @@ export interface ShowFormProps {
     onRemoveOk?: () => void;
     onClose?: () => void | Promise<void>;
 }
-export declare function showForm(options: ShowFormProps): Promise<void>;
+export declare function showForm(options: ShowFormProps): Promise<any>;

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

@@ -6,28 +6,23 @@ var _excluded = ["layout", "form", "onClose"],
   _excluded2 = ["container", "onClose"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { PageLayout } from "./page-layout";
-import ReactDOM from "react-dom";
 import React, { Component } from "react";
 import { PageLoadSchema } from "./page-load-schema";
 import { ReactRender } from "../../components/react-render";
 import { openPage } from "./index";
+import { renderElement } from "./page-render";
 export function showForm(_x) {
   return _showForm.apply(this, arguments);
 }
 function _showForm() {
-  _showForm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(options) {
-    var container, onClose, restProps, unmount, _options$form, paths, mode, dataId, params, url, page;
-    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+  _showForm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(options) {
+    var container, onClose, props, _options$form, paths, mode, dataId, params, url, page;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
         case 0:
-          container = options.container, onClose = options.onClose, restProps = _objectWithoutPropertiesLoose(options, _excluded2); //容器不存在需要手动取消挂载
-          unmount = !container;
-          if (container) {
-            _context2.next = 16;
-            break;
-          }
-          if (!(options.layout == "page")) {
-            _context2.next = 14;
+          container = options.container, onClose = options.onClose, props = _objectWithoutPropertiesLoose(options, _excluded2); //容器不存在需要手动取消挂载
+          if (!(options.layout == "page" && !container)) {
+            _context.next = 12;
             break;
           }
           paths = window.location.pathname.split("/");
@@ -37,44 +32,26 @@ function _showForm() {
             params.set("dataId", dataId);
           }
           url = "/" + paths[1] + "/" + paths[2] + "/" + ((_options$form = options.form) === null || _options$form === void 0 ? void 0 : _options$form.id) + "/" + mode + "?" + params.toString();
-          _context2.next = 11;
+          _context.next = 9;
           return openPage(url, url);
-        case 11:
-          page = _context2.sent;
+        case 9:
+          page = _context.sent;
           console.debug("openPage", page);
-          return _context2.abrupt("return");
-        case 14:
-          container = document.createElement("div");
-          document.body.append(container);
-        case 16:
-          ReactDOM.render( /*#__PURE__*/React.createElement(FormRender, _extends({}, restProps, {
-            onClose: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-              return _regeneratorRuntime.wrap(function _callee$(_context) {
-                while (1) switch (_context.prev = _context.next) {
-                  case 0:
-                    if (unmount) {
-                      //等待动画结束
-                      setTimeout(function () {
-                        var _container;
-                        //取消挂载
-                        ReactDOM.unmountComponentAtNode(container);
-                        //移除
-                        (_container = container) === null || _container === void 0 ? void 0 : _container.remove();
-                      }, 1000);
-                    }
-                    onClose === null || onClose === void 0 ? void 0 : onClose();
-                  case 2:
-                  case "end":
-                    return _context.stop();
-                }
-              }, _callee);
-            }))
-          })), container);
-        case 17:
+          return _context.abrupt("return");
+        case 12:
+          return _context.abrupt("return", renderElement({
+            container: container,
+            onClose: onClose,
+            element: {
+              component: FormRender,
+              props: props
+            }
+          }));
+        case 13:
         case "end":
-          return _context2.stop();
+          return _context.stop();
       }
-    }, _callee2);
+    }, _callee);
   }));
   return _showForm.apply(this, arguments);
 }

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

@@ -62,7 +62,7 @@ export var PageLayout = /*#__PURE__*/function (_Component) {
     };
     if (layout == "modal") {
       restProps.style.top = 64;
-      restProps.styles.body.maxHeight = "calc(100vh - 180px)";
+      restProps.styles.body.height = "calc(100vh - 120px)";
       return /*#__PURE__*/React.createElement(_Modal, restProps, children);
     } else if (layout == "drawer") {
       return /*#__PURE__*/React.createElement(_Drawer, restProps, children);

package/es/utils/page/page-render.d.ts

@@ -0,0 +1,10 @@
+interface PageRenderProps {
+    container?: HTMLDivElement;
+    onClose?: () => void;
+    element: {
+        component: any;
+        props: any;
+    };
+}
+export declare function renderElement(options: PageRenderProps): Promise<any>;
+export {};

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

@@ -0,0 +1,51 @@
+import _extends from "@babel/runtime/helpers/extends";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import ReactDOM from "react-dom";
+import { createElement } from "react";
+export function renderElement(options) {
+  return new Promise( /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(resolve, reject) {
+      var container, _onClose, _options$element, component, props, unmount, element;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            container = options.container, _onClose = options.onClose;
+            _options$element = options.element, component = _options$element.component, props = _options$element.props;
+            unmount = !container;
+            if (!container) {
+              container = document.createElement("div");
+              document.body.append(container);
+            }
+            element = /*#__PURE__*/createElement(component, _extends({}, props, {
+              onSelectOk: function onSelectOk(data) {
+                resolve(data || null);
+              },
+              onClose: function onClose() {
+                resolve(false);
+                setTimeout(function () {
+                  ReactDOM.unmountComponentAtNode(container);
+                }, 100);
+                if (unmount) {
+                  //等待动画结束
+                  setTimeout(function () {
+                    var _container;
+                    //移除
+                    (_container = container) === null || _container === void 0 ? void 0 : _container.remove();
+                  }, 1000);
+                }
+                _onClose === null || _onClose === void 0 ? void 0 : _onClose();
+              }
+            }));
+            ReactDOM.render(element, container);
+          case 6:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function (_x, _x2) {
+      return _ref.apply(this, arguments);
+    };
+  }());
+}

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

@@ -0,0 +1 @@
+export declare function cloneDataView(dataView: any, extraProps: any): any;

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

@@ -0,0 +1,74 @@
+import _extends from "@babel/runtime/helpers/extends";
+export function cloneDataView(dataView, extraProps) {
+  if (!dataView) {
+    return {};
+  }
+  if (typeof extraProps !== "object") {
+    extraProps = {};
+  }
+  var cloneDataView = _extends({}, dataView);
+  var filterRules = dataView.filterRules,
+    searchFields = dataView.searchFields;
+  function createFilterRules(rules) {
+    if (!Array.isArray(rules)) {
+      return [];
+    }
+    var scripts = [];
+    for (var _i = 0, _Object$keys = Object.keys(extraProps); _i < _Object$keys.length; _i++) {
+      var key = _Object$keys[_i];
+      scripts.push("const " + key + " = extraProps[\"" + key + "\"];");
+    }
+    scripts.push(compileFilterRules(rules));
+    var compile = scripts.join("\n");
+    try {
+      return eval(compile);
+    } catch (e) {
+      console.log("\u89E3\u6790dataView.rules\u5F02\u5E38", e);
+      console.log({
+        rules: rules,
+        compile: compile,
+        extraProps: extraProps
+      });
+    }
+    return [];
+  }
+  cloneDataView.filterRules = createFilterRules(filterRules);
+  cloneDataView.searchFields = createFilterRules(searchFields);
+  return cloneDataView;
+}
+function compileFilterRules(rules) {
+  var _rules, _rules$forEach;
+  if (rules === void 0) {
+    rules = [];
+  }
+  var scripts = ["["];
+  (_rules = rules) === null || _rules === void 0 ? void 0 : (_rules$forEach = _rules.forEach) === null || _rules$forEach === void 0 ? void 0 : _rules$forEach.call(_rules, function (rule, index, array) {
+    var _rule$rules;
+    var isFirst = index == 0;
+    var isLast = index + 1 == array.length;
+    scripts.push("{");
+    if (!isFirst) {
+      var connector = rule.connector == "or" ? "or" : "and";
+      scripts.push("\"connector\":\"" + connector + "\",");
+    }
+    if (rule !== null && rule !== void 0 && (_rule$rules = rule.rules) !== null && _rule$rules !== void 0 && _rule$rules.length) {
+      //分组
+      scripts.push("\"rules\":" + compileFilterRules(rule.rules) + ",");
+    } else {
+      var value = rule.value;
+      if (rule.valueType == "express") {
+        if (value === "") {
+          value = "undefined";
+        }
+      } else if (rule.valueType == "value" || !rule.valueType || typeof value === "object") {
+        value = JSON.stringify(value);
+      }
+      scripts.push("\"key\":\"" + rule.key + "\",");
+      scripts.push("\"operator\":\"" + rule.operator + "\",");
+      scripts.push("\"value\":" + value + ",");
+    }
+    scripts.push("}" + (isLast ? "" : ","));
+  });
+  scripts.push("]");
+  return scripts.join("");
+}

package/lib/index.js

@@ -22,6 +22,8 @@ var _layout = require("./components/layout");
 exports.Layout = _layout.Layout;
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+// @ts-ignore
+
 // @ts-ignore
 window.__ReactRender = _reactRender.ReactRender;
 // @ts-ignore

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

@@ -0,0 +1,7 @@
+import { AxiosProgressEvent } from "axios";
+export declare function upload(file: any, options?: {
+    onProgress: (evt: AxiosProgressEvent) => void;
+    onFinished: () => void;
+    onError: (e: any) => void;
+}): Promise<void>;
+export declare function update(file: any): Promise<void>;

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

@@ -0,0 +1,92 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+exports.__esModule = true;
+exports.update = update;
+exports.upload = upload;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _index = require("./index");
+function upload(_x, _x2) {
+  return _upload.apply(this, arguments);
+}
+function _upload() {
+  _upload = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(file, options) {
+    var res, ossFile, _options$onFinished, _options$onError;
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          if (file) {
+            _context.next = 2;
+            break;
+          }
+          return _context.abrupt("return");
+        case 2:
+          _context.next = 4;
+          return _index.apiRequest.post("files/signature", {
+            size: file.size,
+            name: file.name,
+            type: file.type
+          }, {
+            params: {
+              type: "oss"
+            }
+          });
+        case 4:
+          res = _context.sent;
+          ossFile = res.data;
+          file.id = ossFile.id;
+          file.url = ossFile.url;
+          file.percent = 0;
+          file.status = "uploading";
+          _context.prev = 10;
+          _context.next = 13;
+          return _index.apiRequest.put(ossFile.uploadUrl, file, {
+            headers: {
+              'Content-Type': file.type
+            },
+            onUploadProgress: function onUploadProgress(evt) {
+              var _options$onProgress;
+              if (evt.total) {
+                file.percent = Math.round(evt.loaded * 100 / evt.total);
+              }
+              options === null || options === void 0 ? void 0 : (_options$onProgress = options.onProgress) === null || _options$onProgress === void 0 ? void 0 : _options$onProgress.call(options, evt);
+            }
+          });
+        case 13:
+          options === null || options === void 0 ? void 0 : (_options$onFinished = options.onFinished) === null || _options$onFinished === void 0 ? void 0 : _options$onFinished.call(options);
+          _context.next = 19;
+          break;
+        case 16:
+          _context.prev = 16;
+          _context.t0 = _context["catch"](10);
+          options === null || options === void 0 ? void 0 : (_options$onError = options.onError) === null || _options$onError === void 0 ? void 0 : _options$onError.call(options, _context.t0);
+        case 19:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[10, 16]]);
+  }));
+  return _upload.apply(this, arguments);
+}
+function update(_x3) {
+  return _update.apply(this, arguments);
+}
+function _update() {
+  _update = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(file) {
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _context2.next = 2;
+          return _index.apiRequest.post("files/update", {
+            id: file.id,
+            fileName: file.fileName
+          });
+        case 2:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _update.apply(this, arguments);
+}

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

@@ -1,5 +1,6 @@
 import { BaseRequestOptions, ManyResult, OneResult, RestApi, RestSearchParams } from "./rest-api";
 import { AxiosRequestConfig } from "axios";
+export declare function getFormApi(formId: string, fieldId?: string, mock?: boolean): Promise<RestFormApi<any>>;
 export declare class RestFormApi<DataType> extends RestApi<DataType> {
     private readonly formId;
     private readonly fieldId?;