@zat-design/sisyphus-react 3.2.1 → 3.2.2

package/lib/ProTree/components/Tree.js

@@ -130,7 +130,7 @@ function List(props) {
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
       open = _useState2[0],
       setOpen = _useState2[1];
-    var operateButton = menu && menu(item === null || item === void 0 ? void 0 : item.value, item);
+    var operateButton = menu && menu(item === null || item === void 0 ? void 0 : item[fieldNameValue], item);
     operateButton === null || operateButton === void 0 ? void 0 : operateButton.map(function (item, i) {
       return (0, _jsxRuntime.jsx)(_react.default.Fragment, {
         children: item
@@ -268,32 +268,19 @@ function List(props) {
       })]
     }, onlyKey);
   };
-  var _treeData = (0, _react.useMemo)(function () {
-    function fn() {
-      var loop = function loop(data, index) {
-        index++;
-        var treeRow = data.map(function (item) {
-          var nodeClass = 'pro-tree-tree-node ';
-          var isChecked = false;
-          if (currentClickTreeNode === item[fieldNameValue]) {
-            nodeClass += ' checked';
-            isChecked = true;
-          }
-          var title = showCodeName ? "".concat(item[fieldNameValue], "-").concat(item[fieldNameLabel]) : item[fieldNameLabel];
-          if (item[fieldNames.children]) {
-            return {
-              title: (0, _jsxRuntime.jsx)(TreeNodeRow, {
-                nodeClass: nodeClass,
-                item: item,
-                index: index,
-                title: title,
-                isChecked: isChecked,
-                onlyKey: item[fieldNameValue]
-              }),
-              key: item[fieldNameValue],
-              children: loop(item[fieldNames.children], index)
-            };
-          }
+  // const _treeData = useMemo(() => {
+  function fn() {
+    var loop = function loop(data, index) {
+      index++;
+      var treeRow = data.map(function (item) {
+        var nodeClass = 'pro-tree-tree-node ';
+        var isChecked = false;
+        if (currentClickTreeNode === item[fieldNameValue]) {
+          nodeClass += ' checked';
+          isChecked = true;
+        }
+        var title = showCodeName ? "".concat(item[fieldNameValue], "-").concat(item[fieldNameLabel]) : item[fieldNameLabel];
+        if (item[fieldNames.children]) {
           return {
             title: (0, _jsxRuntime.jsx)(TreeNodeRow, {
               nodeClass: nodeClass,
@@ -303,23 +290,37 @@ function List(props) {
               isChecked: isChecked,
               onlyKey: item[fieldNameValue]
             }),
-            key: item[fieldNameValue]
+            key: item[fieldNameValue],
+            children: loop(item[fieldNames.children], index)
           };
-        });
-        return treeRow; // .filter((item) => item);
-      };
+        }
+        return {
+          title: (0, _jsxRuntime.jsx)(TreeNodeRow, {
+            nodeClass: nodeClass,
+            item: item,
+            index: index,
+            title: title,
+            isChecked: isChecked,
+            onlyKey: item[fieldNameValue]
+          }),
+          key: item[fieldNameValue]
+        };
+      });
+      return treeRow; // .filter((item) => item);
+    };
 
-      if ((other === null || other === void 0 ? void 0 : other.mode) === 'view') {
-        return;
-      }
-      var newTreeData = originalTreeData;
-      if (searchStr) {
-        newTreeData = (0, _utils.filterCheckedNodes)(originalTreeData, [], searchStr, fieldNames);
-      }
-      return loop(newTreeData, -1);
+    if ((other === null || other === void 0 ? void 0 : other.mode) === 'view') {
+      return;
+    }
+    var newTreeData = originalTreeData;
+    if (searchStr) {
+      newTreeData = (0, _utils.filterCheckedNodes)(originalTreeData, [], searchStr, fieldNames);
     }
-    return fn();
-  }, [searchStr, expandedKeys, showCodeName, originalTreeData, currentClickTreeNode]);
+    return loop(newTreeData, -1);
+  }
+  // return fn();
+  // }, [searchStr, expandedKeys, showCodeName, originalTreeData, currentClickTreeNode]);
+  var _treeData = fn();
   var onExpand = function onExpand(newExpandedKeys) {
     setState({
       expandedKeys: newExpandedKeys,

package/lib/ProTree/style/index.less

@@ -315,12 +315,6 @@
   }
 }
 
-// 中意全局样式覆盖
-// .pro-form.pro-form-view .ant-form-item * {
-//   line-height: 1!important;
-//   height: auto!important;
-//   min-height: auto!important;
-// }
 // 重置ant-form view模式样式ant-tree样式
 .pro-form.pro-form-view .ant-form-item .pro-tree * {
   line-height: 1 !important;

package/lib/ProTreeSelect/index.js

@@ -147,9 +147,10 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
       _antd.message.error(msg);
       return;
     }
+    var resultData = transferDataSource(data, showCodeName);
     setState({
-      selectList: data || [],
-      origDataSource: data || []
+      selectList: resultData || [],
+      origDataSource: resultData || []
     });
   };
   // 配置了异步数据源，拉取枚举数据逻辑 如果有code不掉接口从local里根据code取值

package/lib/locale/en_US.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: {
         save: string;
         custom: string;
         operation: string;
+        total: string;
         onlyOneLineMsg: string;
         deletePoConfirmMsg: string;
         mulDeletePoConfirmMsg: string;
@@ -134,5 +134,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/en_US.js

@@ -44,7 +44,6 @@ var _default = exports.default = {
     errorMessage: 'The configuration config for ProAction must be data',
     defaultTitle: 'Are you sure delete it?'
   },
-  ProWaterMark: {},
   ProTable: {
     noData: 'No data',
     resetColumnWidth: 'Reset column width',
@@ -100,6 +99,7 @@ var _default = exports.default = {
     save: 'Save',
     custom: 'Custom',
     operation: 'Operation',
+    total: '{total} items in total',
     onlyOneLineMsg: 'Please save the data first',
     deletePoConfirmMsg: 'Are you sure you want to delete this row of data?',
     mulDeletePoConfirmMsg: 'Are you sure you want to delete the selected data?'
@@ -126,12 +126,12 @@ var _default = exports.default = {
   ProTreeModal: {
     checkMsg: 'Please check first',
     select: 'Please select',
-    input: 'please enter',
+    input: 'Please enter',
     errorArrayMessage: 'Please return a valid array',
     selectMin: 'Select at least {min}',
     selectMax: 'Select at most {max} items',
     noCheck: 'None selected yet',
-    checkAll: 'select all',
+    checkAll: 'Select all',
     check: 'selected',
     clearAll: 'Clear all',
     checkNumber: '{num} items selected',
@@ -139,5 +139,19 @@ var _default = exports.default = {
   },
   ProTimeLimit: {
     foreverText: 'long term'
+  },
+  ProThemeTools: {
+    title: 'Global style customization ',
+    copySuccess: 'Copy success! ',
+    layout: 'Layout',
+    layoutMode: ['Compact ', 'Regular', 'Loose'],
+    themeColor: 'Theme color',
+    formLabel: 'Form label',
+    bigText: 'Large text mode',
+    flex: ['Left align ', 'Right align'],
+    switchText: ['on', 'off'],
+    tableBorder: 'Table border',
+    tableStripe: 'Table zebra',
+    reset: 'Reset'
   }
 };

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/style/theme/antd.less

@@ -258,7 +258,7 @@
           & td,
           & td.ant-table-cell-fix-right,
           & td.ant-table-cell-fix-left {
-            background-color: #fff;
+            background-color: #fff !important;
           }
 
           & td {
@@ -267,10 +267,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;
           }
         }
       }
@@ -339,6 +339,11 @@
   }
 
   &.ant-tabs-card {
+    .ant-tabs-tab {
+      padding     : 8px calc(var(--zaui-space-size-md, 16px)*var(--zaui-size, 1)) !important;
+      margin-right: 10px !important;
+    }
+
     .ant-tabs-nav .ant-tabs-tab-btn {
       font-size: var(--zaui-font-size, 14px);
     }

package/package.json

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