@zat-design/sisyphus-react 3.2.1 → 3.2.2-beta.2

package/lib/locale/zh_CN.d.ts

@@ -38,7 +38,6 @@ declare const _default: {
         errorMessage: string;
         defaultTitle: string;
     };
-    ProWaterMark: {};
     ProTable: {
         noData: string;
         resetColumnWidth: string;
@@ -94,6 +93,7 @@ declare const _default: {
         operation: string;
         noData: string;
         clickAdd: string;
+        total: string;
         onlyOneLineMsg: string;
         deletePoConfirmMsg: string;
         mulDeletePoConfirmMsg: string;
@@ -133,5 +133,19 @@ declare const _default: {
     ProTimeLimit: {
         foreverText: string;
     };
+    ProThemeTools: {
+        title: string;
+        copySuccess: string;
+        layout: string;
+        layoutMode: string[];
+        themeColor: string;
+        formLabel: string;
+        bigText: string;
+        flex: string[];
+        switchText: string[];
+        tableBorder: string;
+        tableStripe: string;
+        reset: string;
+    };
 };
 export default _default;

package/lib/locale/zh_CN.js

@@ -44,7 +44,6 @@ var _default = exports.default = {
     errorMessage: 'ProAction 配置 config 必须为数据',
     defaultTitle: '确认删除吗?'
   },
-  ProWaterMark: {},
   ProTable: {
     noData: '暂无数据',
     resetColumnWidth: '重置列宽',
@@ -100,6 +99,7 @@ var _default = exports.default = {
     operation: '操作',
     noData: '暂无数据',
     clickAdd: '点击添加',
+    total: '共{total}条',
     onlyOneLineMsg: '请先保存数据',
     deletePoConfirmMsg: '您确定要删除该行数据吗？',
     mulDeletePoConfirmMsg: '您确定要删除选中的数据吗？'
@@ -138,5 +138,19 @@ var _default = exports.default = {
   },
   ProTimeLimit: {
     foreverText: '长期'
+  },
+  ProThemeTools: {
+    title: '全局样式自定义',
+    copySuccess: '复制成功！',
+    layout: '布局',
+    layoutMode: ['紧凑', '常规', '宽松'],
+    themeColor: '主题色',
+    formLabel: '表单标题',
+    bigText: '大字号模式',
+    flex: ['左对齐', '右对齐'],
+    switchText: ['开', '关'],
+    tableBorder: '表格边框',
+    tableStripe: '表格斑马纹',
+    reset: '重置'
   }
 };

package/lib/old/ProCertValidity/index.js

@@ -11,7 +11,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _moment = _interopRequireDefault(require("moment"));
 var _react = require("react");
-var _excluded = ["value", "onChange", "disabled", "isRange", "getPopupContainer", "showForever", "proformmode"]; // @ts-nocheck
+var _excluded = ["value", "onChange", "disabled", "isRange", "getPopupContainer", "showForever", "proformmode"];
 var RangePicker = _antd.DatePicker.RangePicker;
 var defaultFormatDate = 'YYYY-MM-DD';
 var defaultPopupContainer = function defaultPopupContainer(triggerNode) {

package/lib/style/theme/antd.less

@@ -1,6 +1,6 @@
 @import './index';
 
-@zat-disabled-color : #BCBCBC;
+@zat-disabled-color: #bcbcbc;
 
 /* antd 默认样式重置 */
 
@@ -21,12 +21,12 @@
 
     // label 超过130px换行
     .ant-form-item-label {
-      flex         : 0 0 @zaui-form-label-width;
-      overflow     : initial;
-      line-height  : 1;
-      text-align   : @zaui-form-align;
-      white-space  : pre-wrap;
+      flex: 0 0 @zaui-form-label-width;
       padding-right: @zaui-space-size-sm;
+      overflow: initial;
+      line-height: 1;
+      white-space: pre-wrap;
+      text-align: @zaui-form-align;
 
       .ant-form-item-required {
         &::after {
@@ -34,12 +34,12 @@
         }
       }
 
-      &>label {
+      & > label {
         word-break: break-word;
 
         &::after {
-          margin : 0;
           display: none;
+          margin: 0;
         }
       }
 
@@ -48,21 +48,21 @@
       }
 
       &.ant-form-item-label-left {
-        &>.ant-form-item-required::before {
+        & > .ant-form-item-required::before {
           display: none;
         }
 
-        &>.ant-form-item-required::after {
-          margin-top : 1px;
-          color      : #ff4d4f;
-          font-size  : var(--zaui-font-size, 14px);
+        & > .ant-form-item-required::after {
+          margin-top: 1px;
+          color: #ff4d4f;
+          font-size: var(--zaui-font-size, 14px);
           line-height: 1;
-          content    : '*';
+          content: '*';
         }
       }
 
       &:not(.ant-form-item-label-left) {
-        &>.ant-form-item-required::after {
+        & > .ant-form-item-required::after {
           display: none;
         }
       }
@@ -74,8 +74,8 @@
   }
 
   // 字体颜色
-  .ant-form-item-label>label,
-  .ant-picker-input>input,
+  .ant-form-item-label > label,
+  .ant-picker-input > input,
   .ant-input,
   .ant-input-number,
   .ant-select,
@@ -93,13 +93,16 @@
 .ant-select-disabled,
 .ant-select-disabled.ant-select:not(.ant-select-customize-input) .ant-select-selector,
 .ant-input-number-disabled,
-.ant-picker-input>input[disabled],
+.ant-picker-input > input[disabled],
 .ant-select-disabled.ant-select-multiple .ant-select-selection-item {
   .set-disabled-color();
 }
 
 // ant-table
 .ant-table {
+  .ant-empty-normal {
+    margin: calc(var(--zaui-space-size-lg; 32px) * var(--zaui-size; 1)) 0;
+  }
   &.pro-table-no-stripe {
     .ant-table-tbody {
       .ant-table-row {
@@ -126,19 +129,19 @@
     }
   }
 
-  .ant-table-thead>tr>th {
-    background   : @zaui-table-header-bg;
+  .ant-table-thead > tr > th {
+    background: @zaui-table-header-bg;
     border-bottom: none;
 
     .ant-dropdown-trigger {
       .anticon-down {
-        width       : 0;
-        height      : 0;
-        margin      : 0 0 1px 4px;
-        border-top  : 6px solid #909090;
+        width: 0;
+        height: 0;
+        margin: 0 0 1px 4px;
+        border-top: 6px solid #909090;
         border-right: 5px solid transparent;
-        border-left : 5px solid transparent;
-        transition  : transform 0.8s;
+        border-left: 5px solid transparent;
+        transition: transform 0.8s;
 
         svg {
           display: none;
@@ -153,15 +156,15 @@
     }
 
     tr.ant-table-row:hover td {
-      background-color: @zaui-table-hover-bg  !important;
+      background-color: @zaui-table-hover-bg !important;
     }
 
-    &>tr>td {
+    & > tr > td {
       border-bottom: none;
     }
 
     tr.ant-table-row-selected {
-      &:hover>td {
+      &:hover > td {
         background: @zaui-table-selected-hover-bg;
       }
 
@@ -171,13 +174,13 @@
     }
   }
 
-  .ant-table-thead>tr>th,
+  .ant-table-thead > tr > th,
   .ant-table-footer {
     .set-text-color();
     .set-text-size();
   }
 
-  .ant-table-tbody>tr>td {
+  .ant-table-tbody > tr > td {
     .set-text-size();
 
     .ant-btn {
@@ -206,12 +209,20 @@
     }
   }
 
-  &.ant-table-scroll-horizontal table {
+  & table {
+    .ant-table-thead > tr > th,
+    .ant-table-tbody > tr > td,
+    .ant-table tfoot > tr > th,
+    .ant-table tfoot > tr > td {
+      padding: calc(5px + var(--zaui-size) * 8px) 16px;
+    }
+  }
 
-    .ant-table-thead>tr>th,
-    .ant-table-tbody>tr>td,
-    .ant-table tfoot>tr>th,
-    .ant-table tfoot>tr>td {
+  &.ant-table-scroll-horizontal table {
+    .ant-table-thead > tr > th,
+    .ant-table-tbody > tr > td,
+    .ant-table tfoot > tr > th,
+    .ant-table tfoot > tr > td {
       padding: calc(5px + var(--zaui-size) * 8px) 16px;
     }
 
@@ -226,17 +237,17 @@
         }
       }
 
-      .ant-table-row:hover>td {
+      .ant-table-row:hover > td {
         background-color: @zaui-table-strip-bg;
       }
 
       tr.ant-table-row-selected {
-        &:hover>td {
-          background: @zaui-table-selected-bg  !important;
+        &:hover > td {
+          background: @zaui-table-selected-bg !important;
         }
 
         td {
-          background: @zaui-table-selected-bg  !important;
+          background: @zaui-table-selected-bg !important;
         }
       }
 
@@ -258,7 +269,7 @@
           & td,
           & td.ant-table-cell-fix-right,
           & td.ant-table-cell-fix-left {
-            background-color: #fff;
+            background-color: #fff !important;
           }
 
           & td {
@@ -267,10 +278,10 @@
         }
 
         .ant-table-row:nth-child(odd) {
-          background-color: @zaui-table-strip-bg;
+          background-color: @zaui-table-strip-bg !important;
 
           & td {
-            background-color: @zaui-table-strip-bg;
+            background-color: @zaui-table-strip-bg !important;
           }
         }
       }
@@ -279,21 +290,20 @@
 
   .ant-table-cell {
     .ant-btn-link {
-      padding    : 0;
-      height     : auto;
+      height: auto;
+      padding: 0;
       user-select: text;
     }
 
     a {
+      color: var(--zaui-brand, #006aff);
       user-select: text;
-      color      : var(--zaui-brand, #006aFF);
     }
   }
 
   &.ant-table-fixed-header {
     .ant-table-tbody {
       .ant-table-row:nth-child(even) {
-
         td {
           background: #ffffff !important;
         }
@@ -318,15 +328,15 @@
   .ant-tabs-nav-list {
     &.ant-tabs-card {
       .ant-tabs-tab {
-        padding     : 8px var(--zaui-space-size-md, 16px);
         margin-right: 10px;
+        padding: 8px var(--zaui-space-size-md, 16px);
       }
     }
 
     .ant-tabs-tab {
       .set-text-size();
-      padding    : 12px var(--zaui-space-size-md, 16px);
       margin-left: 0;
+      padding: 12px var(--zaui-space-size-md, 16px);
     }
   }
 
@@ -339,6 +349,11 @@
   }
 
   &.ant-tabs-card {
+    .ant-tabs-tab {
+      margin-right: 10px !important;
+      padding: 8px calc(var(--zaui-space-size-md, 16px) * var(--zaui-size, 1)) !important;
+    }
+
     .ant-tabs-nav .ant-tabs-tab-btn {
       font-size: var(--zaui-font-size, 14px);
     }
@@ -351,8 +366,8 @@
   font-size: @zaui-font-size;
 
   .ant-btn-primary {
-    color       : #fff;
-    background  : @zaui-brand;
+    color: #fff;
+    background: @zaui-brand;
     border-color: @zaui-brand;
   }
 
@@ -360,24 +375,24 @@
   &.ant-btn-primary[disabled]:hover,
   &.ant-btn-primary[disabled]:focus,
   &.ant-btn-primary[disabled]:active {
-    color       : #fff;
-    text-shadow : none;
-    background  : @zaui-brand;
+    color: #fff;
+    text-shadow: none;
+    background: @zaui-brand;
     border-color: @zaui-brand;
-    box-shadow  : none;
-    opacity     : 0.6;
+    box-shadow: none;
+    opacity: 0.6;
   }
 
   &.ant-btn-link[disabled],
   &.ant-btn-link[disabled]:hover,
   &.ant-btn-link[disabled]:focus,
   &.ant-btn-link[disabled]:active {
-    color       : @zat-disabled-color;
-    text-shadow : none;
-    background  : none;
+    color: @zat-disabled-color;
+    text-shadow: none;
+    background: none;
     border-color: none;
-    box-shadow  : none;
-    opacity     : 0.6;
+    box-shadow: none;
+    opacity: 0.6;
   }
 
   &.ant-btn-link {
@@ -404,22 +419,22 @@
 
 // 分页
 .ant-pagination {
-  color    : @zaui-text  !important;
-  font-size: @zaui-font-size  !important;
+  color: @zaui-text !important;
+  font-size: @zaui-font-size !important;
 
   &.ant-table-pagination {
     margin: @zaui-height-size-md 0;
   }
 
   .ant-pagination-item {
-    min-width       : 32px;
-    height          : 32px;
-    margin-right    : 8px;
-    font-size       : @zaui-font-size;
-    line-height     : 32px;
+    min-width: 32px;
+    height: 32px;
+    margin-right: 8px;
+    font-size: @zaui-font-size;
+    line-height: 32px;
     background-color: #f7f9fa;
-    border          : 0;
-    border-radius   : @zaui-border-radius;
+    border: 0;
+    border-radius: @zaui-border-radius;
 
     a {
       .set-text-color();
@@ -435,8 +450,8 @@
   }
 
   .ant-pagination-item-active a {
-    color        : #fff;
-    background   : @zaui-brand;
+    color: #fff;
+    background: @zaui-brand;
     border-radius: @zaui-border-radius;
   }
 
@@ -449,12 +464,12 @@
   .ant-pagination-next,
   .ant-pagination-jump-prev,
   .ant-pagination-jump-next {
-    min-width       : 32px;
-    height          : 32px;
-    line-height     : 30px;
+    min-width: 32px;
+    height: 32px;
+    line-height: 30px;
     background-color: #f7f9fa;
-    border          : 0;
-    border-radius   : @zaui-border-radius;
+    border: 0;
+    border-radius: @zaui-border-radius;
   }
 
   .ant-pagination-prev,
@@ -473,27 +488,27 @@
 
   .ant-pagination-prev .ant-pagination-item-link,
   .ant-pagination-next .ant-pagination-item-link {
-    min-width       : 32px;
-    height          : 32px;
-    line-height     : 32px;
+    min-width: 32px;
+    height: 32px;
+    line-height: 32px;
     background-color: #fafafa;
-    border          : 0;
-    border-radius   : @zaui-border-radius;
+    border: 0;
+    border-radius: @zaui-border-radius;
   }
 
   .ant-select-single:not(.ant-select-customize-input) .ant-select-selector {
     .set-text-color();
     .set-text-size();
-    width  : 100%;
-    height : 32px;
+    width: 100%;
+    height: 32px;
     padding: 0 12px;
   }
 
   .ant-select:not(.ant-select-customize-input) .ant-select-selector {
-    position        : relative;
+    position: relative;
     background-color: #fafafa;
-    border          : 0;
-    border-radius   : @zaui-border-radius;
+    border: 0;
+    border-radius: @zaui-border-radius;
   }
 
   .ant-pagination-jump-prev .ant-pagination-item-container .ant-pagination-item-link-icon,
@@ -504,7 +519,6 @@
 
 // ant-descriptions
 .ant-descriptions {
-
   .ant-descriptions-item-label,
   .ant-descriptions-item-content {
     .set-text-color();
@@ -523,8 +537,8 @@
 
 // ant-menu
 .ant-menu {
-  color    : @zaui-text  !important;
-  font-size: @zaui-font-size  !important;
+  color: @zaui-text !important;
+  font-size: @zaui-font-size !important;
 
   .ant-menu-item a {
     .set-text-color();
@@ -544,13 +558,13 @@
 .ant-select {
   .ant-select-arrow {
     .anticon-down {
-      width         : 0;
-      height        : 0;
+      width: 0;
+      height: 0;
       vertical-align: middle;
-      border-top    : 6px solid #909090;
-      border-right  : 5px solid transparent;
-      border-left   : 5px solid transparent;
-      transition    : transform 0.3s;
+      border-top: 6px solid #909090;
+      border-right: 5px solid transparent;
+      border-left: 5px solid transparent;
+      transition: transform 0.3s;
 
       svg {
         display: none;
@@ -561,22 +575,22 @@
   // 多选样式重置
   &.ant-select-multiple {
     .ant-select-selection-item {
-      align-items  : center;
+      align-items: center;
       padding-right: 7px;
-      background   : #f2f3f5;
+      background: #f2f3f5;
 
       .ant-select-selection-item-remove {
-        display        : flex;
-        align-items    : center;
+        display: flex;
+        align-items: center;
         justify-content: center;
-        width          : 14px;
-        height         : 14px;
-        background     : #e0e1e7;
-        border-radius  : 100%;
+        width: 14px;
+        height: 14px;
+        background: #e0e1e7;
+        border-radius: 100%;
 
         .anticon-close {
           margin-top: 2px;
-          color     : #4e5969;
+          color: #4e5969;
         }
       }
     }
@@ -619,7 +633,6 @@
     padding-bottom: 20px;
   }
 
-
   &.ant-input-textarea-show-count.ant-input-textarea-in-form-item {
     &::after {
       background: transparent;
@@ -632,13 +645,13 @@
     }
 
     &::after {
-      position     : absolute;
-      right        : 16px;
-      bottom       : 1px;
+      position: absolute;
+      right: 16px;
+      bottom: 1px;
+      width: calc(100% - 18px);
       margin-bottom: 0;
-      background   : #fff;
-      width        : calc(100% - 18px);
-      text-align   : right;
+      text-align: right;
+      background: #fff;
     }
   }
 }
@@ -647,28 +660,27 @@
 .ant-space {
   &.ant-space-vertical {
     display: flex;
-    width  : 100%;
+    width: 100%;
   }
 }
 
 // Cascader级联选择
 .ant-cascader {
   .ant-cascader-menu {
-    height    : auto;
+    height: auto;
     max-height: 326px;
   }
 }
 
 .ant-select-dropdown {
-
   // tree select 样式重置
   .ant-select-tree .ant-select-tree-node-content-wrapper {
-    min-height : 0px;
+    min-height: 0px;
     line-height: initial;
   }
 
   .ant-select-tree .ant-select-tree-treenode {
-    padding-top   : 4px;
+    padding-top: 4px;
     padding-bottom: 4px;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.2.1",
+  "version": "3.2.2-beta.2",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",