@luck-design-biz/luckda 1.0.5-13tl → 1.0.7

package/es/lowcode/view/lc-components/Form/index.js

@@ -15,6 +15,7 @@ import Wrapper from "../Wrapper";
 import { LdFormList } from "../../../../index";
 import { omitBadProps, executeCode, getLDMetaAttr } from "../../../engine/tools/helper";
 import { useContext, useRemoteSource, modifyNode } from "../../../engine/provider/ContextProvider";
+import { usePageProxyContext } from "../../../engine/provider/PageProxyProvider";
 import buildUploadForm from "../../../../upload/Form";
 import RuntimeComp from "../JSX/RuntimeComp";
 import useCombinedRefs from "../../../engine/tools/useCombinedRefs";
@@ -75,6 +76,7 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref3, ref) {
   var formRef = useCombinedRefs(ref);
   var promiseRef = useRef(null);
   var ctx = useContext();
+  var ppCtx = usePageProxyContext();
   var remoteSource = useRemoteSource();
   var _initData = useCreation(function () {
     return getPageQuery();
@@ -561,6 +563,7 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref3, ref) {
     wrapperRef: wrapperRef,
     id: id,
     ldId: id,
+    pageProxy: ppCtx,
     className: classNames('lc-component-form', _defineProperty({}, className, !!className)),
     renderFormList: renderFormList,
     renderFormExtra: renderFormExtra,

package/es/lowcode/view/lc-components/Proxy/FunctionDesign.js

@@ -0,0 +1,17 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import React from 'react';
+import { Empty } from 'luck-design/antd';
+import { formatMessage } from '@luck-design-biz/base/utils';
+import Index from "./index";
+import styled from "./index.less";
+var FunctionDesign = function FunctionDesign(props) {
+  return /*#__PURE__*/React.createElement(Index, _extends({}, props, {
+    className: styled['runtime-design']
+  }), /*#__PURE__*/React.createElement(Empty, {
+    description: formatMessage({
+      id: 'luckda.lowcode.view.lc-component.design.show',
+      label: '请在预览、运行界面查看嵌入的代理页面'
+    })
+  }));
+};
+export default FunctionDesign;

package/es/lowcode/view/lc-components/Proxy/FunctionLive.js

@@ -0,0 +1,23 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["id", "proxyCode", "destroyOnUnmount", "proxyParams"];
+import React from 'react';
+import Index from "./index";
+import PageProxyProvider from "../../../engine/provider/PageProxyProvider";
+import Page from "../../Page";
+var FunctionLive = function FunctionLive(_ref) {
+  var id = _ref.id,
+    proxyCode = _ref.proxyCode,
+    destroyOnUnmount = _ref.destroyOnUnmount,
+    proxyParams = _ref.proxyParams,
+    props = _objectWithoutProperties(_ref, _excluded);
+  return /*#__PURE__*/React.createElement(Index, _extends({
+    id: id
+  }, props), /*#__PURE__*/React.createElement(PageProxyProvider, {
+    id: id,
+    proxyCode: proxyCode,
+    destroyOnUnmount: destroyOnUnmount,
+    proxyParams: proxyParams
+  }, /*#__PURE__*/React.createElement(Page, null)));
+};
+export default FunctionLive;

package/es/lowcode/view/lc-components/Proxy/FunctionPreview.js

@@ -0,0 +1,23 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["id", "proxyCode", "destroyOnUnmount", "proxyParams"];
+import React from 'react';
+import Index from "./index";
+import PageProxyProvider from "../../../engine/provider/PageProxyProvider";
+import Page from "../../Page";
+var FunctionPreview = function FunctionPreview(_ref) {
+  var id = _ref.id,
+    proxyCode = _ref.proxyCode,
+    destroyOnUnmount = _ref.destroyOnUnmount,
+    proxyParams = _ref.proxyParams,
+    props = _objectWithoutProperties(_ref, _excluded);
+  return /*#__PURE__*/React.createElement(Index, _extends({
+    id: id
+  }, props), /*#__PURE__*/React.createElement(PageProxyProvider, {
+    id: id,
+    proxyCode: proxyCode,
+    destroyOnUnmount: destroyOnUnmount,
+    proxyParams: proxyParams
+  }, /*#__PURE__*/React.createElement(Page, null)));
+};
+export default FunctionPreview;

package/es/lowcode/view/lc-components/Proxy/index.js

@@ -0,0 +1,42 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import React, { useRef, useEffect } from 'react';
+import { useMemoizedFn } from 'ahooks';
+import styled from 'styled-components';
+import classNames from 'classnames';
+import { useContext } from "../../../engine/provider/ContextProvider";
+import Wrapper from "../Wrapper";
+import styles from "./index.less";
+var Div = styled.div.withConfig({
+  displayName: "Div",
+  componentId: "luckda-6530__sc-13y875a-0"
+})(["", ""], function (props) {
+  return props.$css;
+});
+var LCPageProxy = function LCPageProxy(_ref) {
+  var id = _ref.id,
+    children = _ref.children,
+    className = _ref.className,
+    css = _ref.css,
+    advance = _ref.advance;
+  var domRef = useRef();
+  var ctx = useContext();
+  useEffect(function () {
+    ctx.doAction(advance.events.onMount);
+    return function () {
+      return ctx.doAction(advance.events.onUnmount);
+    };
+  }, []);
+  var getTargetDom = useMemoizedFn(function () {
+    return domRef.current;
+  });
+  return /*#__PURE__*/React.createElement(Wrapper, {
+    id: id,
+    displayName: "Proxy",
+    getTargetDom: getTargetDom
+  }, /*#__PURE__*/React.createElement(Div, {
+    ref: domRef,
+    $css: css,
+    className: classNames(styles['lc-component-proxy'], _defineProperty({}, className, !!className))
+  }, children));
+};
+export default LCPageProxy;

package/es/lowcode/view/lc-components/Proxy/index.less

@@ -0,0 +1,5 @@
+.lc-component-proxy.runtime-design {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}

package/es/lowcode/view/lc-components/Proxy/meta.json

@@ -0,0 +1,66 @@
+{
+  "component": "Proxy",
+  "name": "页面代理",
+  "desc": "用于代理其他页面的内容，用于实现已有页面的服用。",
+  "icon": "icon-proxy",
+  "group": "advance",
+  "groupName": "高级",
+  "order": 6,
+  "props": [
+    {
+      "key": "id",
+      "name": "唯一标识",
+      "type": "string",
+      "disabled": true
+    },
+    {
+      "key": "destroyOnUnmount",
+      "name": "卸载时销毁",
+      "type": "switch",
+      "default": false
+    },
+    {
+      "key": "proxyCode",
+      "name": "页面编码",
+      "type": "_ProxyLinker"
+    },
+    {
+      "key": "proxyParams",
+      "name": "页面参数",
+      "type": "_ProxyParams",
+      "wrapper": "collapse",
+      "wrapperProps": {
+        "suppressIcon": true
+      },
+      "next": {
+        "name": "页面参数对象",
+        "autoClose": true,
+        "props": [
+          {
+            "key": "proxyParams",
+            "name": "#页面参数对象",
+            "type": "_ProxyParamsSetter",
+            "default": []
+          }
+        ]
+      }
+    }
+  ],
+  "css": "width: 100%; height: 100%; background-color: transparent;",
+  "advance": {
+    "events": [
+      {
+        "key": "onMount",
+        "name": "组件首次渲染完成",
+        "desc": "在组件首次渲染完成时，执行方法",
+        "func": "function onPageMount(){\n\t\n}"
+      },
+      {
+        "key": "onUnmount",
+        "name": "组件卸载时",
+        "desc": "在组件卸载时，执行方法。",
+        "func": "function onPageUnmount(){\n\t\n}"
+      }
+    ]
+  }
+}

package/es/lowcode/view/lc-components/Table/components/TopImex.js

@@ -6,8 +6,7 @@ import React, { useState, useEffect } from 'react';
 import { Button, notification, Icon, Progress, message } from 'luck-design/antd';
 import api from "@/services/ApiConfig";
 import { BasicForm, BasicFormItem, PopWindow } from 'luck-design';
-import { exportExcel, uploadTemplate, getFindexcelstate, noAuthGetTemplateUrl, clearProcess } from "../../../../constants/api-url";
-import { getLDMetaAttr } from "../../../../engine/tools/helper";
+import { exportExcel, uploadTemplate, getFindexcelstate, noAuthGetTemplateUrl } from "../../../../constants/api-url";
 import styled from 'styled-components';
 import { isString, split, last, lowerCase, includes } from 'lodash';
 import { useRequest } from 'ahooks';
@@ -20,7 +19,6 @@ var UploadDoneWrap = styled.div.withConfig({
   displayName: "UploadDoneWrap",
   componentId: "luckda-6530__sc-1eag873-1"
 })(["display:flex;align-items:center;justify-content:center;flex-direction:column;padding:16px;"]);
-var mdCode = getLDMetaAttr('dataModelKey');
 
 // options: {import: 'templateId' | 'behaviorKey',  importType: false | true, moduleCode}
 export var ImportUploadPop = function ImportUploadPop(_ref) {
@@ -45,14 +43,6 @@ export var ImportUploadPop = function ImportUploadPop(_ref) {
       manual: true
     }),
     runAsyncImport = _useRequest.runAsync;
-
-  // 清除进度
-  var clearProgress = function clearProgress(batchNo) {
-    clearProcess(batchNo).then(function () {
-      console.log('clearProgress', options.tableRef);
-      options.tableRef && options.tableRef.current && options.tableRef.current.onLdQuery();
-    });
-  };
   var fecthFindExcelState = function fecthFindExcelState(_ref2, callback) {
     var strategy = _ref2.strategy,
       batchNo = _ref2.batchNo,
@@ -82,16 +72,13 @@ export var ImportUploadPop = function ImportUploadPop(_ref) {
           }, 500);
         } else {
           setActionStep('finish');
-          clearProgress(batchNo);
         }
       } else {
         callback();
         setActionStep('finish');
-        clearProgress(batchNo);
       }
     }).catch(function () {
       setActionStep('finish');
-      clearProgress(batchNo);
       callback();
     });
   };
