@vtx/components 4.0.0-beta.9 → 4.0.0-beta.91

package/es/vtx-provider/index.js

@@ -46,11 +46,11 @@ var omitUndefined = function omitUndefined(obj) {
   return newObj;
 };
 
-/**
- * 用于判断当前是否需要开启哈希（Hash）模式。
- * 首先也会判断当前是否处于测试环境中（通过 process.env.NODE_ENV === 'TEST' 判断），
- * 如果是，则返回 false。否则，直接返回 true 表示需要打开。
- * @returns
+/**
+ * 用于判断当前是否需要开启哈希（Hash）模式。
+ * 首先也会判断当前是否处于测试环境中（通过 process.env.NODE_ENV === 'TEST' 判断），
+ * 如果是，则返回 false。否则，直接返回 true 表示需要打开。
+ * @returns
  */
 export var isNeedOpenHash = function isNeedOpenHash() {
   var _process$env$NODE_ENV, _process$env$NODE_ENV2;
@@ -85,10 +85,10 @@ export var VtxConfigContext = /*#__PURE__*/React.createContext({
 });
 var ConfigConsumer = VtxConfigContext.Consumer;
 
-/**
- * 组件解除挂载后清空一下 cache
- * @date 2022-11-28
- * @returns null
+/**
+ * 组件解除挂载后清空一下 cache
+ * @date 2022-11-28
+ * @returns null
  */
 export { ConfigConsumer };
 var CacheClean = function CacheClean() {
@@ -102,10 +102,10 @@ var CacheClean = function CacheClean() {
   return null;
 };
 
-/**
- * 用于配置 Pro 的组件,分装之后会简单一些
- * @param props
- * @returns
+/**
+ * 用于配置 Pro 的组件,分装之后会简单一些
+ * @param props
+ * @returns
  */
 var ConfigProviderContainer = function ConfigProviderContainer(props) {
   var _antdTheme$useToken;
@@ -124,17 +124,17 @@ var ConfigProviderContainer = function ConfigProviderContainer(props) {
   var tokenContext = (_antdTheme$useToken = antdTheme.useToken) === null || _antdTheme$useToken === void 0 ? void 0 : _antdTheme$useToken.call(antdTheme);
   var proProvide = useContext(VtxConfigContext);
 
-  /**
-   * pro 的 类
-   * @type {string}
-   * @example .ant-pro
+  /**
+   * pro 的 类
+   * @type {string}
+   * @example .ant-pro
    */
 
   var vtxComponentsCls = prefixCls ? ".".concat(prefixCls) : ".vtx";
   var antCls = '.' + getPrefixCls();
   var salt = "".concat(vtxComponentsCls);
-  /**
-   * 合并一下token，不然导致嵌套 token 失效
+  /**
+   * 合并一下token，不然导致嵌套 token 失效
    */
   var proLayoutTokenMerge = useMemo(function () {
     return getLayoutDesignToken(propsToken || {}, tokenContext.token);
@@ -231,10 +231,10 @@ var ConfigProviderContainer = function ConfigProviderContainer(props) {
   });
 };
 
-/**
- * 用于配置 一些全局性的东西
- * @param props
- * @returns
+/**
+ * 用于配置 一些全局性的东西
+ * @param props
+ * @returns
  */
 export var VtxConfigProvider = function VtxConfigProvider(props) {
   var _theme$components, _theme$components2;
@@ -268,6 +268,7 @@ export var VtxConfigProvider = function VtxConfigProvider(props) {
     colorBgLayoutTable: '#111'
   } : _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
     colorPrimary: '#3A6DFF',
+    colorLink: '#3A6DFF',
     colorText: '#29343D',
     colorTextSecondary: '#78829D',
     colorBorder: '#DCDFE6',
@@ -279,7 +280,8 @@ export var VtxConfigProvider = function VtxConfigProvider(props) {
       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)
   });
 
@@ -297,13 +299,13 @@ export var VtxConfigProvider = function VtxConfigProvider(props) {
   }));
 };
 
