@zat-design/sisyphus-react 3.1.4 → 3.1.5-beta.10

package/lib/index.d.ts

@@ -21,7 +21,8 @@ export { default as ProUpload } from './ProUpload';
 export { default as ProThemeTools } from './ProThemeTools';
 export { default as ProAction } from './ProAction';
 export * from './ProConfigProvider';
-export { default as ProBackBtn } from './old/ProBackBtn';
+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 * from './ProForm/propsType';

package/lib/index.js

@@ -214,7 +214,19 @@ Object.keys(_ProConfigProvider).forEach(function (key) {
 var _ProUpload = _interopRequireDefault(require("./ProUpload"));
 var _ProThemeTools = _interopRequireDefault(require("./ProThemeTools"));
 var _ProAction = _interopRequireDefault(require("./ProAction"));
-var _ProBackBtn = _interopRequireDefault(require("./old/ProBackBtn"));
+var _locale = require("./locale");
+Object.keys(_locale).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _locale[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _locale[key];
+    }
+  });
+});
+var _ProBackBtn = _interopRequireDefault(require("./ProLayout/components/ProHeader/components/ProBackBtn"));
 var _ProEditableTable = _interopRequireDefault(require("./old/ProEditableTable"));
 var _ProCertValidity = _interopRequireDefault(require("./old/ProCertValidity"));
 var _propsType = require("./ProForm/propsType");

package/lib/locale/en_US.d.ts

@@ -0,0 +1,69 @@
+declare const _default: {
+    common: {
+        save: string;
+        cancel: string;
+    };
+    demo: {
+        openDrawer: string;
+        openModal: string;
+    };
+    search: {
+        search: string;
+        reset: string;
+        collapsed: string;
+        expand: string;
+    };
+    dialog: {
+        modeAdd: string;
+        modeUpdate: string;
+        modeDetail: string;
+        modeCustom: string;
+        close: string;
+        confirm: string;
+    };
+    extra: {
+        refresh: string;
+        density: string;
+        densityLarger: string;
+        densityMiddle: string;
+        densitySmall: string;
+        fullScreen: string;
+        exitFullScreen: string;
+        moveUp: string;
+        moveDown: string;
+        rename: string;
+        columnSetting: string;
+    };
+    action: {
+        success: string;
+        deleteConfirm: string;
+        deleteSuccess: string;
+        noSelection: string;
+        deleteConfirmTitle: string;
+        deleteConfirmBefore: string;
+        deleteConfirmAfter: string;
+        deleteConfirmBatchSuccess: string;
+    };
+    tagGroup: {
+        all: string;
+    };
+    table: {
+        totalBefore: string;
+        totalAfter: string;
+        selectedTitle: string;
+        selectedBefore: string;
+        selectedAfter: string;
+        selectedClear: string;
+    };
+    form: {
+        pleaseInput: string;
+        pleaseInputAfter: string;
+        pleaseSelect: string;
+        pleaseSelectAfter: string;
+        requiredText: string;
+        startDate: string;
+        endDate: string;
+        dateTo: string;
+    };
+};
+export default _default;

package/lib/locale/en_US.js