@@ -214,12 +201,8 @@ export var ImportUploadPop = function ImportUploadPop(_ref) {
     type: "link"
   }, /*#__PURE__*/React.createElement(Icon, {
     type: "download"
-  }), " \u4E0B\u8F7D\u6A21\u7248")))) : /*#__PURE__*/React.createElement(UploadDoneWrap, null, /*#__PURE__*/React.createElement("p", null, "\u5DF2\u5BFC\u5165\uFF1A", uploadResult.totalCount || 0, "\u6761\uFF0C\u6210\u529F\uFF1A", uploadResult.successCount || 0, "\u6761\uFF0C\u5931\u8D25\uFF1A", uploadResult.failureCount, "\u6761"), uploadResult.failureCount > 0 ?
-  /*#__PURE__*/
-  //1. http://ip/api/fes
-  //2. 循环结束调用clearProgress （batchNo）
-  React.createElement("a", {
-    href: "".concat(window.location.origin).concat(api.API_HOST, "/").concat(mdCode).concat(uploadResult.errorFileUrl),
+  }), " \u4E0B\u8F7D\u6A21\u7248")))) : /*#__PURE__*/React.createElement(UploadDoneWrap, null, /*#__PURE__*/React.createElement("p", null, "\u5DF2\u5BFC\u5165\uFF1A", uploadResult.totalCount || 0, "\u6761\uFF0C\u6210\u529F\uFF1A", uploadResult.successCount || 0, "\u6761\uFF0C\u5931\u8D25\uFF1A", uploadResult.failureCount, "\u6761"), uploadResult.failureCount > 0 ? /*#__PURE__*/React.createElement("a", {
+    href: uploadResult.errorFileUrl,
     download: true
   }, "\u4E0B\u8F7D\u51FA\u9519\u8868\u683C\u4FE1\u606F") : ''));
 };
