@luck-design-biz/luckda 1.0.2-2 → 1.0.2-20temp

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

@@ -54,7 +54,7 @@ export var ImportUploadPop = function ImportUploadPop(_ref) {
       moduleCode: moduleCode,
       behaviorKey: behaviorKey,
       templateId: templateId,
-      reportType: "import"
+      reportType: 'import'
     };
     getFindexcelstate(_fetchExcelStatePrefix, _fetchExcelStateParams).then(function (response) {
       if (response.code === 1) {
@@ -147,7 +147,7 @@ export var ImportUploadPop = function ImportUploadPop(_ref) {
     };
   }();
   return /*#__PURE__*/React.createElement(PopWindow, {
-    title: "上传excel文件",
+    title: '上传excel文件',
     mode: "modal",
     size: "mini",
     visible: visible,
@@ -184,11 +184,14 @@ export var ImportUploadPop = function ImportUploadPop(_ref) {
       accept: '.xls,.xlsx,.xlt,.xlsm',
       name: 'fileObj',
       beforeUpload: function beforeUpload(file) {
-        var suffix = lowerCase(last(split(file.name, '.')));
-        if (!includes(['xls', 'xlsx', 'xlt', 'xlsm'], suffix)) {
-          message.info('禁止上传的文件类型');
-          return false;
-        }
+        return new Promise(function (resolve, reject) {
+          var suffix = lowerCase(last(split(file.name, '.')));
+          if (!includes(['xls', 'xlsx', 'xlt', 'xlsm'], suffix)) {
+            reject(new Error('禁止上传的文件类型'));
+          } else {
+            resolve(true);
+          }
+        });
       }
     }
   })), templateUrl && /*#__PURE__*/React.createElement(DownloadLink, null, /*#__PURE__*/React.createElement("a", {
@@ -248,7 +251,7 @@ export var TopExport = function TopExport(_ref5) {
     var _fetchExcelStateParams = {
       moduleCode: moduleCode,
       behaviorKey: behaviorKey,
-      reportType: "export"
+      reportType: 'export'
     };
     getFindexcelstate(_fetchExcelStatePrefix, _fetchExcelStateParams).then(function (response) {
       if (response.code === 1) {
@@ -299,7 +302,7 @@ export var TopExport = function TopExport(_ref5) {
               _exportExcelParams = {
                 moduleCode: moduleCode,
                 behaviorKey: behaviorKey,
-                reportType: "export"
+                reportType: 'export'
               };
               _exportExcelPrefix = "/".concat(strategy);
               _context2.next = 10;
@@ -330,14 +333,14 @@ export var TopExport = function TopExport(_ref5) {
                   labels.push(column.colDef.headerName);
                   fieldInfo.push({
                     width: column.actualWidth,
-                    fieldNm: column.colId
+                    fieldNm: column.colDef.exportField || column.colId
                   });
                 }
               });
               defaultExcelParams = {
-                bgColor: "#69b1ff",
+                bgColor: '#69b1ff',
                 dataUrl: "".concat(window.location.origin, "/api").concat(apiUrl).concat(joiner, "token=").concat(window.cookie.get(window.appConfig.authSaveKey)),
-                excelName: "download.xls",
+                excelName: 'download.xls',
                 fieldInfo: fieldInfo,
                 islock: false,
                 labels: labels === null || labels === void 0 ? void 0 : labels.join(),
@@ -345,7 +348,7 @@ export var TopExport = function TopExport(_ref5) {
               };
               _exportExcelParams2 = _objectSpread({
                 moduleCode: moduleCode,
-                reportType: "export"
+                reportType: 'export'
               }, defaultExcelParams);
               _exportExcelPrefix2 = "/".concat(strategy);
               _context2.next = 23;

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);
@@ -275,7 +278,7 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
                   labels.push(column.colDef.headerName);
                   fieldInfo.push({
                     width: column.actualWidth,
-                    fieldNm: column.colId
+                    fieldNm: column.colDef.exportField || column.colId
                   });
                 }
               });
@@ -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);
         });
@@ -567,7 +573,9 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
     wrapperProps: _wrapperProps,
     width: width,
     height: height,
-    _loading: ctx.loading,
+    pageProxy: ppCtx
+    // _loading={ctx.loading}
+    ,
     bordered: bordered,
     className: classNames(_defineProperty({}, className, !!className)),
     ldId: id,

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

@@ -182,7 +182,6 @@
             "name": "默认选中行",
             "type": "_JSEditor",
             "defaultCode": "function getRowDefaultSelected(data, node) { \n return false; \n}",
-            "mustConfirm": true,
             "wrapper": "collapse",
             "wrapperProps": {
               "suppressIcon": true
@@ -193,7 +192,6 @@
             "name": "行是否可选",
             "type": "_JSEditor",
             "defaultCode": "function getRowSelectable(data, node) { \n return true; \n}",
-            "mustConfirm": true,
             "wrapper": "collapse",
             "wrapperProps": {
               "suppressIcon": true
@@ -322,7 +320,6 @@
             "name": "格式化数据",
             "type": "_JSEditor",
             "defaultCode": "function formatDataSource(list, detail) { \n return []; \n}",
-            "mustConfirm": true,
             "wrapper": "collapse",
             "wrapperProps": {
               "suppressIcon": true
@@ -333,7 +330,6 @@
             "name": "构建树层级",
             "type": "_JSEditor",
             "defaultCode": "function getDataPath(data) { \n return []; \n}",
-            "mustConfirm": true,
             "wrapper": "collapse",
             "wrapperProps": {
               "suppressIcon": true
@@ -345,7 +341,6 @@
             "desc": "自定义某些表格列",
             "type": "_JSEditor",
             "defaultCode": "function columnsRewrite(columns) { \n return columns; \n}",
-            "mustConfirm": true,
             "wrapper": "collapse",
             "wrapperProps": {
               "suppressIcon": true
@@ -357,7 +352,6 @@
             "desc": "完全自定义所有表格列，优先级大于columnsRewrite",
             "type": "_JSEditor",
             "defaultCode": "function columnsReset(columns) { \n return columns; \n}",
-            "mustConfirm": true,
             "wrapper": "collapse",
             "wrapperProps": {
               "suppressIcon": true
@@ -368,7 +362,6 @@
             "name": "model参数",
             "type": "_JSEditor",
             "defaultCode": "function getModelParams() { \n return {}; \n}",
-            "mustConfirm": true,
             "wrapper": "collapse",
             "wrapperProps": {
               "suppressIcon": true

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/Tabs/meta.json

@@ -82,7 +82,7 @@
       "name": "tab bar 上额外的元素",
       "type": "_JSEditor",
       "defaultCode": "function Component() { \n return <div>extra</div>; \n}",
-      "mustConfirm": true,
+      "isjsx": true,
       "wrapper": "collapse",
       "wrapperProps": { "suppressIcon": true }
     }

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/Tree/meta.json

@@ -204,7 +204,6 @@
           "desc": "返回默认选中的数据主键",
           "type": "_JSEditor",
           "defaultCode": "function defaultSelect(treeData) { \n return null; \n}",
-          "mustConfirm": true,
           "wrapper": "collapse",
           "wrapperProps": {
             "suppressIcon": true
@@ -265,7 +264,6 @@
             "name": "节点是否有复选框",
             "type": "_JSEditor",
             "defaultCode": "function treeNodeCheckable(item) { \n return true; \n}",
-            "mustConfirm": true,
             "wrapper": "collapse",
             "wrapperProps": {
               "suppressIcon": true
@@ -276,7 +274,6 @@
             "name": "节点复选框是否禁用",
             "type": "_JSEditor",
             "defaultCode": "function treeNodeDisableCheckbox(item) { \n return false; \n}",
-            "mustConfirm": true,
             "wrapper": "collapse",
             "wrapperProps": {
               "suppressIcon": true
@@ -287,7 +284,6 @@
             "name": "节点是否禁用",
             "type": "_JSEditor",
             "defaultCode": "function treeNodeDisable(item) { \n return false; \n}",
-            "mustConfirm": true,
             "wrapper": "collapse",
             "wrapperProps": {
               "suppressIcon": true
@@ -298,7 +294,7 @@
             "name": "节点定制渲染",
             "type": "_JSEditor",
             "defaultCode": "function onTreeNodeRender(title, item) { \n return title; \n}",
-            "mustConfirm": true,
+            "isjsx": true,
             "wrapper": "collapse",
             "wrapperProps": {
               "suppressIcon": true

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)) {
@@ -53,6 +56,8 @@ var LCWrapper = function LCWrapper(_ref) {
       get: function get(target, property, receiver) {
         if (property === 'api') {
           return api ? _objectSpread(_objectSpread({}, _api), api.current) : _api;
+        } else if (property === 'name') {
+          return _selfData.current.props.name;
         }
         return Reflect.get(target, property, receiver);
       }
@@ -63,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

@@ -21,22 +21,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/upload/FilesWall/index.js

@@ -8,9 +8,9 @@ import React, { forwardRef, useEffect, useImperativeHandle } from 'react';
 import { Button, Checkbox, Dropdown, Icon, Modal, Upload } from 'luck-design/antd';
 import { useSetState } from 'ahooks';
 import PropTypes from 'prop-types';
-import { canPreview, formatMessage, patchDownload, request, showPop } from '@luck-design-biz/base/utils';
-import { getDvaApp } from 'umi';
-import { last, lowerCase, split } from 'lodash';
+import { canPreview, formatMessage, patchDownload, request, showPop, string2ASCII } from '@luck-design-biz/base/utils';
+import { getDvaApp, history, getCreateHistoryOptions } from 'umi';
+import { last, lowerCase, split, replace } from 'lodash';
 import { Box, Permission, PermissionGroup } from 'luck-design';
 import styles from "./index.less";
 
@@ -150,12 +150,22 @@ var FilesWall = /*#__PURE__*/forwardRef(function (props, ref) {
     });
     onUploadChange && onUploadChange(e);
   };
+  var headers = {};
+  var token = window.cookie.get(window.appConfig.authSaveKey);
+  if (token) headers.Authorization = "Bearer ".concat(token);
+  var ticket = history.location.query.ticket;
+  if (ticket) headers.ticket = string2ASCII(ticket);
+  if (window.__POWERED_BY_QIANKUN__) {
+    var pathname = replace(window.location.pathname, getCreateHistoryOptions().basename, '');
+    headers['Mf-Path'] = pathname.length > 0 ? pathname : '/';
+    headers['Sys-Code'] = getCreateHistoryOptions().basename.split('/')[1];
+    if (window.routeCode) headers['Menu-Code'] = window.routeCode;
+  }
+  ;
   var formItemProps = _objectSpread(_objectSpread({}, rest), {}, {
     action: getUrl('upload'),
     // 上传地址
-    headers: {
-      Authorization: "Bearer ".concat(window.cookie.get(window.appConfig.authSaveKey))
-    },
+    headers: headers,
     // 请求头
     name: 'files',
     multiple: true,

package/es/upload/Form/gridForm.js

@@ -4,15 +4,15 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["formId", "formRef", "showNote", "operates", "loading", "uploadUrl", "supportTypes", "forbiddenTypes", "beforeUpload", "formMode", "onUploadChange", "zipName", "resetActions", "getUrl", "wrapperRef"];
 import React, { useState, useRef, forwardRef } from 'react';
-import { getDvaApp } from 'umi';
+import { getDvaApp, history, getCreateHistoryOptions } from 'umi';
 import { useMemoizedFn, useCreation } from 'ahooks';
 import { Button, Upload, Tooltip, Icon } from 'luck-design/antd';
 import moment from 'moment';
-import { last } from 'lodash';
+import { last, replace } from 'lodash';
 import { BasicForm, BasicFormItem, PopWindow } from 'luck-design';
 import api from "@/services/ApiConfig";
 import { FormBtn, GridForm } from '@luck-design-biz/base/FormList';
-import { byteConvert, formatMessage, beforeUpload as _beforeUpload2, getSupportUploadTypes, patchDownloadZip, showPop, request, canPreview } from '@luck-design-biz/base/utils';
+import { byteConvert, formatMessage, beforeUpload as _beforeUpload2, getSupportUploadTypes, patchDownloadZip, showPop, request, canPreview, string2ASCII } from '@luck-design-biz/base/utils';
 var columns = [{
   field: 'name',
   title: '附件名称'
@@ -198,12 +198,22 @@ var UploadGridForm = function UploadGridForm(_ref) {
     }
   });
   var renderUploadTopLeft = useMemoizedFn(function () {
+    var headers = {};
+    var token = window.cookie.get(window.appConfig.authSaveKey);
+    if (token) headers.Authorization = "Bearer ".concat(token);
+    var ticket = history.location.query.ticket;
+    if (ticket) headers.ticket = string2ASCII(ticket);
+    if (window.__POWERED_BY_QIANKUN__) {
+      var pathname = replace(window.location.pathname, getCreateHistoryOptions().basename, '');
+      headers['Mf-Path'] = pathname.length > 0 ? pathname : '/';
+      headers['Sys-Code'] = getCreateHistoryOptions().basename.split('/')[1];
+      if (window.routeCode) headers['Menu-Code'] = window.routeCode;
+    }
+    ;
     var formItemProps = {
       action: uploadUrl || getUrl('upload'),
       // 上传地址
-      headers: {
-        Authorization: "Bearer ".concat(window.cookie.get(window.appConfig.authSaveKey))
-      },
+      headers: headers,
       // 请求头
       name: 'files',
       multiple: true,

package/es/upload/FormItem/index.js

@@ -3,8 +3,10 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["uploadUrl", "moduleCode", "bucket", "tag", "note", "config", "supportTypes", "forbiddenTypes", "children", "dataFormat", "listType"];
 import React from 'react';
+import { replace } from 'lodash';
 import { BasicFormItem } from 'luck-design';
-import { formatMessage, beforeUpload as _beforeUpload, getSupportUploadTypes } from '@luck-design-biz/base/utils';
+import { history, getCreateHistoryOptions } from 'umi';
+import { formatMessage, beforeUpload as _beforeUpload, getSupportUploadTypes, string2ASCII } from '@luck-design-biz/base/utils';
 
 /**
  * 表单类型富文本上传
@@ -45,6 +47,18 @@ function buildComponent(props) {
     return "".concat(window.appConfig.OSS_HOST_V3, "?moduleCode=").concat(moduleCode, "&behaviorKey=").concat(behaviorKey, "&bucket=").concat(bucket, "&tag=").concat(tag, "&note=").concat(note);
   };
   var supportUploadTypes = getSupportUploadTypes(forbiddenTypes, supportTypes);
+  var headers = {};
+  var token = window.cookie.get(window.appConfig.authSaveKey);
+  if (token) headers.Authorization = "Bearer ".concat(token);
+  var ticket = history.location.query.ticket;
+  if (ticket) headers.ticket = string2ASCII(ticket);
+  if (window.__POWERED_BY_QIANKUN__) {
+    var pathname = replace(window.location.pathname, getCreateHistoryOptions().basename, '');
+    headers['Mf-Path'] = pathname.length > 0 ? pathname : '/';
+    headers['Sys-Code'] = getCreateHistoryOptions().basename.split('/')[1];
+    if (window.routeCode) headers['Menu-Code'] = window.routeCode;
+  }
+  ;
   return /*#__PURE__*/React.createElement(BasicFormItem, _extends({
     extra: "".concat(formatMessage({
       id: 'app.upload.supportUpload',
@@ -62,9 +76,7 @@ function buildComponent(props) {
       }),
       action: uploadUrl || getUrl('upload'),
       // 上传地址
-      headers: {
-        Authorization: "Bearer ".concat(window.cookie.get(window.appConfig.authSaveKey))
-      },
+      headers: headers,
       // 请求头
       name: 'files',
       // 发送到后台的文件名

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";
@@ -15,13 +16,14 @@ import moment from 'moment';
 import { capitalize, merge, transform, isArray, omit, isNil, clone, cloneDeep } from 'lodash';
 import api from "@/services/ApiConfig";
 import { defaultComName, translator, splitStrToObj, formatCustomProps } from "../helper/form";
-import { getColumnRender } from "./grid";
+import { getColumnRender, getExportField } from "./grid";
 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(
@@ -194,7 +197,7 @@ export var dataFormat = function dataFormat() {
       default:
         result[name] = values[name];
     }
-    values = omit(values, [name, "".concat(name, "_cvt")]);
+    values = omit(values, [name, "".concat(name, "_virtual")]);
   }, {});
   return _objectSpread(_objectSpread({}, values), data);
 };
@@ -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)
@@ -256,6 +264,32 @@ export var getFormColumn = function getFormColumn() {
         key: name
       }, _props));
     },
-    field: name
+    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;
 };