@@ -0,0 +1,74 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = exports.default = {
+  common: {
+    save: 'save',
+    cancel: 'cancel'
+  },
+  demo: {
+    openDrawer: 'open drawer',
+    openModal: 'open modal'
+  },
+  search: {
+    search: 'Search',
+    reset: 'Reset',
+    collapsed: 'More',
+    expand: 'Close'
+  },
+  dialog: {
+    modeAdd: 'Add',
+    modeUpdate: 'Update',
+    modeDetail: 'Detail',
+    modeCustom: 'Custom',
+    close: ' Close',
+    confirm: 'Confirm'
+  },
+  extra: {
+    refresh: 'refresh',
+    density: 'density',
+    densityLarger: 'default',
+    densityMiddle: 'middle',
+    densitySmall: 'small',
+    fullScreen: 'full screen',
+    exitFullScreen: 'exit full screen',
+    moveUp: 'move up',
+    moveDown: 'move down',
+    rename: 'new name',
+    columnSetting: 'column setting'
+  },
+  action: {
+    success: 'Successful',
+    deleteConfirm: 'Are you sure you want to delete this row?',
+    deleteSuccess: 'Deleted successfully',
+    noSelection: 'Please select a row',
+    deleteConfirmTitle: 'Confirm',
+    deleteConfirmBefore: 'You have selected ',
+    deleteConfirmAfter: 'rows, are you sure you want to delete them?',
+    deleteConfirmBatchSuccess: 'Batch delete successfully'
+  },
+  tagGroup: {
+    all: 'All'
+  },
+  table: {
+    totalBefore: 'Total',
+    totalAfter: 'items',
+    selectedTitle: 'Selection',
+    selectedBefore: 'Selected: ',
+    selectedAfter: 'items',
+    selectedClear: 'Remove All'
+  },
+  form: {
+    pleaseInput: 'input ',
+    pleaseInputAfter: '',
+    pleaseSelect: 'select ',
+    pleaseSelectAfter: '',
+    requiredText: '',
+    startDate: 'Start Date',
+    endDate: 'End date',
+    dateTo: 'To'
+  }
+};

package/lib/locale/index.d.ts

@@ -0,0 +1,7 @@
+/** 设置语言
+ * lang当前语言
+ * isReload 切换语言后是否刷新页面，一般在项目上使用都需要刷新
+ */
+export declare const setLanguage: (lang: string, isReload?: boolean) => void;
+declare const _default: any;
+export default _default;

package/lib/locale/index.js

@@ -0,0 +1,28 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.setLanguage = exports.default = void 0;
+var _moment = _interopRequireDefault(require("moment"));
+var _zh_CN = _interopRequireDefault(require("./zh_CN"));
+var _en_US = _interopRequireDefault(require("./en_US"));
+var activeLang = localStorage.getItem('locale') || 'zh-CN';
+var langMap = {
+  'zh-CN': _zh_CN.default,
+  'en-US': _en_US.default // en-US
+};
+/** 设置语言
+ * lang当前语言
+ * isReload 切换语言后是否刷新页面，一般在项目上使用都需要刷新
+ */
+var setLanguage = exports.setLanguage = function setLanguage(lang, isReload) {
+  activeLang = lang;
+  localStorage.setItem('locale', lang);
+  _moment.default.locale(lang.toLowerCase());
+  if (isReload) {
+    window.location.reload();
+  }
+};
+var _default = exports.default = langMap[activeLang];

package/lib/locale/zh_CN.d.ts

@@ -0,0 +1,69 @@
+declare const _default: {
+    common: {
+        save: string;
+        cancel: string;
+    };
+    demo: {
+        openDrawer: string;
+        openModal: string;
+    };
+    search: {
+        search: string;
+        reset: string;
+        collapsed: string;
+        expand: string;
+    };
+    dialog: {
+        modeAdd: string;
+        modeUpdate: string;
+        modeDetail: string;
+        modeCustom: string;
+        close: string;
+        confirm: string;
+    };
+    extra: {
+        refresh: string;
+        density: string;
+        densityLarger: string;
+        densityMiddle: string;
+        densitySmall: string;
+        fullScreen: string;
+        exitFullScreen: string;
+        moveUp: string;
+        moveDown: string;
+        rename: string;
+        columnSetting: string;
+    };
+    action: {
+        success: string;
+        deleteConfirm: string;
+        deleteSuccess: string;
+        noSelection: string;
+        deleteConfirmTitle: string;
+        deleteConfirmBefore: string;
+        deleteConfirmAfter: string;
+        deleteConfirmBatchSuccess: string;
+    };
+    tagGroup: {
+        all: string;
+    };
+    table: {
+        totalBefore: string;
+        totalAfter: string;
+        selectedTitle: string;
+        selectedBefore: string;
+        selectedAfter: string;
+        selectedClear: string;
+    };
+    form: {
+        pleaseInput: string;
+        pleaseInputAfter: string;
+        pleaseSelect: string;
+        pleaseSelectAfter: string;
+        requiredText: string;
+        startDate: string;
+        endDate: string;
+        dateTo: string;
+    };
+};
+export default _default;