@@ -227,8 +210,7 @@ export var ImportUploadPop = function ImportUploadPop(_ref) {
 // options: {import: 'templateId' | 'behaviorKey',  importType: false | true}
 export var TopUpload = function TopUpload(_ref4) {
   var options = _ref4.options,
-    moduleCode = _ref4.moduleCode,
-    tableRef = _ref4.tableRef;
+    moduleCode = _ref4.moduleCode;
   var _useState7 = useState(false),
     _useState8 = _slicedToArray(_useState7, 2),
     visible = _useState8[0],
@@ -245,8 +227,7 @@ export var TopUpload = function TopUpload(_ref4) {
     visible: visible,
     setVisible: setVisible,
     options: _objectSpread(_objectSpread({}, options), {}, {
-      moduleCode: moduleCode,
-      tableRef: tableRef
+      moduleCode: moduleCode
     })
   }));
 };

package/es/lowcode/view/lc-components/Table/index.js

@@ -4,14 +4,16 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-var _excluded = ["render"];
+var _excluded = ["render", "dateFormat"];
 import React, { useRef, useImperativeHandle, forwardRef, useCallback } from 'react';
 import PropTypes from 'prop-types';
 import { useMemoizedFn, useCreation, useRequest, useUnmount } from 'ahooks';
 import { isNil, isString, keyBy } from 'lodash';
 import classNames from 'classnames';
