@vtx/components 4.0.0-beta.8 → 4.0.0-beta.80

package/es/vtx-import2/index.js

@@ -26,15 +26,17 @@ import getToken from "../utils/getToken";
 import getSignature from '@vtx/utils/lib/getSignature';
 import useSet from "../utils/useSet";
 import md5 from 'md5';
-import { getVtxToken } from '@vtx/utils';
+import { getVtxToken, getUrlParam } from '@vtx/utils';
 import classnames from 'classnames';
 import { useStyle } from "./style/index";
 import { VtxProvider, useIntl } from "../vtx-provider";
+import VtxModal from "../vtx-modal";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 function getFileName() {
   var name = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
-  var intl = useIntl();
+  var _ref = arguments.length > 1 ? arguments[1] : undefined,
+    intl = _ref.intl;
   var index = name.lastIndexOf('.');
   var suffix = name.substring(index);
   return name.substring(0, index) + "(".concat(intl.getMessage('import.errorFile', '错误文件'), ")") + suffix;
@@ -43,17 +45,20 @@ var VtxImport2 = function VtxImport2(props) {
   var intl = useIntl();
   var _useContext = useContext(VtxProvider),
     getPrefixCls = _useContext.getPrefixCls;
-  var prefixCls = getPrefixCls('import2', props.prefixCls);
+  var prefixCls = getPrefixCls('', 'vtx-import2');
   var _useStyle = useStyle(prefixCls),
     wrapSSR = _useStyle.wrapSSR,
     hashId = _useStyle.hashId;
   var visible = props.visible,
     close = props.close,
     title = props.title,
-    accept = props.accept,
-    fileKey = props.fileKey,
+    _props$accept = props.accept,
+    accept = _props$accept === void 0 ? 'application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,text/csv' : _props$accept,
+    _props$fileKey = props.fileKey,
+    fileKey = _props$fileKey === void 0 ? 'file' : _props$fileKey,
     uploadURL = props.uploadURL,
-    postData = props.postData,
+    _props$postData = props.postData,
+    postData = _props$postData === void 0 ? {} : _props$postData,
     errorURL = props.errorURL,
     templateURL = props.templateURL,
     afterUpload = props.afterUpload,
@@ -132,7 +137,7 @@ var VtxImport2 = function VtxImport2(props) {
     state = _useSet2[0],
     setState = _useSet2[1];
   var token = getToken();
-  if (!token) {
+  if (props.token) {
     token = props.token;
   }
   var newErrorDownloadName = errorDownloadName;
@@ -147,7 +152,9 @@ var VtxImport2 = function VtxImport2(props) {
   }, interval);
   useEffect(function () {
     if (fileList.length !== 0) {
-      fileName.current = getFileName(fileList[0].name);
+      fileName.current = getFileName(fileList[0].name, {
+        intl: intl
+      });
     }
   }, [fileList]);
 
@@ -202,6 +209,8 @@ var VtxImport2 = function VtxImport2(props) {
       };
       // 发送请求
       xhr.open('POST', '/cloudFile/common/uploadChunk', true);
+      xhr.setRequestHeader('Authorization', token ? "Bearer ".concat(token) : '');
+      xhr.setRequestHeader('access_token', token ? "".concat(token) : '');
       xhr.send(list[indexRef.current]);
     } else {
       mergeFile();
@@ -227,6 +236,8 @@ var VtxImport2 = function VtxImport2(props) {
     };
     // 发送请求
     xhr.open('POST', '/cloudFile/common/mergeChunk', true);
+    xhr.setRequestHeader('Authorization', token ? "Bearer ".concat(token) : '');
+    xhr.setRequestHeader('access_token', token ? "".concat(token) : '');
     var data = new FormData();
     data.append('chunkId', state.chunkId);
     data.append('tenantId', getVtxToken('tenantId'));
@@ -247,6 +258,7 @@ var VtxImport2 = function VtxImport2(props) {
     }
     request.setRequestHeader('Authorization', token ? "Bearer ".concat(token) : '');
     request.setRequestHeader('access_token', token ? "".concat(token) : '');
+    request.setRequestHeader('systemCode', getUrlParam('systemCode') ? getUrlParam('systemCode') : '');
     // 添加操作日志
     request.setRequestHeader('operation', encodeURIComponent(JSON.stringify({
       menuId: sessionStorage.getItem('vtxmenuselectedKeys'),
@@ -329,9 +341,9 @@ var VtxImport2 = function VtxImport2(props) {
       }
     }
   };
-  var onUpload = function onUpload(_ref) {
-    var _ref$files = _ref.files,
-      files = _ref$files === void 0 ? fileList : _ref$files;
+  var onUpload = function onUpload(_ref2) {
+    var _ref2$files = _ref2.files,
+      files = _ref2$files === void 0 ? fileList : _ref2$files;
     if (typeof props.beforeUpload === 'function') {
       var flag = beforeUpload(files[0]);
       if (!flag) {
@@ -366,7 +378,10 @@ var VtxImport2 = function VtxImport2(props) {
   var modelProps = {
     open: visible,
     width: width || 392,
-    maskClosable: false,
+    // maskClosable: false,
+    mask: {
+      closable: false
+    },
     footer: [/*#__PURE__*/_jsx(Button, {
       onClick: close,
       children: "".concat(TextEnum.btnCloseText).concat(status === 1 && result ? '(' + countdown + ')' : '')
@@ -388,7 +403,7 @@ var VtxImport2 = function VtxImport2(props) {
       })]
     })
   };
-  return wrapSSR( /*#__PURE__*/_jsxs(Modal, _objectSpread(_objectSpread({}, modelProps), {}, {
+  return wrapSSR( /*#__PURE__*/_jsxs(VtxModal, _objectSpread(_objectSpread({}, modelProps), {}, {
     children: [status === 0 ? /*#__PURE__*/_jsx(Content, {
       prefixCls: prefixCls,
       fileList: fileList,
@@ -422,11 +437,6 @@ var VtxImport2 = function VtxImport2(props) {
     })]
   })));
 };
-VtxImport2.defaultProps = {
-  fileKey: 'file',
-  accept: 'application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,text/csv',
-  postData: {}
-};
 VtxImport2.propTypes = {
   visible: PropTypes.bool,
   templateURL: PropTypes.string,
@@ -447,7 +457,8 @@ VtxImport2.propTypes = {
   beforeUpload: PropTypes.func,
   chunkSize: PropTypes.number,
   width: PropTypes.number,
-  extraDom: [PropTypes.string, PropTypes.node]
+  // extraDom: [PropTypes.string, PropTypes.node],
+  extraDom: PropTypes.object
 };
 export { VtxImport2 };
 export default VtxImport2;

package/es/vtx-import2/style/index.js

@@ -7,7 +7,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { useStyle as useAntdStyle } from "../../vtx-provider";
 var genVtxImport2Style = function genVtxImport2Style(token) {
   var componentCls = token.componentCls;
-  return _defineProperty({}, componentCls, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, '&-modal-header-title', {
+  return _defineProperty(_defineProperty(_defineProperty({}, componentCls, _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, '&-modal-header-title', {
     color: token.colorText
   }), '&-modal-header-text', {
     fontWeight: '400'
@@ -25,8 +25,8 @@ var genVtxImport2Style = function genVtxImport2Style(token) {
     height: '80px',
     padding: '16px 16px 16px 48px',
     color: token.colorPrimary,
-    fontSize: '14px',
-    backgroundColor: token.colorBgLayout,
+    fontSize: 14,
+    backgroundColor: token.colorBgLayoutTable,
     borderRadius: '4px'
   }, "".concat(componentCls, "-download"), {
     marginLeft: '16px'
@@ -48,7 +48,58 @@ var genVtxImport2Style = function genVtxImport2Style(token) {
     display: 'flex',
     alignItems: 'center',
     justifyContent: 'space-between',
-    color: 'fade(@black, 65%)'
+    color: token.colorTextSecondary
+  }, "".concat(componentCls, "-file-name"), {
+    overflow: 'hidden',
+    whiteSpace: 'nowrap',
+    textOverflow: 'ellipsis'
+  }))), '&:last-child ', {
+    marginTop: '20px'
+  }), "".concat(componentCls, "-content-mark"), {
+    position: 'absolute',
+    top: 0,
+    left: 0,
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'center',
+    width: '28px',
+    height: '22px',
+    color: '#fff',
+    backgroundColor: token.colorPrimary,
+    border: "1px solid ".concat(token.colorPrimary),
+    borderRadius: '4px 0',
+    opacity: 0.6
+  }))), "".concat(componentCls, "-content-box"), _defineProperty(_defineProperty(_defineProperty(_defineProperty({
+    position: 'relative',
+    display: 'flex',
+    alignItems: 'center',
+    height: '80px',
+    padding: '16px 16px 16px 48px',
+    color: token.colorPrimary,
+    fontSize: 14,
+    backgroundColor: token.colorBgLayoutTable,
+    borderRadius: '4px'
+  }, "".concat(componentCls, "-download"), {
+    marginLeft: '16px'
+  }), "".concat(componentCls, "-file-list"), _defineProperty(_defineProperty({
+    display: 'flex',
+    flexDirection: 'column',
+    justifyContent: 'space-between',
+    width: '100%',
+    marginLeft: '16px',
+    overflow: 'hidden',
+    whiteSpace: 'nowrap',
+    textOverflow: 'ellipsis'
+  }, "".concat(componentCls, "-text"), {
+    cursor: 'pointer',
+    overflowRrap: 'break-word',
+    wordBreak: 'break-all',
+    whiteSpace: 'pre-wrap'
+  }), "".concat(componentCls, "-file-item"), _defineProperty({
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+    color: token.colorBase
   }, "".concat(componentCls, "-file-name"), {
     overflow: 'hidden',
     whiteSpace: 'nowrap',
@@ -77,17 +128,17 @@ var genVtxImport2Style = function genVtxImport2Style(token) {
   }, "".concat(componentCls, "-result"), {
     marginTop: '20px',
     marginBottom: '12px',
-    color: 'fade(@black, 85%)',
+    color: token.colorText,
     fontWeight: '700',
     fontSize: '24px'
   }), "&-success-tips", {
-    color: 'fade(@black, 45%)',
-    fontSize: '14px'
+    color: token.colorTextSecondary,
+    fontSize: 14
   }), "&-error-tips", {
     color: token.colorPrimary,
-    fontSize: '14px',
+    fontSize: 14,
     cursor: 'pointer'
-  })));
+  }));
 };
 export function useStyle(prefixCls) {
   return useAntdStyle('VtxImport2', function (token) {

package/es/vtx-modal/index.js

@@ -195,15 +195,20 @@ function VtxModal(props) {
     destroyOnHidden: (_props$destroyOnClose = props.destroyOnClose) !== null && _props$destroyOnClose !== void 0 ? _props$destroyOnClose : true
   };
   var newProps = _objectSpread(_objectSpread(_objectSpread({
-    maskClosable: false,
-    // destroyOnClose: true,
-    width: 700
+    mask: {
+      closable: false
+    },
+    width: 700,
+    focusable: {
+      autoFocusButton: null,
+      focusTriggerAfterClose: true,
+      trap: false
+    }
   }, props), legacyProps), {}, {
     closable: false,
     open: open,
     title: title,
     wrapClassName: classnames(prefixCls, hashId, wrapClassName, _defineProperty({}, "".concat(prefixCls, "-maxClass"), isFull ? true : false), classId.current),
-    // bodyStyle,
     onCancel: onCancel,
     style: _objectSpread(_objectSpread({}, props.style), isFull ? {} : transformStyle)
   });

package/es/vtx-page-layout/style/index.js

@@ -96,7 +96,7 @@ var genVtxStyle = function genVtxStyle(token) {
     '&-wrap': _objectSpread(_objectSpread({}, absolute()), {}, {
       backgroundColor: token.colorBgContainer,
       borderRadius: token.borderRadiusLG,
-      padding: '0 20px'
+      padding: '0 20px 20px 20px'
     }),
     '&-card': {
       background: token.colorBgContainer,
@@ -109,7 +109,9 @@ var genVtxStyle = function genVtxStyle(token) {
     '&-left': _defineProperty(_defineProperty({}, "".concat(componentCls, "-ztree-search"), {
       right: 0
     }), '.ant-vtx-tree-wraaper', {})
-  })), "".concat(componentCls, "-button-wrap"), _defineProperty({}, "button + button", {
+  })), "".concat(componentCls, "-button-wrap"), _defineProperty(_defineProperty({}, "button + button", {
+    marginLeft: 8
+  }), "button + .vtx-export-async", {
     marginLeft: 8
   }));
 };

package/es/vtx-provider/index.js

@@ -264,20 +264,24 @@ export var VtxConfigProvider = function VtxConfigProvider(props) {
     borderRadius: 8,
     borderRadiusLG: 12,
     borderRadiusSM: 4
-  }, dark ? {} : _defineProperty(_defineProperty(_defineProperty(_defineProperty({
+  }, dark ? {
+    colorBgLayoutTable: '#111'
+  } : _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
     colorPrimary: '#3A6DFF',
+    colorLink: '#3A6DFF',
     colorText: '#29343D',
     colorTextSecondary: '#78829D',
     colorBorder: '#DCDFE6',
     colorTextPlaceholder: '#BFC3CB',
     colorFillAlter: '#F5F7FA'
-  }, "colorFillAlter", '#F5F7FA'), "colorTextPlaceholder", '#BFC3CB'), "colorFillAlterSolid", '#F5F7FA'), "colorBgLayout", '#FAFAFA')), theme.token);
+  }, "colorFillAlter", '#F5F7FA'), "colorTextPlaceholder", '#BFC3CB'), "colorFillAlterSolid", '#F5F7FA'), "colorBgLayout", '#F0F2F5'), "colorBgLayoutTable", '#FAFAFA')), theme.token);
   theme.components = _objectSpread(_objectSpread({}, theme.components), {}, {
     Table: _objectSpread({
       headerBorderRadius: 0
     }, (_theme$components = theme.components) === null || _theme$components === void 0 ? void 0 : _theme$components.Table),
     Modal: _objectSpread({
-      contentPadding: 0
+      contentPadding: 0,
+      bodyPadding: 0
     }, (_theme$components2 = theme.components) === null || _theme$components2 === void 0 ? void 0 : _theme$components2.Modal)
   });
 