-/**
- * It returns the intl object from the context if it exists, otherwise it returns the intl object for
- * 获取国际化的方法
- * @param locale
- * @param localeMap
- * the current locale
- * @returns The return value of the function is the intl object.
+/**
+ * It returns the intl object from the context if it exists, otherwise it returns the intl object for
+ * 获取国际化的方法
+ * @param locale
+ * @param localeMap
+ * the current locale
+ * @returns The return value of the function is the intl object.
  */
 export function useIntl() {
   var _useContext3 = useContext(AntdConfigProvider.ConfigContext),

package/es/vtx-provider/intl.js

@@ -33,11 +33,11 @@ import zhCN from "./locale/zh_CN";
 import zhHK from "./locale/zh_HK";
 import zhTW from "./locale/zh_TW";
 
-/**
- * 创建一个国际化的操作函数
- *
- * @param locale
- * @param localeMap
+/**
+ * 创建一个国际化的操作函数
+ *
+ * @param locale
+ * @param localeMap
  */
 export var createIntl = function createIntl(locale, localeMap) {
   return {
@@ -125,10 +125,10 @@ var intlMap = {
 };
 var intlMapKeys = Object.keys(intlMap);
 
-/**
- * 根据 antd 的 key 来找到的 locale 插件的 key
- *
- * @param localeKey
+/**
+ * 根据 antd 的 key 来找到的 locale 插件的 key
+ *
+ * @param localeKey
  */
 export var findIntlKeyByAntdLocaleKey = function findIntlKeyByAntdLocaleKey(localeKey) {
   var localeName = (localeKey || 'zh-CN').toLocaleLowerCase();

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

@@ -9,7 +9,7 @@ export default {
     }
   },
   tableForm: {
-    search: 'Query',
+    search: 'Search',
     reset: 'Reset',
     submit: 'Submit',
     collapsed: 'Expand',

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

@@ -13,7 +13,7 @@ export default {
     }
   },
   tableForm: {
-    search: 'Query',
+    search: 'Search',
     reset: 'Reset',
     submit: 'Submit',
     collapsed: 'Expand',
@@ -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-provider/useStyle/index.js

@@ -10,23 +10,23 @@ import { ConfigProvider as AntdConfigProvider, theme as antdTheme } from 'antd';
 import { useContext } from 'react';
 import { VtxProvider } from "../index";
 
-/**
- * 把一个颜色设置一下透明度
- * @example (#fff, 0.5) => rgba(255, 255, 255, 0.5)
- * @param baseColor {string}
- * @param alpha {0-1}
- * @returns rgba {string}
+/**
+ * 把一个颜色设置一下透明度
+ * @example (#fff, 0.5) => rgba(255, 255, 255, 0.5)
+ * @param baseColor {string}
+ * @param alpha {0-1}
+ * @returns rgba {string}
  */
 export var setAlpha = function setAlpha(baseColor, alpha) {
   return new TinyColor(baseColor).setAlpha(alpha).toRgbString();
 };
 
-/**
- * 把一个颜色修改一些明度
- * @example (#000, 50) => #808080
- * @param baseColor {string}
- * @param brightness {0-100}
- * @returns hexColor {string}
+/**
+ * 把一个颜色修改一些明度
+ * @example (#000, 50) => #808080
+ * @param baseColor {string}
+ * @param brightness {0-100}
+ * @returns hexColor {string}
  */
 export var lighten = function lighten(baseColor, brightness) {
   var instance = new TinyColor(baseColor);
@@ -61,11 +61,11 @@ export var operationUnit = function operationUnit(token) {
   };
 };
 
-/**
- * 封装了一下 antd 的 useStyle
- * @param componentName {string} 组件的名字
- * @param styleFn {GenerateStyle} 生成样式的函数
- * @returns UseStyleResult
+/**
+ * 封装了一下 antd 的 useStyle
+ * @param componentName {string} 组件的名字
+ * @param styleFn {GenerateStyle} 生成样式的函数
+ * @returns UseStyleResult
  */
 export function useStyle(componentName, styleFn) {
   var _token$vtxComponentsC;

package/es/vtx-search/index.js

@@ -19,7 +19,7 @@ import { useSize, useUpdateLayoutEffect, useSetState } from 'ahooks';
 import { Button, Tooltip, Row, Col, ConfigProvider } from 'antd';
 import classnames from 'classnames';
 import PropTypes from 'prop-types';
-import { useContext, useMemo, useRef, useState } from 'react';
+import React, { Children, Fragment, isValidElement, useContext, useMemo, useRef, useState } from 'react';
 import useColSize from "../utils/useColSize";
 import { StoreCtx } from "../vtx-page-layout/TableLayout";
 import { prefix, useStyle } from "./style/index";
@@ -27,6 +27,18 @@ import { VtxProvider, useIntl } from "../vtx-provider";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
+var hasRenderableChildren = function hasRenderableChildren(children) {
+  var result = false;
+  Children.forEach(children, function (child) {
+    if (result) return;
+    if ( /*#__PURE__*/isValidElement(child) && child.type === Fragment) {
+      result = hasRenderableChildren(child.props.children);
+      return;
+    }
+    result = child !== null && child !== undefined && typeof child !== 'boolean';
+  });
+  return result;
+};
 function VtxSearch(props) {
   var intl = useIntl();
   var _useContext = useContext(VtxProvider),
@@ -55,10 +67,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 +74,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);
@@ -128,6 +144,8 @@ function VtxSearch(props) {
       cumulativeWeight: cumulativeWeight
     };
   }, [JSON.stringify(props.gridWeight), size]);
+  var hasMoreButton = isMoreButton && grid.len > realColumn - 1;
+  var hasButtons = renderButtons ? hasRenderableChildren(renderButtons) : isConfirmButton || isClearButton || hasMoreButton;
 
   // 需要显示的位置
   var showPosition = useMemo(function () {
@@ -279,7 +297,7 @@ function VtxSearch(props) {
       children: /*#__PURE__*/_jsxs(Row, {
         gutter: 24,
         attr: "row",
-        children: [analyzeChildren(newChildren), /*#__PURE__*/_jsx(Col, {
+        children: [analyzeChildren(newChildren), hasButtons && /*#__PURE__*/_jsx(Col, {
           span: 24 / realColumn * 1,
           offset: btnOffset,
           className: "vtx-search-buttons-content",
@@ -296,7 +314,7 @@ function VtxSearch(props) {
                   },
                   type: "primary",
                   onClick: onConfirm,
-                  children: confirmText
+                  children: customEnumText.confirmText
                 })
               }), isClearButton && /*#__PURE__*/_jsx("span", {
                 "data-type": 'bt',
@@ -306,18 +324,18 @@ function VtxSearch(props) {
                     width: '100%'
                   },
                   onClick: onClear,
-                  children: clearText
+                  children: customEnumText.clearText
                 })
-              }), isMoreButton && grid.len > realColumn - 1 && /*#__PURE__*/_jsx("div", {
+              }), hasMoreButton && /*#__PURE__*/_jsx("div", {
                 "data-type": 'bt',
                 onClick: function onClick() {
                   return setShowMore(!showMore);
                 },
                 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

@@ -70,14 +70,17 @@ var genVtxStyle = function genVtxStyle(token) {
     alignItems: 'flex-end',
     justifyContent: 'flex-end',
     gap: 12
-  })), "".concat(componentCls, "-more"), {
+  })), "".concat(componentCls, "-more"), _defineProperty({
     height: 32,
     color: token.colorPrimary,
     cursor: 'pointer',
     whiteSpace: 'nowrap',
     alignItems: 'center',
-    display: 'flex'
-  }));
+    display: 'flex',
+    gap: '7px'
+  }, '.anticon', {
+    fontSize: '10px'
+  })));
 };
 export function useStyle() {
   return useAntdStyle(prefix, function (token) {