package/lib/locale/zh_CN.js

@@ -0,0 +1,74 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = exports.default = {
+  common: {
+    save: '保存',
+    cancel: '取消'
+  },
+  demo: {
+    openDrawer: '打开抽屉',
+    openModal: '打开弹框'
+  },
+  search: {
+    search: '查询',
+    reset: '重置',
+    collapsed: '展开',
+    expand: '收起'
+  },
+  dialog: {
+    modeAdd: '新增',
+    modeUpdate: '编辑',
+    modeDetail: '详情',
+    modeCustom: '自定义',
+    close: '关闭',
+    confirm: '确定'
+  },
+  extra: {
+    refresh: '刷新',
+    density: '密度',
+    densityLarger: '默认',
+    densityMiddle: '中等',
+    densitySmall: '紧凑',
+    fullScreen: '全屏',
+    exitFullScreen: '退出全屏',
+    moveUp: '上移',
+    moveDown: '下移',
+    rename: '请输入别名',
+    columnSetting: '设置展示列'
+  },
+  action: {
+    success: '成功',
+    deleteConfirm: '你确定要删除此行吗？',
+    deleteSuccess: '删除成功',
+    noSelection: '请选择一条数据',
+    deleteConfirmTitle: '确定',
+    deleteConfirmBefore: '您勾选了',
+    deleteConfirmAfter: '个，确定要删除吗？',
+    deleteConfirmBatchSuccess: '批量删除成功'
+  },
+  tagGroup: {
+    all: '全部'
+  },
+  table: {
+    totalBefore: '共',
+    totalAfter: '条',
+    selectedTitle: '已经选中的选项',
+    selectedBefore: '已选择：',
+    selectedAfter: '条',
+    selectedClear: '清空'
+  },
+  form: {
+    pleaseInput: '请输入',
+    pleaseInputAfter: '',
+    pleaseSelect: '请选择',
+    pleaseSelectAfter: '',
+    requiredText: '',
+    startDate: '开始日期',
+    endDate: '结束日期',
+    dateTo: '至'
+  }
+};

package/lib/old/ProEditableTable/style/index.less

@@ -4,8 +4,7 @@
       display     : inline-block;
       margin-right: 4px;
       color       : #ff5050;
-      font-size   : 14px;
-      font-family : SimSun, sans-serif;
+      font-size   : var(--zaui-font-size, 14px);
       line-height : 1;
       content     : '*';
     }

package/lib/style/components.less

@@ -29,5 +29,4 @@
 
 
 // old 待废弃
-@import '../old/ProBackBtn/style/index';
 @import '../old/ProEditableTable/style/index';

package/lib/style/core/normalize.less

@@ -243,4 +243,4 @@ button,
 input[type='button'] {
   width   : auto;
   overflow: visible;
-}
+}

package/lib/style/theme/antd.less

@@ -55,8 +55,7 @@
         &>.ant-form-item-required::after {
           margin-top : 1px;
           color      : #ff4d4f;
-          font-size  : 14px;
-          font-family: SimSun, sans-serif;
+          font-size  : var(--zaui-font-size, 14px);
           line-height: 1;
           content    : '*';
         }
@@ -86,7 +85,7 @@
   }
 
   .ant-form-item {
-    margin-bottom: 22px !important;
+    margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1)) !important;
   }
 }
 