package/es/vtx-provider/locale/en_US.js

@@ -125,6 +125,10 @@ export default {
     operation: 'Import',
     error: 'Upload failed',
     success: 'Upload successful',
+    rowNumber: 'Line No.',
+    errorMessage: 'Error Description',
+    selectFile: 'Click to select file',
+    noFileSelected: "No file selected",
     downloadTemplate: 'Download template',
     pleaseSelectFile: 'Please select the file to upload',
     upload: 'Upload',
@@ -182,8 +186,58 @@ export default {
     download: 'Download'
   },
   wangEditor: {
-    imageInsertionFailed: 'Image Insertion Failed',
-    videoInsertionFailed: 'Video Insertion Failed',
-    attachmentInsertionFailed: 'Attachment Insertion Failed'
+    messageOverSizeText: 'Exceeds file size limit, maximum file size is',
+    messageUploadFailText: 'Upload error',
+    messageInsertImgFailText: 'Image Insertion Failed',
+    messageInsertVideoFailText: 'Video Insertion Failed',
+    messageInsertAttachmentFailText: 'Attachment Insertion Failed'
+  },
+  envPuzzle: {
+    common: {
+      startTime: 'Start time',
+      endTime: 'End time',
+      confirm: 'OK',
+      prompt: 'Prompt'
+    },
+    createModal: {
+      clear: 'Clear',
+      required: '{label} is required',
+      whitespace: '{label} cannot contain only whitespace'
+    },
+    template: {
+      selectedPrefix: 'Selected',
+      selectedSuffix: 'items',
+      clearSelected: 'Clear',
+      deleteItemConfirm: 'Delete this item?',
+      deleteRowConfirm: 'Confirm delete?',
+      deleteSelectedConfirm: 'Delete the selected {count} records?',
+      exportSelectedRows: 'Export selected rows',
+      exportCurrentPage: 'Export current page',
+      exportAll: 'Export all',
+      exportAllFields: 'Export all fields',
+      exportingFile: 'Exporting file...',
+      paginationTotal: 'Total {total} records'
+    },
+    import: {
+      rowNumber: 'Row',
+      errorMessage: 'Error message',
+      pleaseUploadFile: 'Please upload a file',
+      uploadFile: 'Upload file'
+    },
+    map: {
+      goToMap: 'Open map',
+      locate: 'Locate',
+      calibrate: 'Calibrate',
+      redraw: 'Redraw',
+      keywordPlaceholder: 'Enter keywords',
+      invalidLayerOptions: 'data and options cannot be empty, and map is required'
+    },
+    upload: {
+      downloading: 'Downloading...',
+      pictureUnit: 'files'
+    },
+    request: {
+      operationFailed: 'Operation failed'
+    }
   }
 };

