@luck-design-biz/luckda 1.0.2 → 1.0.3-13tl

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

@@ -6,7 +6,8 @@ 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 } from "../../../../constants/api-url";
+import { exportExcel, uploadTemplate, getFindexcelstate, noAuthGetTemplateUrl, clearProcess } from "../../../../constants/api-url";
+import { getLDMetaAttr } from "../../../../engine/tools/helper";
 import styled from 'styled-components';
 import { isString, split, last, lowerCase, includes } from 'lodash';
 import { useRequest } from 'ahooks';
@@ -19,6 +20,7 @@ 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) {
@@ -43,6 +45,11 @@ export var ImportUploadPop = function ImportUploadPop(_ref) {
       manual: true
     }),
     runAsyncImport = _useRequest.runAsync;
+
+  // 清除进度
+  var clearProgress = function clearProgress(batchNo) {
+    clearProcess(batchNo).then();
+  };
   var fecthFindExcelState = function fecthFindExcelState(_ref2, callback) {
     var strategy = _ref2.strategy,
       batchNo = _ref2.batchNo,
@@ -54,7 +61,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) {
@@ -72,13 +79,16 @@ 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();
     });
   };
@@ -147,7 +157,7 @@ export var ImportUploadPop = function ImportUploadPop(_ref) {
     };
   }();
   return /*#__PURE__*/React.createElement(PopWindow, {
-    title: "上传excel文件",
+    title: '上传excel文件',
     mode: "modal",
     size: "mini",
     visible: visible,
@@ -184,11 +194,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", {
@@ -198,8 +211,12 @@ 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__*/React.createElement("a", {
-    href: 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__*/
+  //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),
     download: true
   }, "\u4E0B\u8F7D\u51FA\u9519\u8868\u683C\u4FE1\u606F") : ''));
 };
@@ -248,7 +265,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 +316,7 @@ export var TopExport = function TopExport(_ref5) {
               _exportExcelParams = {
                 moduleCode: moduleCode,
                 behaviorKey: behaviorKey,
-                reportType: "export"
+                reportType: 'export'
               };
               _exportExcelPrefix = "/".concat(strategy);
               _context2.next = 10;
@@ -330,14 +347,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 +362,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

@@ -68,16 +68,16 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var instanceRef = useCombinedRefs(ref);
   useImperativeHandle(apiRef, function () {
     return {
-      /**
-       * 获取表格实例
-       * @method
+      /**
+       * 获取表格实例
+       * @method
        */
       getInstance: function getInstance() {
         return instanceRef.current;
       },
-      /**
-       * 刷新表格
-       * @method
+      /**
+       * 刷新表格
+       * @method
        */
       refresh: function refresh() {
         var init = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
@@ -275,7 +275,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
                   });
                 }
               });
@@ -447,7 +447,7 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
       }));
     }
     return resultComp;