@@ -332,7 +331,7 @@
   }
 
   .ant-tabs-nav {
-    margin-bottom: var(--zaui-space-size-md, 16px)
+    margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
   }
 
   .ant-tabs-nav .ant-tabs-tab-btn {

package/lib/style/theme/index.less

@@ -3,85 +3,86 @@
 
 /* 兼容IE11  默认会生成2个值，默认值，var值。IE11下读取默认值 */
 :root {
-  --zaui-global-bg: #ffffff;
-  --zaui-base-bg: #ffffff;
-  --zaui-brand: #006aff;
-  --zaui-brand-hover: #3387ff;
-  --zaui-brand-active: #005ad9;
-  --zaui-brand-disabled: #99c3ff;
-  --zaui-text: #343434;
-  --zaui-text-weak: #616161;
-  --zaui-aide-text: #909090;
-  --zaui-placeholder: #a0a0a0;
-  --zaui-link: var(--zaui-brand);
-  --zaui-link-light-active: var(--zaui-brand-active);
-  --zaui-line: #dcdcdc;
-  --zaui-dividing-line: #dcdcdc;
-  --zaui-area: #fafafa;
-  --zaui-shadow: rgba(56, 56, 56, 0.15);
-  --zaui-form-control-line: var(--zaui-line);
-  --zaui-form-control-line-hover: var(--zaui-brand-hover);
-  --zaui-form-control-line-active: var(--zaui-brand-active);
-  --zaui-list-item-active-bg: var(--zaui-brand);
-  --zaui-list-item-active-hover-bg: var(--zaui-brand);
-  --zaui-list-item-selected-bg: var(--zaui-brand);
+  --zaui-global-bg                  : #ffffff;
+  --zaui-base-bg                    : #ffffff;
+  --zaui-brand                      : #006aff;
+  --zaui-brand-hover                : #3387ff;
+  --zaui-brand-active               : #005ad9;
+  --zaui-brand-disabled             : #99c3ff;
+  --zaui-text                       : #343434;
+  --zaui-text-weak                  : #616161;
+  --zaui-aide-text                  : #909090;
+  --zaui-placeholder                : #a0a0a0;
+  --zaui-link                       : var(--zaui-brand);
+  --zaui-link-light-active          : var(--zaui-brand-active);
+  --zaui-line                       : #dcdcdc;
+  --zaui-dividing-line              : #dcdcdc;
+  --zaui-area                       : #fafafa;
+  --zaui-shadow                     : rgba(56, 56, 56, 0.15);
+  --zaui-form-control-line          : var(--zaui-line);
+  --zaui-form-control-line-hover    : var(--zaui-brand-hover);
+  --zaui-form-control-line-active   : var(--zaui-brand-active);
+  --zaui-list-item-active-bg        : var(--zaui-brand);
+  --zaui-list-item-active-hover-bg  : var(--zaui-brand);
+  --zaui-list-item-selected-bg      : var(--zaui-brand);
   --zaui-list-item-selected-hover-bg: var(--zaui-brand);
-  --zaui-disabled-bg: #f2f2f2;
-  --zaui-disabled-text: #333333;
-  --zaui-feedback-overlay-bg: rgba(0, 0, 0, 0.7);
-  --zaui-feedback-overlay-text: #343434;
-  --zaui-primary: var(--zaui-brand);
-  --zaui-primary-hover: var(--zaui-brand-hover);
-  --zaui-primary-active: var(--zaui-brand-active);
-  --zaui-danger-line: var(--zaui-line);
-  --zaui-danger-bg: #fff2f0;
-  --zaui-warning-line: var(--zaui-line);
-  --zaui-warning-bg: #fffbe6;
-  --zaui-info-line: var(--zaui-line);
-  --zaui-info-bg: #e6f7ff;
-  --zaui-success-line: var(--zaui-line);
-  --zaui-success-bg: #f6ffed;
-  --zaui-danger: #ff5050;
-  --zaui-warning: #ec9131;
-  --zaui-success: #00ae4d;
-  --zaui-menu-top-bg: #ffffff;
-  --zaui-menu-left-bg: #1a202d;
-  --zaui-menu-second-bg: #ffffff;
-  --zaui-form-align: left;
-  --zaui-table-header-bg: #f2f3f5;
-  --zaui-table-strip-bg: #fafafa;
-  --zaui-table-hover-bg: #fafafa;
-  --zaui-table-selected-bg: var(--zaui-table-hover-bg); // 默认同悬停
-  --zaui-table-selected-hover-bg: var(--zaui-table-hover-bg); // 默认同悬停
-  --zaui-table-nested-bg: #fafcfe;
-  --zaui-form-label-width: 130px; // 8个全角字符宽度
-  --zaui-border-radius: 4px;
-  --zaui-border-radius-card: 2px;
-  --zaui-font-size-title: 16px;
-  --zaui-font-size-card-title: var(--zaui-font-size-title);
-  --zaui-font-size: 14px;
-  --zaui-font-size-sm: 12px;
-  --zaui-font-size-md: var(--zaui-font-size);
-  --zaui-font-size-lg: 16px;
-  --zaui-font-size-xl: 18px;
-  --zaui-font-size-xxl: 20px;
-  --zaui-font-size-lg-title: 24px;
-  --zaui-height-border: var(--zaui-height-size-md);
-  --zaui-height-card: var(--zaui-height-size-lg);
-  --zaui-height-size-xs: 4px;
-  --zaui-height-size-sm: 8px;
-  --zaui-height-size-md: 16px;
-  --zaui-height-size-lg: 32px;
-  --zaui-height-size-xl: 64px;
-  --zaui-space-border: var(--zaui-space-size-md); // 兼容1.1.35一下版本 变量
-  --zaui-space-card: var(--zaui-space-size-lg);
-  --zaui-space-size-xs: 4px;
-  --zaui-space-size-sm: 8px;
-  --zaui-space-size-md: 16px;
-  --zaui-space-size-lg: 32px;
-  --zaui-space-size-xl: 64px;
+  --zaui-disabled-bg                : #f2f2f2;
+  --zaui-disabled-text              : #333333;
+  --zaui-feedback-overlay-bg        : rgba(0, 0, 0, 0.7);
+  --zaui-feedback-overlay-text      : #343434;
+  --zaui-primary                    : var(--zaui-brand);
+  --zaui-primary-hover              : var(--zaui-brand-hover);
+  --zaui-primary-active             : var(--zaui-brand-active);
+  --zaui-danger-line                : var(--zaui-line);
+  --zaui-danger-bg                  : #fff2f0;
+  --zaui-warning-line               : var(--zaui-line);
+  --zaui-warning-bg                 : #fffbe6;
+  --zaui-info-line                  : var(--zaui-line);
+  --zaui-info-bg                    : #e6f7ff;
+  --zaui-success-line               : var(--zaui-line);
+  --zaui-success-bg                 : #f6ffed;
+  --zaui-danger                     : #ff5050;
+  --zaui-warning                    : #ec9131;
+  --zaui-success                    : #00ae4d;
+  --zaui-menu-top-bg                : #ffffff;
+  --zaui-menu-left-bg               : #1a202d;
+  --zaui-menu-second-bg             : #ffffff;
+  --zaui-form-align                 : left;
+  --zaui-table-header-bg            : #f2f3f5;
+  --zaui-table-strip-bg             : #fafafa;
+  --zaui-table-hover-bg             : #fafafa;
+  --zaui-table-selected-bg          : var(--zaui-table-hover-bg); // 默认同悬停
+  --zaui-table-selected-hover-bg    : var(--zaui-table-hover-bg); // 默认同悬停
+  --zaui-table-nested-bg            : #fafcfe;
+  --zaui-contract-bg                : #fffaa1; // 对比背景色
+  --zaui-form-label-width           : 130px; // 8个全角字符宽度
+  --zaui-border-radius              : 4px;
+  --zaui-border-radius-card         : 2px;
+  --zaui-font-size-title            : 16px;
+  --zaui-font-size-card-title       : var(--zaui-font-size-title);
+  --zaui-font-size                  : 14px;
+  --zaui-font-size-sm               : 12px;
+  --zaui-font-size-md               : var(--zaui-font-size);
+  --zaui-font-size-lg               : 16px;
+  --zaui-font-size-xl               : 18px;
+  --zaui-font-size-xxl              : 20px;
+  --zaui-font-size-lg-title         : 24px;
+  --zaui-height-border              : var(--zaui-height-size-md);
+  --zaui-height-card                : var(--zaui-height-size-lg);
+  --zaui-height-size-xs             : 4px;
+  --zaui-height-size-sm             : 8px;
+  --zaui-height-size-md             : 16px;
+  --zaui-height-size-lg             : 32px;
+  --zaui-height-size-xl             : 64px;
+  --zaui-space-border               : var(--zaui-space-size-md); // 兼容1.1.35一下版本 变量
+  --zaui-space-card                 : var(--zaui-space-size-lg);
+  --zaui-space-size-xs              : 4px;
+  --zaui-space-size-sm              : 8px;
+  --zaui-space-size-md              : 16px;
+  --zaui-space-size-lg              : 32px;
+  --zaui-space-size-xl              : 64px;
 
   --zaui-line-height-base: 1.5;
-  --zaui-size: 1;
-  --zaui-base-font-size: 0px;
-}
+  --zaui-size            : 1;
+  --zaui-base-font-size  : 0px;
+}