package/es/vtx-provider/locale/zh_CN.js

@@ -124,6 +124,10 @@ export default {
     operation: '导入',
     error: '上传失败',
     success: '上传成功',
+    rowNumber: '行号',
+    errorMessage: '错误说明',
+    selectFile: '选择文件',
+    noFileSelected: "未选择任何文件",
     downloadTemplate: '下载模板',
     pleaseSelectFile: '请选择需要上传的文件',
     upload: '上传',
@@ -181,9 +185,11 @@ export default {
     download: '下载'
   },
   wangEditor: {
-    imageInsertionFailed: '插入图片失败',
-    videoInsertionFailed: '插入视频失败',
-    attachmentInsertionFailed: '插入附件失败'
+    messageOverSizeText: '超过文件大小限制，最大文件大小为',
+    messageUploadFailText: '上传出错',
+    messageInsertImgFailText: '插入图片失败',
+    messageInsertVideoFailText: '插入视频失败',
+    messageInsertAttachmentFailText: '插入附件失败'
   },
   colorPicker: {
     primary: '主要',
@@ -197,5 +203,53 @@ export default {
     basic: '基础颜色',
     // 基础色板
     chart: '图表颜色' // 图表专用色
+  },
+  envPuzzle: {
+    common: {
+      startTime: '开始时间',
+      endTime: '结束时间',
+      confirm: '确定',
+      prompt: '提示'
+    },
+    createModal: {
+      clear: '清空',
+      required: '{label}不能为空',
+      whitespace: '{label}不能只包含空白字符'
+    },
+    template: {
+      selectedPrefix: '已选择',
+      selectedSuffix: '项',
+      clearSelected: '清空',
+      deleteItemConfirm: '确定删除该项吗？',
+      deleteRowConfirm: '是否确认删除',
+      deleteSelectedConfirm: '确定删除选中的{count}条数据吗？',
+      exportSelectedRows: '导出选中行',
+      exportCurrentPage: '导出当前页',
+      exportAll: '导出全部',
+      exportAllFields: '导出全量字段',
+      exportingFile: '导出文件中...',
+      paginationTotal: '总共{total}条记录'
+    },
+    import: {
+      rowNumber: '行数',
+      errorMessage: '错误信息',
+      pleaseUploadFile: '请上传文件',
+      uploadFile: '上传文件'
+    },
+    map: {
+      goToMap: '去地图',
+      locate: '定位',
+      calibrate: '校正',
+      redraw: '重新绘制',
+      keywordPlaceholder: '请输入关键字',
+      invalidLayerOptions: 'data，options 不能为空或者是map对象没有'
+    },
+    upload: {
+      downloading: '下载中...',
+      pictureUnit: '张'
+    },
+    request: {
+      operationFailed: '操作失败'
+    }
   }
 };

package/es/vtx-search/index.js

@@ -55,10 +55,6 @@ function VtxSearch(props) {
     isClearButton = _props$isClearButton === void 0 ? true : _props$isClearButton,
     _props$isMoreButton = props.isMoreButton,
     isMoreButton = _props$isMoreButton === void 0 ? true : _props$isMoreButton,
-    _props$confirmText = props.confirmText,
-    confirmText = _props$confirmText === void 0 ? intl.getMessage('tableForm.search', '查询') : _props$confirmText,
-    _props$clearText = props.clearText,
-    clearText = _props$clearText === void 0 ? intl.getMessage('tableForm.reset', '重置') : _props$clearText,
     onConfirm = props.onConfirm,
     onClear = props.onClear,
     renderButtons = props.renderButtons,
@@ -66,7 +62,15 @@ function VtxSearch(props) {
     showAll = _props$showAll === void 0 ? false : _props$showAll,
     onToggleShow = props.onToggleShow,
     _props$customEnumText = props.customEnumText,
-    customEnumText = _props$customEnumText === void 0 ? {} : _props$customEnumText;
+    customEnumText = _props$customEnumText === void 0 ? {
+      confirmText: intl.getMessage('tableForm.search', '查询'),
+      //确认按钮文本
+      clearText: intl.getMessage('tableForm.reset', '重置'),
+      //情况按钮文本
+      collapseText: intl.getMessage('tableForm.expand', '收起'),
+      //情况按钮文本
+      expandText: intl.getMessage('tableForm.collapsed', '展开') //情况按钮文本
+    } : _props$customEnumText;
   var vtxSearchRef = useRef();
   var ref = useRef();
   var size = useColSize(vtxSearchRef);
@@ -296,7 +300,7 @@ function VtxSearch(props) {
                   },
                   type: "primary",
                   onClick: onConfirm,
-                  children: confirmText
+                  children: customEnumText.confirmText
                 })
               }), isClearButton && /*#__PURE__*/_jsx("span", {
                 "data-type": 'bt',
@@ -306,7 +310,7 @@ function VtxSearch(props) {
                     width: '100%'
                   },
                   onClick: onClear,
-                  children: clearText
+                  children: customEnumText.clearText
                 })
               }), isMoreButton && grid.len > realColumn - 1 && /*#__PURE__*/_jsx("div", {
                 "data-type": 'bt',
@@ -315,9 +319,9 @@ function VtxSearch(props) {
                 },
                 className: classnames("".concat(prefix, "-more"), hashId),
                 children: showMore ? /*#__PURE__*/_jsxs(_Fragment, {
-                  children: [(customEnumText === null || customEnumText === void 0 ? void 0 : customEnumText.collapseText) || '收起', /*#__PURE__*/_jsx(UpOutlined, {})]
+                  children: [customEnumText.collapseText, /*#__PURE__*/_jsx(UpOutlined, {})]
                 }) : /*#__PURE__*/_jsxs(_Fragment, {
-                  children: [(customEnumText === null || customEnumText === void 0 ? void 0 : customEnumText.expandText) || '展开', /*#__PURE__*/_jsx(DownOutlined, {})]
+                  children: [customEnumText.expandText, /*#__PURE__*/_jsx(DownOutlined, {})]
                 })
               })]
             })

package/es/vtx-search/style/index.js

@@ -16,7 +16,8 @@ var genVtxStyle = function genVtxStyle(token) {
     transitionDuration: token.toggleSpeed,
     transitionProperty: 'height',
     boxSizing: 'border-box',
-    overflow: 'hidden'
+    overflow: 'hidden',
+    color: token.colorText
   }, "".concat(componentCls, "-element"), {}), "".concat(componentCls, "-label_v"), {
     overflow: 'hidden',
     lineHeight: 1,