+import moment from 'moment';
 import { Modal, recheck } from '@luck-design-biz/base';
 import { useContext } from "../../../engine/provider/ContextProvider";
+import { usePageProxyContext } from "../../../engine/provider/PageProxyProvider";
 import Wrapper from "../Wrapper";
 import { LdGrid, LDActions } from "../../../../index";
 import TopFilter from "./components/TopFilter";
@@ -63,6 +65,7 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
     onGridReady = _ref.onGridReady,
     advance = _ref.advance;
   var ctx = useContext();
+  var ppCtx = usePageProxyContext();
   var apiRef = useRef();
   var wrapperRef = useRef();
   var instanceRef = useCombinedRefs(ref);
@@ -386,6 +389,7 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
         var colsMap = keyBy(cols, 'field');
         var _cols = isNil(fields) ? cols : fields.map(function (_ref4) {
           var render = _ref4.render,
+            dateFormat = _ref4.dateFormat,
             _field = _objectWithoutProperties(_ref4, _excluded);
           return _objectSpread(_objectSpread({}, colsMap[_field.field]), {}, {
             render: render ? function (v, d, i, p) {
@@ -395,6 +399,8 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
                 rowIndex: i,
                 params: p
               }, render.replace(/(function\s*\w*\s*)\([^)]*\)(\s*{)/, '$1()$2'));
+            } : dateFormat ? function (v) {
+              return moment(v).format(dateFormat);
             } : null
           }, _field);
         });