package/lib/style/theme/tokens.less

@@ -52,6 +52,7 @@
 @zaui-table-selected-bg: var(--zaui-table-hover-bg #fafafa);
 @zaui-table-selected-hover-bg: var(--zaui-table-hover-bg #fafafa);
 @zaui-table-nested-bg: var(--zaui-table-nested-bg #FAFCFE);
+@zaui-contract-bg: var(--zaui-contract-bg; #fffaa1); // 对比背景色
 @zaui-form-required-after: var(--zaui-form-required-after; inline);
 @zaui-form-required-before: var(--zaui-form-required-before; none);
 @zaui-form-label-width: var(--zaui-form-label-width; 130px);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.1.4",
+  "version": "3.1.5-beta.10",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -58,7 +58,7 @@
     "@dnd-kit/sortable": "^7.0.2",
     "@dnd-kit/utilities": "^3.2.1",
     "@pansy/react-watermark": "^3.1.13",
-    "@zat-design/utils": "^1.1.15",
+    "@zat-design/utils": "^1.1.16",
     "ahooks": "3.7.4",
     "antd": "4.24.8",
     "big.js": "^6.2.1",

package/typings.d.ts

@@ -19,3 +19,5 @@ declare interface EventCenter {
 declare interface Window {
   eventCenter: EventCenter;
 }
+
+type DistributiveOmit<T, K extends keyof any> = T extends any ? Omit<T, K> : never;

package/es/old/ProBackBtn/style/index.less

@@ -1,19 +0,0 @@
-.back-button-container {
-  color      : var(--zaui-aide-text);
-  font-weight: 400;
-  background : var(--zaui-disabled-bg);
-  border     : none;
-
-  &:hover {
-    color     : var(--zaui-aide-text);
-    background: var(--zaui-disabled-bg);
-    border    : none;
-  }
-
-  &:active,
-  &:focus {
-    color      : var(--zaui-aide-text);
-    font-weight: 400;
-    background : var(--zaui-disabled-bg);
-  }
-}

package/lib/old/ProBackBtn/style/index.less

@@ -1,19 +0,0 @@
-.back-button-container {
-  color      : var(--zaui-aide-text);
-  font-weight: 400;
-  background : var(--zaui-disabled-bg);
-  border     : none;
-
-  &:hover {
-    color     : var(--zaui-aide-text);
-    background: var(--zaui-disabled-bg);
-    border    : none;
-  }
-
-  &:active,
-  &:focus {
-    color      : var(--zaui-aide-text);
-    font-weight: 400;
-    background : var(--zaui-disabled-bg);
-  }
-}