@luck-design-biz/luckda 1.0.2-15 → 1.0.2-16

package/es/lowcode/engine/provider/ContextProvider/index.js

@@ -10,7 +10,6 @@ import { useLDEventBus } from "../EventBusProvider";
 import RemoteSourceProvider, { RemoteSourceContext } from "../RemoteSourceProvider";
 import usePageVar from "./usePageVar";
 import useTodo from "./useTodo";
-import { getModuleData } from "./usePageDataStore";
 import API_PREFIX from "@/services/ApiConfig";
 import { getBehaviorUrl } from "../../../constants/api-url";
 import * as topics from "../../../constants/event-topics";
@@ -101,10 +100,9 @@ export default (function (_ref) {
     if (!_parentId) return null;
     return compMap.get(_parentId);
   });
-  var want = useMemoizedFn(function (wanted) {
-    var _getModuleData;
+  var want = useMemoizedFn(function (wanted, _serials) {
     if (isNil(wanted)) return false;
-    var serials = ((_getModuleData = getModuleData()) === null || _getModuleData === void 0 ? void 0 : _getModuleData.resources) || [];
+    var serials = _serials || [];
     var serialMap = serials.reduce(function (acc, cur, index) {
       if (!acc[cur]) {
         acc[cur] = Math.pow(2, index);

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

@@ -278,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
                   });
                 }
               });

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/utils/form.js

@@ -15,7 +15,7 @@ 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";
 
 /**
@@ -194,7 +194,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);
 };
@@ -256,6 +256,7 @@ export var getFormColumn = function getFormColumn() {
         key: name
       }, _props));
     },
-    field: name
+    field: name,
+    exportField: getExportField(name, formItemType, _props)
   });
 };

package/es/utils/grid.js

@@ -109,6 +109,11 @@ var getAlign = function getAlign(extraData, alignClass) {
       return 'left';
   }
 };
+export var getExportField = function getExportField(name, type, props) {
+  var _props$config2;
+  if (type === 'number' && (_props$config2 = props.config) !== null && _props$config2 !== void 0 && _props$config2.precision || ['date', 'user', 'select', 'group', 'region', 'upload'].includes(type)) return "".concat(name, "_virtual");
+  return;
+};
 export var getGridColumn = function getGridColumn() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     comName = _ref.comName,
@@ -132,6 +137,7 @@ export var getGridColumn = function getGridColumn() {
   var _extra = JSON.parse(extra) || {};
   var data = _objectSpread(_objectSpread({}, _props), {}, {
     field: name,
+    exportField: getExportField(name, comName || defaultComName[property], _props),
     title: _props.fieldAliasName || _props.label,
     headerAlign: _props.headerAlign || getAlign(_extra, 'sheading_alignment_virtual'),
     align: _props.align || getAlign(_extra, 'scell_alignment_virtual'),
@@ -144,8 +150,8 @@ export var getGridColumn = function getGridColumn() {
     data.filter = filter;
     data.filterParams = filterParams;
   } else if (!isTreeGrid && !isVirtual) {
-    var _props$config2;
-    if ((_props.mode || ((_props$config2 = _props.config) === null || _props$config2 === void 0 ? void 0 : _props$config2.mode)) === 'multiple') {
+    var _props$config3;
+    if ((_props.mode || ((_props$config3 = _props.config) === null || _props$config3 === void 0 ? void 0 : _props$config3.mode)) === 'multiple') {
       data.field = "".concat(name, "_virtual");
       data.filter = 'text';
       return data;

package/lib/lowcode/engine/provider/ContextProvider/index.js

@@ -23,6 +23,11 @@ var _EventBusProvider = require("../EventBusProvider");
 var _RemoteSourceProvider = _interopRequireWildcard(require("../RemoteSourceProvider"));
 var _usePageVar2 = _interopRequireDefault(require("./usePageVar"));
 var _useTodo3 = _interopRequireDefault(require("./useTodo"));
+var _ApiConfig = _interopRequireDefault(require("@/services/ApiConfig"));
+var _apiUrl = require("../../../constants/api-url");
+var topics = _interopRequireWildcard(require("../../../constants/event-topics"));
+var utils = _interopRequireWildcard(require("./utils"));
+var router = _interopRequireWildcard(require("./router"));
 var _usePageDataStore = require("./usePageDataStore");
 Object.keys(_usePageDataStore).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -35,11 +40,6 @@ Object.keys(_usePageDataStore).forEach(function (key) {
     }
   });
 });
-var _ApiConfig = _interopRequireDefault(require("@/services/ApiConfig"));
-var _apiUrl = require("../../../constants/api-url");
-var topics = _interopRequireWildcard(require("../../../constants/event-topics"));
-var utils = _interopRequireWildcard(require("./utils"));
-var router = _interopRequireWildcard(require("./router"));
 var Context = exports.Context = /*#__PURE__*/(0, _react.createContext)(null);
 var useContext = exports.useContext = function useContext() {
   return (0, _react.useContext)(Context);
@@ -124,10 +124,9 @@ var _default = exports.default = function _default(_ref) {
     if (!_parentId) return null;
     return compMap.get(_parentId);
   });
-  var want = (0, _ahooks.useMemoizedFn)(function (wanted) {
-    var _getModuleData;
+  var want = (0, _ahooks.useMemoizedFn)(function (wanted, _serials) {
     if ((0, _lodash.isNil)(wanted)) return false;
-    var serials = ((_getModuleData = (0, _usePageDataStore.getModuleData)()) === null || _getModuleData === void 0 ? void 0 : _getModuleData.resources) || [];
+    var serials = _serials || [];
     var serialMap = serials.reduce(function (acc, cur, index) {
       if (!acc[cur]) {
         acc[cur] = Math.pow(2, index);

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

@@ -62,7 +62,7 @@ var ImportUploadPop = exports.ImportUploadPop = function ImportUploadPop(_ref) {
       moduleCode: moduleCode,
       behaviorKey: behaviorKey,
       templateId: templateId,
-      reportType: "import"
+      reportType: 'import'
     };
     (0, _apiUrl.getFindexcelstate)(_fetchExcelStatePrefix, _fetchExcelStateParams).then(function (response) {
       if (response.code === 1) {
@@ -155,7 +155,7 @@ var ImportUploadPop = exports.ImportUploadPop = function ImportUploadPop(_ref) {
     };
   }();
   return /*#__PURE__*/_react.default.createElement(_luckDesign.PopWindow, {
-    title: "上传excel文件",
+    title: '上传excel文件',
     mode: "modal",
     size: "mini",
     visible: visible,
@@ -192,11 +192,14 @@ var ImportUploadPop = exports.ImportUploadPop = function ImportUploadPop(_ref) {
       accept: '.xls,.xlsx,.xlt,.xlsm',
       name: 'fileObj',
       beforeUpload: function beforeUpload(file) {
-        var suffix = (0, _lodash.lowerCase)((0, _lodash.last)((0, _lodash.split)(file.name, '.')));
-        if (!(0, _lodash.includes)(['xls', 'xlsx', 'xlt', 'xlsm'], suffix)) {
-          _antd.message.info('禁止上传的文件类型');
-          return false;
-        }
+        return new Promise(function (resolve, reject) {
+          var suffix = (0, _lodash.lowerCase)((0, _lodash.last)((0, _lodash.split)(file.name, '.')));
+          if (!(0, _lodash.includes)(['xls', 'xlsx', 'xlt', 'xlsm'], suffix)) {
+            reject(new Error('禁止上传的文件类型'));
+          } else {
+            resolve(true);
+          }
+        });
       }
     }
   })), templateUrl && /*#__PURE__*/_react.default.createElement(DownloadLink, null, /*#__PURE__*/_react.default.createElement("a", {
@@ -256,7 +259,7 @@ var TopExport = exports.TopExport = function TopExport(_ref5) {
     var _fetchExcelStateParams = {
       moduleCode: moduleCode,
       behaviorKey: behaviorKey,
-      reportType: "export"
+      reportType: 'export'
     };
     (0, _apiUrl.getFindexcelstate)(_fetchExcelStatePrefix, _fetchExcelStateParams).then(function (response) {
       if (response.code === 1) {
@@ -307,7 +310,7 @@ var TopExport = exports.TopExport = function TopExport(_ref5) {
               _exportExcelParams = {
                 moduleCode: moduleCode,
                 behaviorKey: behaviorKey,
-                reportType: "export"
+                reportType: 'export'
               };
               _exportExcelPrefix = "/".concat(strategy);
               _context2.next = 10;
@@ -338,14 +341,14 @@ var TopExport = exports.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(),
@@ -353,7 +356,7 @@ var TopExport = exports.TopExport = function TopExport(_ref5) {
               };
               _exportExcelParams2 = (0, _objectSpread2.default)({
                 moduleCode: moduleCode,
-                reportType: "export"
+                reportType: 'export'
               }, defaultExcelParams);
               _exportExcelPrefix2 = "/".concat(strategy);
               _context2.next = 23;

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

@@ -286,7 +286,7 @@ var LCTable = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
                   labels.push(column.colDef.headerName);
                   fieldInfo.push({
                     width: column.actualWidth,
-                    fieldNm: column.colId
+                    fieldNm: column.colDef.exportField || column.colId
                   });
                 }
               });

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

@@ -17,6 +17,7 @@ var _antd = require("luck-design/antd");
 var _ContextProvider = require("../../../engine/provider/ContextProvider");
 var _Wrapper = _interopRequireDefault(require("../Wrapper"));
 var _RuntimeComp = _interopRequireDefault(require("../JSX/RuntimeComp"));
+var _PageProxyProvider = require("../../../engine/provider/PageProxyProvider");
 var _helper = require("../../../engine/tools/helper");
 var _tabsPropsDefault = _interopRequireDefault(require("../../../engine/meta/tabs.props.default.json"));
 var StyledTabs = (0, _styledComponents.default)(_antd.Tabs).withConfig({
@@ -40,10 +41,13 @@ var LCTabs = function LCTabs(_ref) {
   var ref = (0, _react.useRef)();
   var apiRef = (0, _react.useRef)();
   var ctx = (0, _ContextProvider.useContext)();
+  var _useRemoteSource = (0, _ContextProvider.useRemoteSource)(),
+    module = _useRemoteSource.module;
+  var ppCtx = (0, _PageProxyProvider.usePageProxyContext)();
   var _items = (0, _ahooks.useCreation)(function () {
     return items.filter(function (_ref2) {
       var serial = _ref2.serial;
-      return (0, _lodash.isNil)(serial) || ctx.want(serial);
+      return (0, _lodash.isNil)(serial) || ctx.want(serial, module[(ppCtx === null || ppCtx === void 0 ? void 0 : ppCtx.proxyCode) || 'master'].resources);
     });
   }, [items]);
   var _useState = (0, _react.useState)(function () {

package/lib/utils/form.js

@@ -202,7 +202,7 @@ var dataFormat = exports.dataFormat = function dataFormat() {
       default:
         result[name] = values[name];
     }
-    values = (0, _lodash.omit)(values, [name, "".concat(name, "_cvt")]);
+    values = (0, _lodash.omit)(values, [name, "".concat(name, "_virtual")]);
   }, {});
   return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, values), data);
 };
@@ -264,6 +264,7 @@ var getFormColumn = exports.getFormColumn = function getFormColumn() {
         key: name
       }, _props));
     },
-    field: name
+    field: name,
+    exportField: (0, _grid.getExportField)(name, formItemType, _props)
   });
 };

package/lib/utils/grid.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getColumnRender = getColumnRender;
-exports.getGridColumn = void 0;
+exports.getGridColumn = exports.getExportField = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
@@ -117,6 +117,11 @@ var getAlign = function getAlign(extraData, alignClass) {
       return 'left';
   }
 };
+var getExportField = exports.getExportField = function getExportField(name, type, props) {
+  var _props$config2;
+  if (type === 'number' && (_props$config2 = props.config) !== null && _props$config2 !== void 0 && _props$config2.precision || ['date', 'user', 'select', 'group', 'region', 'upload'].includes(type)) return "".concat(name, "_virtual");
+  return;
+};
 var getGridColumn = exports.getGridColumn = function getGridColumn() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     comName = _ref.comName,
@@ -140,6 +145,7 @@ var getGridColumn = exports.getGridColumn = function getGridColumn() {
   var _extra = JSON.parse(extra) || {};
   var data = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
     field: name,
+    exportField: getExportField(name, comName || _form.defaultComName[property], _props),
     title: _props.fieldAliasName || _props.label,
     headerAlign: _props.headerAlign || getAlign(_extra, 'sheading_alignment_virtual'),
     align: _props.align || getAlign(_extra, 'scell_alignment_virtual'),
@@ -152,8 +158,8 @@ var getGridColumn = exports.getGridColumn = function getGridColumn() {
     data.filter = filter;
     data.filterParams = filterParams;
   } else if (!isTreeGrid && !isVirtual) {
-    var _props$config2;
-    if ((_props.mode || ((_props$config2 = _props.config) === null || _props$config2 === void 0 ? void 0 : _props$config2.mode)) === 'multiple') {
+    var _props$config3;
+    if ((_props.mode || ((_props$config3 = _props.config) === null || _props$config3 === void 0 ? void 0 : _props$config3.mode)) === 'multiple') {
       data.field = "".concat(name, "_virtual");
       data.filter = 'text';
       return data;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luck-design-biz/luckda",
-  "version": "1.0.2-15",
+  "version": "1.0.2-16",
   "description": "前端配置管理中心业务组件库",
   "scripts": {
     "start": "cross-env NODE_OPTIONS=--max-old-space-size=10240 USER_RUNTIME=SITE RUNTIME=dev umi dev",