@@ -413,7 +419,6 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
   }, [fields, formatDataSource, getDataPath, columnsRewrite, columnsReset, modelParams, draggable]);
   var renderFunctionArea = useCallback(function () {
     var _topActionGroup$todoL;
-    var _moduleCode = getLDMetaAttr('moduleCode');
     var resultComp = [];
     if (!!(topActionGroup !== null && topActionGroup !== void 0 && (_topActionGroup$todoL = topActionGroup.todoList) !== null && _topActionGroup$todoL !== void 0 && _topActionGroup$todoL.length)) {
       resultComp.push( /*#__PURE__*/React.createElement(LDActions, _extends({}, topActionGroup, {
@@ -431,7 +436,7 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
         apiUrl = _instanceRef$current$2.apiUrl;
       resultComp.push( /*#__PURE__*/React.createElement(TopUpload, {
         apiUrl: apiUrl,
-        moduleCode: _moduleCode,
+        moduleCode: moduleCode,
         options: impexp,
         tableRef: instanceRef
       }));
@@ -442,13 +447,13 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
         _apiUrl = _instanceRef$current$3.apiUrl;
       resultComp.push( /*#__PURE__*/React.createElement(TopExport, {
         apiUrl: _apiUrl,
-        moduleCode: _moduleCode,
+        moduleCode: moduleCode,
         options: impexp,
         tableRef: instanceRef
       }));
     }
     return resultComp;
-  }, [topActionGroup, impexp, moduleCode]);
+  }, [topActionGroup, impexp]);
   var renderFilterArea = useCallback(function () {
     return topFilter ? /*#__PURE__*/React.createElement(TopFilter, {
       filter: topFilter,
@@ -567,7 +572,8 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
     wrapper: wrapperRef,
     wrapperProps: _wrapperProps,
     width: width,
-    height: height
+    height: height,
+    pageProxy: ppCtx
     // _loading={ctx.loading}
     ,
     bordered: bordered,

package/es/lowcode/view/lc-components/Tabs/index.js

@@ -6,9 +6,10 @@ import { useMemoizedFn, useCreation } from 'ahooks';
 import { isNil } from 'lodash';
 import styled from 'styled-components';
 import { Tabs } from 'luck-design/antd';
-import { useContext } from "../../../engine/provider/ContextProvider";
+import { useContext, useRemoteSource } from "../../../engine/provider/ContextProvider";
 import Wrapper from "../Wrapper";
 import RuntimeComp from "../JSX/RuntimeComp";
+import { usePageProxyContext } from "../../../engine/provider/PageProxyProvider";
 import { omitBadProps } from "../../../engine/tools/helper";
 import defaultMeta from "../../../engine/meta/tabs.props.default.json";
 var StyledTabs = styled(Tabs).withConfig({
@@ -32,10 +33,13 @@ var LCTabs = function LCTabs(_ref) {
   var ref = useRef();
   var apiRef = useRef();
   var ctx = useContext();
+  var _useRemoteSource = useRemoteSource(),
+    module = _useRemoteSource.module;
+  var ppCtx = usePageProxyContext();
   var _items = useCreation(function () {
     return items.filter(function (_ref2) {
       var serial = _ref2.serial;
-      return isNil(serial) || ctx.want(serial);
+      return isNil(serial) || ctx.want(serial, module[(ppCtx === null || ppCtx === void 0 ? void 0 : ppCtx.proxyCode) || 'master'].resources);
     });
   }, [items]);
   var _useState = useState(function () {

package/es/lowcode/view/lc-components/Tree/index.js

@@ -11,6 +11,7 @@ import { isNil, keyBy } from 'lodash';
 import { Modal, recheck, IconFont } from '@luck-design-biz/base';
 import { suid } from '@luck-design-biz/base/utils';
 import { useContext } from "../../../engine/provider/ContextProvider";
+import { usePageProxyContext } from "../../../engine/provider/PageProxyProvider";
 import Wrapper from "../Wrapper";
 import { LdTree } from "../../../../index";
 import useCombinedRefs from "../../../engine/tools/useCombinedRefs";
@@ -44,6 +45,7 @@ var LCTree = /*#__PURE__*/forwardRef(function (_ref, ref) {
     defaultSelect = _ref.defaultSelect,
     props = _objectWithoutProperties(_ref, _excluded);
   var ctx = useContext();
+  var ppCtx = usePageProxyContext();
   var apiRef = useRef();
   var wrapperRef = useRef();
   var instanceRef = useCombinedRefs(ref);
@@ -160,6 +162,7 @@ var LCTree = /*#__PURE__*/forwardRef(function (_ref, ref) {
     ref: instanceRef,
     wrapper: wrapperRef,
     wrapperProps: _wrapperProps,
+    pageProxy: ppCtx,
     className: classNames(styles['lc-component-tree'], _defineProperty({}, className, !!className)),
     dataSetKey: dataset === null || dataset === void 0 ? void 0 : dataset.code,
     showLine: showLine,

package/es/lowcode/view/lc-components/Wrapper.js

@@ -4,7 +4,8 @@ import React, { useEffect } from 'react';
 import { useLatest, useCreation } from 'ahooks';
 import { omit } from 'lodash';
 import { useContext, useGet, modifyNode, getLevelNodes as _getLevelNodes, getSelfAndParent } from "../../engine/provider/ContextProvider";
-import { LC_COMPONENT_UNIT_KEY, LC_COMPONENT_UNIT, RUNTIME } from "../../constants";
+import { usePageProxyContext } from "../../engine/provider/PageProxyProvider";
+import { LC_COMPONENT_UNIT_KEY, LC_COMPONENT_UNIT, RUNTIME, LC_PAGEPROXY_KEY } from "../../constants";
 import DragDropWrapper from "../../painter/components/DragDrop/DragDropWrapper";
 var LCWrapper = function LCWrapper(_ref) {
   var id = _ref.id,
@@ -13,6 +14,7 @@ var LCWrapper = function LCWrapper(_ref) {
     getTargetDom = _ref.getTargetDom,
     api = _ref.api;
   var ctx = useContext();
+  var ppCtx = usePageProxyContext();
   var selfData = useGet({
     id: id
   });
@@ -35,6 +37,7 @@ var LCWrapper = function LCWrapper(_ref) {
     ctx._register(id, new Proxy({
       id: id,
       meta: omit(meta, ['props', 'css', 'advance']),
+      $pp: ppCtx,
       set: function set(prop, value, toDom) {
         if (toDom === true) {
           if (['id', LC_COMPONENT_UNIT_KEY].includes(prop)) {
@@ -65,6 +68,9 @@ var LCWrapper = function LCWrapper(_ref) {
     if (dom) {
       dom.setAttribute('id', id);
       dom.setAttribute(LC_COMPONENT_UNIT_KEY, LC_COMPONENT_UNIT);
+      if (ppCtx) {
+        dom.setAttribute(LC_PAGEPROXY_KEY, ppCtx.id);
+      }
     }
     ctx.$publisher(ctx.topics.COMPONENT_MOUNT, {
       id: id

package/es/services.js

@@ -2,6 +2,7 @@ import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import { request } from '@luck-design-biz/base/utils';
 import api from "@/services/ApiConfig";
+import { stringify } from 'querystring';
 export function readModlue(_x) {
   return _readModlue.apply(this, arguments);
 }
@@ -21,22 +22,39 @@ function _readModlue() {
   }));
   return _readModlue.apply(this, arguments);
 }
-export function noAuthTransformCode(_x2) {
-  return _noAuthTransformCode.apply(this, arguments);
+export function readUI(_x2) {
+  return _readUI.apply(this, arguments);
 }
-function _noAuthTransformCode() {
-  _noAuthTransformCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
+function _readUI() {
+  _readUI = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(get) {
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          return _context2.abrupt("return", request("".concat(api.BASE_HOST, "/page/option/noAuthTransformCode"), {
-            params: params
-          }));
+          return _context2.abrupt("return", request("".concat(api.LUCKDA_HOST, "/ui/builder/noAuthFetchModuleDataSetUI?").concat(stringify(get))));
         case 1:
         case "end":
           return _context2.stop();
       }
     }, _callee2);
   }));
+  return _readUI.apply(this, arguments);
+}
+export function noAuthTransformCode(_x3) {
+  return _noAuthTransformCode.apply(this, arguments);
+}
+function _noAuthTransformCode() {
+  _noAuthTransformCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          return _context3.abrupt("return", request("".concat(api.BASE_HOST, "/page/option/noAuthTransformCode"), {
+            params: params
+          }));
+        case 1:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  }));
   return _noAuthTransformCode.apply(this, arguments);
 }

package/es/utils/action.js

@@ -2,7 +2,7 @@ import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 // 行为请求同一接口
-import { fetchCallBehavior } from "../lowcode/constants/api-url";
+import { fetchCallBehavior, readCallBehavior } from "../lowcode/constants/api-url";
 export function behaviorCall() {
   return _behaviorCall.apply(this, arguments);
 }
@@ -28,4 +28,5 @@ function _behaviorCall() {
     }, _callee);
   }));
   return _behaviorCall.apply(this, arguments);
-}
+}
+export { readCallBehavior };

package/es/utils/form.js

@@ -1,3 +1,4 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
@@ -22,6 +23,7 @@ import * as formItemUtils from "../helper/FromItems";
  * 根据动态表单配置项生成formItem
  * @param {动态表单配置项} props
  * @param {自定义动态表单配置项} customProps
+ * @param {formUi配置项} formUiPreset
  * @returns <BasicForm name='' ... />
  */
 export function getFormItem() {
@@ -30,10 +32,11 @@ export function getFormItem() {
     property = _ref.property,
     props = _objectWithoutProperties(_ref, _excluded);
   var customProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var formUiPreset = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   if (!property) return /*#__PURE__*/React.createElement(React.Fragment, null);
   if (property === 'sint' || property === 'number' || property === 'long') props.opt_decimal = 0;
   var comType = comName || defaultComName[property];
-  var _translator = translator(props),
+  var _translator = translator(_objectSpread(_objectSpread({}, props), formUiPreset)),
     name = _translator.name,
     translateProps = _objectWithoutProperties(_translator, _excluded2);
   var _merge = merge(
@@ -74,7 +77,7 @@ export var formItemDataFormat = function formItemDataFormat() {
     var translatorProps = translator(props);
     var name = translatorProps.name,
       dataFormat = translatorProps.dataFormat;
-    switch (comName || defaultComName[property]) {
+    if (values[name] || values["".concat(name, "_virtual")]) switch (comName || defaultComName[property]) {
       case 'date':
         result[name] = values["".concat(name, "_virtual")] ? moment(values["".concat(name, "_virtual")], 'YYYY-MM-DD HH:mm:ss') : undefined;
         break;
@@ -202,8 +205,12 @@ export var dataFormat = function dataFormat() {
 /**
  *
  * @param formType
+ * @param comName
+ * @param property
  * @param props
+ * @param formItemRewrite
  * @param customProps
+ * @param gridUiPreset
  * @returns {*&{field: *, editable: (false|{required: *}), renderBasicFormItem: ((function(): (*))|*), title, render: *}}
  */
 export var getFormColumn = function getFormColumn() {
@@ -216,9 +223,10 @@ export var getFormColumn = function getFormColumn() {
   var _ref5 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
     formItemRewrite = _ref5.formItemRewrite,
     customProps = _objectWithoutProperties(_ref5, _excluded7);
+  var gridUiPreset = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   var formItemType = comName || defaultComName[property];
   if (formItemType === 'radio') formItemType = 'select';
-  var _translator2 = translator(props),
+  var _translator2 = translator(_objectSpread(_objectSpread({}, props), gridUiPreset)),
     name = _translator2.name,
     translateProps = _objectWithoutProperties(_translator2, _excluded8);
   var _merge2 = merge(
@@ -229,7 +237,7 @@ export var getFormColumn = function getFormColumn() {
     _props = _objectWithoutProperties(_merge2, _excluded9);
   var columnRender = getColumnRender(name, formItemType, _props);
   if (formType !== 'writer') _props.name = name;
-  return _objectSpread(_objectSpread({
+  return _objectSpread(_objectSpread(_objectSpread({}, _props), {}, {
     title: translateProps.label,
     editable: formType === 'writer' && {
       required: _props.required || ((_props$config = _props.config) === null || _props$config === void 0 ? void 0 : _props$config.required)
@@ -259,4 +267,29 @@ export var getFormColumn = function getFormColumn() {
     field: name,
     exportField: getExportField(name, formItemType, _props)
   });
+};
+
+/**
+ * 合并两个数组，并且数据顺序以arr2为准
+ * @param arr1
+ * @param arr2
+ * @param rowKey
+ */
+export var mergeAndSort = function mergeAndSort(arr1, arr2, rowKey) {
+  // 将a2转换为一个Map，便于快速查找
+  var a2Map = new Map(arr2.map(function (item) {
+    return [item[rowKey], item];
+  }));
+  // 创建一个新的数组，按a2的顺序填充元素，同时包含a1中不在a2中的元素
+  var mergedArray = arr2.map(function (item) {
+    var a1Item = arr1.find(function (a1) {
+      return a1[rowKey] === item[rowKey];
+    });
+    return a1Item ? _objectSpread(_objectSpread({}, item), a1Item) : item;
+  });
+  // 将a1中未出现在a2中的元素追加到合并后的数组末尾
+  mergedArray.push.apply(mergedArray, _toConsumableArray(arr1.filter(function (a1Item) {
+    return !a2Map.has(a1Item[rowKey]);
+  })));
+  return mergedArray;
 };

package/es/utils/grid.js

@@ -122,12 +122,13 @@ export var getGridColumn = function getGridColumn() {
   var customProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var isTreeGrid = arguments.length > 2 ? arguments[2] : undefined;
   var writable = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  var gridUiPreset = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
   var comType = comName || defaultComName[property];
   var _props$isVirtual = props.isVirtual,
     isVirtual = _props$isVirtual === void 0 ? false : _props$isVirtual,
     _props$extra = props.extra,
     extra = _props$extra === void 0 ? '{}' : _props$extra;
-  var _translator = translator(props),
+  var _translator = translator(_objectSpread(_objectSpread({}, props), gridUiPreset)),
     name = _translator.name,
     translateProps = _objectWithoutProperties(_translator, _excluded2);
   var _merge = merge(translateProps, formatCustomProps(comType, customProps)),