-  }, [topActionGroup, impexp]);
+  }, [topActionGroup, impexp, moduleCode]);
   var renderFilterArea = useCallback(function () {
     return topFilter ? /*#__PURE__*/React.createElement(TopFilter, {
       filter: topFilter,
@@ -566,8 +566,9 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
     wrapper: wrapperRef,
     wrapperProps: _wrapperProps,
     width: width,
-    height: height,
-    _loading: ctx.loading,
+    height: height
+    // _loading={ctx.loading}
+    ,
     bordered: bordered,
     className: classNames(_defineProperty({}, className, !!className)),
     ldId: id,
@@ -591,135 +592,135 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
   })));
 });
 LCTable.propTypes = {
-  /**
-   * @name 唯一标识
-   * @type string
-   * @disabled true
+  /**
+   * @name 唯一标识
+   * @type string
+   * @disabled true
    */
   id: PropTypes.string.isRequired,
-  /**
-   * @name 数据集
-   * @type _DataSetSelector
+  /**
+   * @name 数据集
+   * @type _DataSetSelector
    */
   dataset: PropTypes.shape({
     code: PropTypes.string.isRequired,
     uid: PropTypes.string.isRequired
   }),
-  /**
-   * @name 自动加载
-   * @desc 首次数据是否自动加载，若存在必须带搜索条件再加载的情况，需要关闭
-   * @type switch
-   * @default true
+  /**
+   * @name 自动加载
+   * @desc 首次数据是否自动加载，若存在必须带搜索条件再加载的情况，需要关闭
+   * @type switch
+   * @default true
    */
   autoLoad: PropTypes.bool,
-  /**
-   * @name 只读
-   * @type switch
-   * @default false
+  /**
+   * @name 只读
+   * @type switch
+   * @default false
    */
   readOnly: PropTypes.bool,
-  /**
-   * @name 关闭预设
-   * @type switch
-   * @default false
+  /**
+   * @name 关闭预设
+   * @type switch
+   * @default false
    */
   suppressPreset: PropTypes.bool,
-  /**
-   * @name 宽度
-   * @type _WidthHeight
-   * @default 100%
-   * @group styleSetting
+  /**
+   * @name 宽度
+   * @type _WidthHeight
+   * @default 100%
+   * @group styleSetting
    */
   width: PropTypes.string,
-  /**
-   * @name 高度
-   * @type _WidthHeight
-   * @default 100%
-   * @group styleSetting
+  /**
+   * @name 高度
+   * @type _WidthHeight
+   * @default 100%
+   * @group styleSetting
    */
   height: PropTypes.string,
-  /**
-   * @name 边框线
-   * @type switch
-   * @default false
-   * @group styleSetting
+  /**
+   * @name 边框线
+   * @type switch
+   * @default false
+   * @group styleSetting
    */
   border: PropTypes.bool,
-  /**
-   * @name 斑马纹
-   * @type switch
-   * @default false
-   * @group styleSetting
+  /**
+   * @name 斑马纹
+   * @type switch
+   * @default false
+   * @group styleSetting
    */
   zebra: PropTypes.oneOfType[(PropTypes.bool, PropTypes.string)],
-  /**
-   * @name 开启分页
-   * @type switch
-   * @default true
-   * @group paginationSetting
+  /**
+   * @name 开启分页
+   * @type switch
+   * @default true
+   * @group paginationSetting
    */
   pagination: PropTypes.bool,
-  /**
-   * @name 每页条数
-   * @type number
-   * @default 30
-   * @group paginationSetting
+  /**
+   * @name 每页条数
+   * @type number
+   * @default 30
+   * @group paginationSetting
    */
   pageSize: PropTypes.number,
-  /**
-   * @name 分页器
-   * @type switch
-   * @default true
-   * @group paginationSetting
+  /**
+   * @name 分页器
+   * @type switch
+   * @default true
+   * @group paginationSetting
    */
   showSizeChanger: PropTypes.bool,
-  /**
-   * @name 快速跳转
-   * @type switch
-   * @default true
-   * @group paginationSetting
+  /**
+   * @name 快速跳转
+   * @type switch
+   * @default true
+   * @group paginationSetting
    */
   showQuickJumper: PropTypes.bool,
-  /**
-   * @name 单页无分页器
-   * @type switch
-   * @default false
-   * @group paginationSetting
+  /**
+   * @name 单页无分页器
+   * @type switch
+   * @default false
+   * @group paginationSetting
    */
   hideOnSinglePage: PropTypes.bool,
-  /**
-   * @name 简单模式
-   * @type switch
-   * @default false
-   * @group paginationSetting
+  /**
+   * @name 简单模式
+   * @type switch
+   * @default false
+   * @group paginationSetting
    */
   paginationSimple: PropTypes.bool,
-  /**
-   * @name 隐藏操作列
-   * @type switch
-   * @default false
-   * @groupNext actionsColumn
+  /**
+   * @name 隐藏操作列
+   * @type switch
+   * @default false
+   * @groupNext actionsColumn
    */
   suppressActions: PropTypes.bool,
-  /**
-   * @name 隐藏操作列
-   * @type number
-   * @default 160
-   * @groupNext actionsColumn
+  /**
+   * @name 隐藏操作列
+   * @type number
+   * @default 160
+   * @groupNext actionsColumn
    */
   actionsColumnWidth: PropTypes.number,
-  /**
-   * @name 最大显示数
-   * @type number
-   * @default 2
-   * @groupNext actionsColumn
+  /**
+   * @name 最大显示数
+   * @type number
+   * @default 2
+   * @groupNext actionsColumn
    */
   maxActionsCount: PropTypes.number,
-  /**
-   * @name 操作项
-   * @type _TableActions
-   * @groupNext actionsColumn
-   * @default {"display": "text", "max": 2, "moreText": "更多行为", "todoList": []}
+  /**
+   * @name 操作项
+   * @type _TableActions
+   * @groupNext actionsColumn
+   * @default {"display": "text", "max": 2, "moreText": "更多行为", "todoList": []}
    */
   actions: PropTypes.shape({
     display: PropTypes.oneOf(['text', 'button']),
@@ -727,10 +728,10 @@ LCTable.propTypes = {
     moreText: PropTypes.string,
     todoList: PropTypes.array
   }),
-  /**
-   * @name 顶部操作
-   * @type _ActionGroup
-   * @default {"display": "button", "max": 2, "moreText": "操作", "todoList": []}
+  /**
+   * @name 顶部操作
+   * @type _ActionGroup
+   * @default {"display": "button", "max": 2, "moreText": "操作", "todoList": []}
    */
   topActionGroup: PropTypes.shape({
     display: PropTypes.oneOf(['text', 'button']),
@@ -738,86 +739,86 @@ LCTable.propTypes = {
     moreText: PropTypes.string,
     todoList: PropTypes.array
   }),
-  /**
-   * @name 顶部过滤器
-   * @type _TableTopFilter
+  /**
+   * @name 顶部过滤器
+   * @type _TableTopFilter
    */
   topFilter: PropTypes.oneOfType([PropTypes.string, PropTypes.array, PropTypes.shape({
     options: PropTypes.array.isRequired,
     field: PropTypes.string.isRequired
   })]),
-  /**
-   * @name 开启行选择器
-   * @type boolean
-   * @default false
+  /**
+   * @name 开启行选择器
+   * @type boolean
+   * @default false
    */
   rowSelection: PropTypes.bool,
-  /**
-   * @name 停用分页多选
-   * @type boolean
-   * @default false
+  /**
+   * @name 停用分页多选
+   * @type boolean
+   * @default false
    */
   suppressRowSelectionPagination: PropTypes.bool,
-  /**
-   * @name 选择器模式
-   * @type segmented
-   * @options [{label: '复选', value: 'multiple'}, {label: '单选', value: 'single'}]
-   * @default 'multiple'
+  /**
+   * @name 选择器模式
+   * @type segmented
+   * @options [{label: '复选', value: 'multiple'}, {label: '单选', value: 'single'}]
+   * @default 'multiple'
    */
   rowSelectionMode: PropTypes.oneOf(['single', 'multiple']),
-  /**
-   * @name 默认选中
-   * @type _JSEditor
-   * @default "function getDefaultRowSelected(data, node, ctx) { \n return false; \n}"
+  /**
+   * @name 默认选中
+   * @type _JSEditor
+   * @default "function getDefaultRowSelected(data, node, ctx) { \n return false; \n}"
    */
   defaultRowSelectedCode: PropTypes.string,
-  /**
-   * @name 行是否可选
-   * @type _JSEditor
-   * @default "function getRowSelectable(data, node, ctx) { \n return true; \n}"
+  /**
+   * @name 行是否可选
+   * @type _JSEditor
+   * @default "function getRowSelectable(data, node, ctx) { \n return true; \n}"
    */
   rowSelectableCode: PropTypes.string,
-  /**
-   * @name 导入导出
-   * @type _ImpExp
-   * @default { "export": true }
+  /**
+   * @name 导入导出
+   * @type _ImpExp
+   * @default { "export": true }
    */
   impexp: PropTypes.shape({
     import: PropTypes.oneOfType([PropTypes.bool, PropTypes.string]),
     importType: PropTypes.bool,
     export: PropTypes.oneOfType([PropTypes.bool, PropTypes.string])
   }),
-  /**
-   * @name 批量操作
-   * @type _BatchActions
-   * @default { "todoList": [] }
+  /**
+   * @name 批量操作
+   * @type _BatchActions
+   * @default { "todoList": [] }
    */
   bantchActions: PropTypes.shape({
     todoList: PropTypes.array
   }),
-  /**
-   * @name 格式化数据
-   * @type _JSEditor
+  /**
+   * @name 格式化数据
+   * @type _JSEditor
    */
   formatDataSource: PropTypes.string,
-  /**
-   * @name 构建树层级
-   * @type _JSEditor
+  /**
+   * @name 构建树层级
+   * @type _JSEditor
    */
   getDataPath: PropTypes.string,
-  /**
-   * @name 重写表格列
-   * @type _JSEditor
+  /**
+   * @name 重写表格列
+   * @type _JSEditor
    */
   columnsRewrite: PropTypes.string,
-  /**
-   * @name 重置表格列
-   * @type _JSEditor
+  /**
+   * @name 重置表格列
+   * @type _JSEditor
    */
   columnsReset: PropTypes.string,
-  /**
-   * @name model参数
-   * @type _JSEditor
+  /**
+   * @name model参数
+   * @type _JSEditor
    */
   modelParams: PropTypes.string
 };