@zat-design/sisyphus-react 3.14.0-beta.2 → 4.0.0-beta.10

package/es/ProUpload/style/index.less

@@ -1,5 +1,3 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
 
 .pro-upload {
   // display: inline-flex;
@@ -154,10 +152,11 @@
     position: relative;
     display: inline-flex;
 
-    .@{ant-prefix}-upload-list-picture-card-container,
-    .@{ant-prefix}-upload-select-picture-card {
-      width: 126px;
-      height: 126px;
+    .@{ant-prefix}-upload-list-picture-card {
+      .@{ant-prefix}-upload-list-item-container , .@{ant-prefix}-upload-select {
+        width: 126px !important;
+        height: 126px !important;
+      }
     }
 
     .image-example {
@@ -233,10 +232,15 @@
           color: #fff;
           font-size: var(--zaui-font-size-sm, 12px);
           opacity: 0.8;
+          color: #fff!important;
+          align-self: center;
+          &:hover {
+            color: #fff!important;
+          }
 
           .action-icon {
-            margin-right: 10px;
-            transform: translate(0, 3px);
+            margin-right: 4px;
+            vertical-align: sub;
           }
 
           &:hover {
@@ -246,7 +250,10 @@
 
         .action-button {
           .action-item {
-            color: var(--zaui-danger, #ff005f);
+            color: var(--zaui-danger, #ff005f) !important;
+            &:hover {
+              color: var(--zaui-danger, #ff005f) !important;
+            }
           }
         }
       }
@@ -269,9 +276,6 @@
       display: inline-flex;
     }
 
-    .pro-upload-image-footer {
-      margin-top: -8px;
-    }
   }
 
   .file-actions {
@@ -301,6 +305,161 @@
       }
     }
   }
+
+  .@{ant-prefix}-upload-disabled{
+    .file-action-box{
+      .file-name, .file-del{
+        color: #ccc;
+        cursor: not-allowed !important;
+      }
+    }
+  }
+
+  .filelist-item-wrapper {
+    .file-info-box {
+      display: flex;
+      align-items: center;
+      width: 100%;
+      height: 30px;
+      margin-top: var(--zaui-space-size-sm, 8px);
+      color: var(--zaui-text, #343434);
+      font-size: var(--zaui-font-size-sm, 12px);
+      line-height: 16px;
+      &:hover {
+        background: #F8F9FA;
+        border-radius: var(--zaui-border-radius, 8px);
+        color: var(--zaui-brand);
+        .file-actions-wrap {
+          .file-actions{
+            display: flex;
+            .file-action-item{
+              color: var(--zaui-brand);
+            }
+          }
+        }
+      }
+      &.file-box-error {
+        color: var(--zaui-danger);
+
+        .file-actions-wrap {
+          .file-actions{
+            display: flex;
+            .file-action-item{
+              color: var(--zaui-danger);
+            }
+          }
+        }
+
+      }
+
+      .file-type-icon {
+        display: block;
+        width: 18px;
+        height: 23px;
+        margin-left: 6px;
+        overflow: hidden;
+        position: absolute;
+      }
+      .file-name {
+        display: box;
+        padding-left: var(--zaui-space-size-lg, 32px);
+        overflow: hidden;
+        line-clamp: 1;
+        box-orient: vertical;
+        word-break: break-all;
+      }
+      .file-name.file-name-pf0 {
+        padding-left: 0;
+      }
+
+
+      .file-actions-wrap {
+        width: 100px;
+        margin-left: auto;
+        .file-actions {
+          display: none;
+          justify-content: right;
+
+          transition: all 1s;
+
+          .file-action-item {
+            margin-left: var(--zaui-space-size-sm, 8px);
+            padding: 0;
+            cursor: pointer;
+            color: var(--zaui-brand);
+          }
+        }
+      }
+    }
+  }
+
+  // 单个文件拖拽控件
+  .drag-Single-item-wrapper {
+    .file-info-box {
+      display: flex;
+      align-items: center;
+      width: 100%;
+      height: 30px;
+      margin-top: var(--zaui-space-size-sm, 8px);
+      color: var(--zaui-text, #343434);
+
+      font-size: var(--zaui-font-size-sm, 12px);
+      line-height: 16px;
+      justify-content: center;
+      &:hover {
+        background: #F8F9FA;
+        border-radius: var(--zaui-border-radius, 8px);
+      }
+      &:hover,&.file-box-error {
+        .file-actions-wrap {
+          .file-actions{
+            display: flex;
+          }
+        }
+
+      }
+
+      .file-type-icon {
+        display: block;
+        width: 18px;
+        height: 23px;
+        margin-left: 6px;
+        overflow: hidden;
+        position: absolute;
+      }
+      .file-name {
+        display: box;
+        padding-left: var(--zaui-space-size-sm, 8px);
+        overflow: hidden;
+        line-clamp: 1;
+        box-orient: vertical;
+        word-break: keep-all;
+      }
+      .file-name.file-name-pf0 {
+        padding-left: 0;
+      }
+
+      &.file-box-error {
+        color: var(--zaui-danger, #FF005F);
+      }
+
+      .file-actions-wrap {
+        margin-left: 10px;
+        .file-actions {
+          justify-content: right;
+          transition: all 1s;
+          display: flex;
+          .file-action-item {
+            margin-left: var(--zaui-space-size-sm, 8px);
+            padding: 0;
+            cursor: pointer;
+            color: var(--zaui-brand);
+          }
+        }
+      }
+    }
+  }
+
 }
 
 .pro-upload-example {

package/es/ProViewer/index.js

@@ -1,16 +1,10 @@
-import "antd/es/modal/style";
-import _Modal from "antd/es/modal";
-import "antd/es/image/style";
-import _Image from "antd/es/image";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/button/style";
-import _Button from "antd/es/button";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-var _locale$ProViewer;
 /* eslint-disable jsx-a11y/iframe-has-title */
 import { useSetState } from 'ahooks';
+import { Button, Image, Modal } from 'antd';
 import React, { useEffect, useRef } from 'react';
 import locale from "../locale";
 
@@ -27,16 +21,33 @@ var MIMEType = {
   excel: 'application/vnd.ms-excel'
 };
 var ProViewer = /*#__PURE__*/React.forwardRef((_ref, ref) => {
-  var disabled = _ref.disabled,
-    mode = _ref.mode,
-    fileType = _ref.fileType,
-    modalProps = _ref.modalProps,
+  var _locale$ProViewer;
+  var _ref$disabled = _ref.disabled,
+    disabled = _ref$disabled === void 0 ? false : _ref$disabled,
+    _ref$mode = _ref.mode,
+    mode = _ref$mode === void 0 ? 'page' : _ref$mode,
+    _ref$fileType = _ref.fileType,
+    fileType = _ref$fileType === void 0 ? 'pdf' : _ref$fileType,
+    _ref$modalProps = _ref.modalProps,
+    modalProps = _ref$modalProps === void 0 ? {
+      width: '1200px',
+      height: '650px',
+      centered: true,
+      title: locale === null || locale === void 0 || (_locale$ProViewer = locale.ProViewer) === null || _locale$ProViewer === void 0 ? void 0 : _locale$ProViewer.preview,
+      footer: null,
+      style: {
+        padding: 0
+      }
+    } : _ref$modalProps,
+    _ref$buttonProps = _ref.buttonProps,
+    buttonProps = _ref$buttonProps === void 0 ? {
+      type: 'link'
+    } : _ref$buttonProps,
     src = _ref.src,
     onClick = _ref.onClick,
     previewFile = _ref.previewFile,
     previewData = _ref.previewData,
-    children = _ref.children,
-    buttonProps = _ref.buttonProps;
+    children = _ref.children;
   var ProViewerRef = useRef(null);
   var _useSetState = useSetState({
       imgVisible: false,
@@ -165,13 +176,13 @@ var ProViewer = /*#__PURE__*/React.forwardRef((_ref, ref) => {
   }, [previewData]);
   return /*#__PURE__*/_jsxs("span", {
     className: "pro-viewer",
-    children: [/*#__PURE__*/_jsx(_Button, _objectSpread(_objectSpread({
+    children: [/*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({
       disabled: disabled || !url && !previewFile,
       ref: ProViewerRef,
       onClick: previewHandle
     }, buttonProps), {}, {
       children: children
-    })), mode && fileType === 'img' && /*#__PURE__*/_jsx(_Image, {
+    })), mode && fileType === 'img' && /*#__PURE__*/_jsx(Image, {
       src: url,
       preview: {
         visible: imgVisible,
@@ -181,13 +192,13 @@ var ProViewer = /*#__PURE__*/React.forwardRef((_ref, ref) => {
           });
         }
       }
-    }), /*#__PURE__*/_jsx(_Modal, _objectSpread(_objectSpread({
+    }), /*#__PURE__*/_jsx(Modal, _objectSpread(_objectSpread({
       onCancel: () => {
         setState({
           modalVisible: false
         });
       },
-      visible: modalVisible
+      open: modalVisible
     }, modalProps), {}, {
       children: url && /*#__PURE__*/_jsx("iframe", {
         title: "pro-viewer",
@@ -200,22 +211,4 @@ var ProViewer = /*#__PURE__*/React.forwardRef((_ref, ref) => {
     }))]
   });
 });
-ProViewer.defaultProps = {
-  modalProps: {
-    width: '1200px',
-    height: '650px',
-    centered: true,
-    title: locale === null || locale === void 0 || (_locale$ProViewer = locale.ProViewer) === null || _locale$ProViewer === void 0 ? void 0 : _locale$ProViewer.preview,
-    footer: null,
-    bodyStyle: {
-      padding: 0
-    }
-  },
-  buttonProps: {
-    type: 'link'
-  },
-  mode: 'page',
-  fileType: 'pdf',
-  disabled: false
-};
 export default ProViewer;

package/es/ProViewer/propsType.js

@@ -0,0 +1,3 @@
+import { ModalProps } from 'antd';
+
+// 弹窗 或者 页面

package/es/ProViewer/style/index.less

@@ -1,5 +1,3 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
 
 .pro-viewer {
   .@{ant-prefix}-image {

package/es/ProWaterMark/index.js

@@ -1,5 +1,5 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import { Watermark } from '@pansy/react-watermark';
+import { Watermark } from 'antd';
 import React from 'react';
 import { jsx as _jsx } from "react/jsx-runtime";
 var ProWaterMark = props => {
@@ -7,8 +7,7 @@ var ProWaterMark = props => {
   return /*#__PURE__*/_jsx("div", {
     className: "pro-water-mark",
     children: /*#__PURE__*/_jsx(Watermark, _objectSpread(_objectSpread({}, props), {}, {
-      text: content,
-      monitor: true,
+      content: content,
       children: props === null || props === void 0 ? void 0 : props.children
     }))
   });

package/es/ProWaterMark/propsType.d.ts

@@ -1,19 +1,15 @@
+import type { ReactNode } from 'react';
 export interface ProWaterMarkType {
     /**
-     * @description       水印是否显示
-     * @default           true
+     * @description       水印内容
+     * @default           -
      */
-    visible?: boolean;
+    children?: ReactNode;
     /**
      * @description       水印文本, 为数组时表示多行水印
      * @default           -
      */
-    content?: string | string[];
-    /**
-     * @description       是否全局设置水印
-     * @default           false
-     */
-    isBody?: boolean;
+    content: string | string[];
     /**
      * @description       水印层级
      * @default           9999
@@ -34,11 +30,6 @@ export interface ProWaterMarkType {
      * @default           64
      */
     height?: number;
-    /**
-     * @description       水印透明度
-     * @default           0.15
-     */
-    opacity?: number;
     /**
      * @description     旋转的角度
      * @default           -22
@@ -59,11 +50,6 @@ export interface ProWaterMarkType {
      * @default          'normal'
      */
     fontStyle?: 'normal' | 'italic';
-    /**
-     * @description     规定字体变体
-     * @default          normal
-     */
-    fontVariant?: 'normal' | 'small-caps';
     /**
      * @description     设置字体颜色
      * @default          #000
@@ -74,10 +60,5 @@ export interface ProWaterMarkType {
      * @default         sans-serif
      */
     fontFamily?: string;
-    /**
-     * @description       展示模式，interval表示错行展示
-     * @default           'interval'
-     */
-    mode?: 'repeat' | 'interval';
 }
 export type ProWaterMarkProps = ProWaterMarkType;

package/es/global.less

@@ -1,3 +1,4 @@
+/* @import '~antd/dist/reset.css';*/
 @import './style/index.less';
 
 pre {
@@ -10,7 +11,7 @@ pre {
   scrollbar-highlight-color: #979797;
   scrollbar-3dlight-color: #979797;
 
-  ::-webkit-scrollbar  {
+  ::-webkit-scrollbar  {
     width: 16px;
     background: transparent;
   }

package/es/index.d.ts

@@ -1,7 +1,8 @@
 /// <reference types="typings" />
-export { default as ProLayout, useProLayoutTabs } from './ProLayout';
+export { default as ProLayout } from './ProLayout';
 export { default as ProStep } from './ProStep';
 export { default as ProTabs } from './ProTabs';
+export { ProCollapse, ProFooter, ProHeader } from './ProLayout/components';
 export { default as ProTable } from './ProTable';
 export { default as ProTooltip } from './ProTooltip';
 export { default as ProViewer } from './ProViewer';
@@ -21,12 +22,11 @@ export { default as ProConfigProvider } from './ProConfigProvider';
 export { default as FormsProvider } from './FormsProvider';
 export { default as ProUpload } from './ProUpload';
 export { default as ProThemeTools } from './ProThemeTools';
+export { ThemeProvider, useTheme } from './ProThemeTools';
 export { default as ProAction } from './ProAction';
 export * from './ProConfigProvider';
 export * from './locale';
 export { default as ProBackBtn } from './ProLayout/components/ProHeader/components/ProBackBtn';
-export { default as ProEditableTable } from './old/ProEditableTable';
-export { default as ProCertValidity } from './old/ProCertValidity';
 export type { ProFormType, ProColumnProps, ProFormColumnType } from './ProForm/propsType';
 export type { ProFormComponentType } from './ProForm/components';
 export type { ProTableType, ProTableColumnType, ProTableSummaryType, ProTableUseAntdTableType, ProTableProps, ProTableSummaryProps, ProTableColumn, UseAntdTableState } from './ProTable/propsType';

package/es/index.js

@@ -1,9 +1,10 @@
 /// <reference path="../typings.d.ts" />;
 
 // 布局
-export { default as ProLayout, useProLayoutTabs } from "./ProLayout";
+export { default as ProLayout } from "./ProLayout";
 export { default as ProStep } from "./ProStep";
 export { default as ProTabs } from "./ProTabs";
+export { ProCollapse, ProFooter, ProHeader } from "./ProLayout/components"; // ProLayout 中组件导出
 
 // 数据展示
 export { default as ProTable } from "./ProTable";
@@ -20,6 +21,7 @@ export { default as ProStepTab } from "./ProStepTab";
 export { default as ProForm } from "./ProForm";
 export { ProFormProvider } from "./ProForm";
 export * from "./ProForm/components"; // ProForm 中组件导出
+
 export { default as ProSelect } from "./ProSelect";
 export { default as ProEnum } from "./ProEnum";
 
@@ -31,15 +33,13 @@ export { default as ProConfigProvider } from "./ProConfigProvider";
 export { default as FormsProvider } from "./FormsProvider";
 export { default as ProUpload } from "./ProUpload";
 export { default as ProThemeTools } from "./ProThemeTools";
+export { ThemeProvider, useTheme } from "./ProThemeTools";
 export { default as ProAction } from "./ProAction";
 export * from "./ProConfigProvider";
 export * from "./locale";
-
-// old 待废弃
 export { default as ProBackBtn } from "./ProLayout/components/ProHeader/components/ProBackBtn";
-export { default as ProEditableTable } from "./old/ProEditableTable";
-export { default as ProCertValidity } from "./old/ProCertValidity";
 
+// TS类型导出
 // TS类型导出
 
 // token导出

package/es/locale/en_US.js

@@ -62,7 +62,7 @@ export default {
     unExpand: 'Put it all away',
     expand: 'Expand all',
     all: 'Select all',
-    emptyTips: "Oops, what you were looking for couldn't be found"
+    emptyTips: "what you were looking for couldn't be found"
   },
   ProUpload: {
     exampleTitle: 'View sample',

package/es/locale/index.d.ts

@@ -1,3 +1,5 @@
+import 'dayjs/locale/zh-cn';
+import 'dayjs/locale/en';
 /** 设置语言
  * lang当前语言
  * isReload 切换语言后是否刷新页面，一般在项目上使用都需要刷新

package/es/locale/index.js

@@ -1,6 +1,12 @@
-import moment from 'moment';
+import dayjs from 'dayjs';
+// 导入dayjs的中文locale包
+import 'dayjs/locale/zh-cn';
+import 'dayjs/locale/en';
 import zhCN from "./zh_CN";
 import enUS from "./en_US";
+
+// 设置默认语言为中文
+dayjs.locale('zh-cn');
 var activeLang = localStorage.getItem('locale') || 'zh-CN';
 var langMap = {
   'zh-CN': zhCN,
@@ -15,12 +21,17 @@ var langMap = {
 export var setLanguage = (lang, isReload) => {
   activeLang = lang;
   localStorage.setItem('locale', lang);
-  moment.locale(lang.toLowerCase());
+  // 将语言代码转换为dayjs支持的格式
+  var dayjsLocale = lang.toLowerCase() === 'zh-cn' ? 'zh-cn' : 'en';
+  dayjs.locale(dayjsLocale);
   if (isReload) {
     window.location.reload();
   }
 };
 
+// 初始化时设置语言
+setLanguage(activeLang);
+
 /**
  * @param str 待替换字符串 eg: 我是{name},年龄{age}
  * @param variables 变量对象 {name: 'xx', age: 23}

package/es/locale/zh_CN.js

@@ -62,7 +62,7 @@ export default {
     unExpand: '全部收起',
     expand: '全部展开',
     all: '全选',
-    emptyTips: '诶呀，没有找到您要查询的内容'
+    emptyTips: '没有找到您要查询的内容'
   },
   ProUpload: {
     exampleTitle: '查看示例',

package/es/style/components.less

@@ -23,6 +23,3 @@
 @import '../ProIcon/style/index';
 @import '../ProThemeTools/style/index';
 @import '../ProDownload/style/index';
-
-// old 待废弃
-@import '../old/ProEditableTable/style/index';

package/es/style/index.less

@@ -1,2 +1,2 @@
-@import "./components.less";
 @import "./theme/antd.less";
+@import "./components.less";