@zat-design/sisyphus-react 3.6.10 → 3.7.0-beta.1

package/lib/ProTable/style/index.less

@@ -2,17 +2,17 @@
 @import (reference) '~antd/es/style/themes/index.less';
 
 .pro-table {
-  &.pro-table-draggable-only{
-    .ant-table-tbody{
+  &.pro-table-draggable-only {
+    .ant-table-tbody {
       .anticon {
         margin-right: 0;
       }
     }
   }
   .@{ant-prefix}-table-cell-with-append {
-    white-space: nowrap;
     position: relative;
     z-index: 100;
+    white-space: nowrap;
   }
   .@{ant-prefix}-table-row-expand-icon {
     position: absolute;
@@ -20,16 +20,15 @@
   }
 
   .@{ant-prefix}-table-content {
-    >table {
+    > table {
       .@{ant-prefix}-table-summary {
+        color: var(--zaui-text, #343434);
+        font-weight: 600;
         background-color: var(--zaui-table-header-bg, #f2f3f5);
-        color           : var(--zaui-text, #343434);
-        font-weight     : 600;
 
         .@{ant-prefix}-table-cell-fix-left,
         .@{ant-prefix}-table-cell-fix-right {
           background-color: var(--zaui-table-header-bg, #f2f3f5);
-
         }
       }
 
@@ -43,33 +42,37 @@
         }
       }
 
-      .@{ant-prefix}-table-thead>tr>th:not(.@{ant-prefix}-table-selection-column):not(.@{ant-prefix}-table-row-expand-icon-cell):not([colspan]).is-required {
+      .@{ant-prefix}-table-thead
+        > tr
+        > th:not(.@{ant-prefix}-table-selection-column):not(
+          .@{ant-prefix}-table-row-expand-icon-cell
+        ):not([colspan]).is-required {
         &.is-required-right {
           .pro-edit-table-title {
             &::before {
-              position   : static;
-              top        : 0;
-              display    : inline-block;
-              text-indent: -8px;
-              color      : #ff5050;
-              font-size  : var(--zaui-font-size-md, 14px);
+              position: static;
+              top: 0;
+              display: inline-block;
+              color: #ff5050;
+              font-size: var(--zaui-font-size-md, 14px);
               line-height: 1;
-              content    : "*";
+              text-indent: -8px;
+              content: '*';
             }
           }
         }
         &.is-required-left {
           .pro-edit-table-title {
             &::after {
+              position: static;
+              top: 0;
+              display: inline-block;
               width: auto;
-              position   : static;
-              top        : 0;
-              display    : inline-block;
               margin-left: var(--zaui-space-size-xs, 4px);
-              color      : #ff5050;
-              font-size  : 14px;
+              color: #ff5050;
+              font-size: 14px;
               line-height: 1;
-              content    : "*";
+              content: '*';
             }
           }
         }
@@ -80,9 +83,9 @@
     display: flex;
     width: 20px;
     .anticon {
-      cursor: pointer;
       margin-right: 12px;
-      .drag-icon{
+      cursor: pointer;
+      .drag-icon {
         margin-right: 0;
       }
     }
@@ -93,8 +96,6 @@
     }
   }
 
-
-
   &.pro-table-bordered {
     .@{ant-prefix}-table .@{ant-prefix}-table-thead > tr > th {
       border-bottom: 1px solid #f0f0f0;
@@ -557,10 +558,4 @@
       }
     }
   }
-}
-
-.pro-edit-table-drag {
-  table tr th.@{ant-prefix}-table-selection-column.@{ant-prefix}-table-cell-fix-left{
-    text-align: right;
-  }
-}
+}

package/lib/ProThemeTools/component/{PrdTools → ProTools}/index.d.ts

@@ -1,3 +1,3 @@
 import type { DevToolsPropsType } from '../../propsType';
-declare const PrdTools: ({ onReset, onClose, setState, open, state, tableBorder, tableStripe, }: DevToolsPropsType) => import("react/jsx-runtime").JSX.Element;
-export default PrdTools;
+declare const ProTools: ({ onReset, onClose, setState, open, state, tableBorder, tableStripe, }: DevToolsPropsType) => import("react/jsx-runtime").JSX.Element;
+export default ProTools;

package/lib/ProThemeTools/component/{PrdTools → ProTools}/index.js

@@ -21,7 +21,7 @@ var connect = function connect(Component) {
   return ComponentWrapper;
 };
 var NewDrawer = connect(_antd.Drawer);
-var PrdTools = function PrdTools(_ref) {
+var ProTools = function ProTools(_ref) {
   var onReset = _ref.onReset,
     onClose = _ref.onClose,
     setState = _ref.setState,
@@ -266,4 +266,4 @@ var PrdTools = function PrdTools(_ref) {
     })]
   });
 };
-var _default = exports.default = PrdTools;
+var _default = exports.default = ProTools;

package/lib/ProThemeTools/component/index.d.ts

@@ -1,2 +1 @@
-/// <reference types="typings" />
-export { default as PrdTools } from './PrdTools';
+export { default as ProTools } from './ProTools';

package/lib/ProThemeTools/component/index.js

@@ -4,10 +4,10 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "PrdTools", {
+Object.defineProperty(exports, "ProTools", {
   enumerable: true,
   get: function get() {
-    return _PrdTools.default;
+    return _ProTools.default;
   }
 });
-var _PrdTools = _interopRequireDefault(require("./PrdTools"));
+var _ProTools = _interopRequireDefault(require("./ProTools"));

package/lib/ProThemeTools/index.js

@@ -186,7 +186,7 @@ var ProThemeTools = function ProThemeTools(_ref) {
         className: "setting-icon",
         src: _setting.default
       })
-    }), (0, _jsxRuntime.jsx)(_component.PrdTools, {
+    }), (0, _jsxRuntime.jsx)(_component.ProTools, {
       prefixCls: prefixCls,
       onReset: onReset,
       onClose: toggle,

package/lib/ProThemeTools/style/index.less

@@ -1,7 +1,7 @@
 @root-entry-name: 'default';
 @import (reference) '~antd/es/style/themes/index.less';
 
-@import '../component/PrdTools/style/index.less';
+@import '../component/ProTools/style/index.less';
 
 .pro-theme-tools {
   display: flex;

package/lib/ProTreeModal/components/List.js

@@ -125,11 +125,32 @@ function List(props, ref) {
     document.body.removeChild(temp);
     return len * 20;
   }
+  var handleCommonTitle = function handleCommonTitle(item) {
+    if (isCASCADER) {
+      return item === null || item === void 0 ? void 0 : item.title;
+    }
+    return item[fieldNameLabel];
+  };
+  var handleGetTitle = function handleGetTitle(item) {
+    if (showCodeName) {
+      if (isCASCADER) {
+        if (item[fieldNameValue] && (item === null || item === void 0 ? void 0 : item.title)) {
+          return "".concat(item[fieldNameValue], "-").concat(item.title);
+        }
+        return handleCommonTitle(item);
+      }
+      if (item[fieldNameValue] && item[fieldNameValue]) {
+        return "".concat(item[fieldNameValue], "-").concat(item[fieldNameLabel]);
+      }
+      return handleCommonTitle(item);
+    }
+    return handleCommonTitle(item);
+  };
   var _useVirtualList = (0, _ahooks.useVirtualList)(originalList, {
       containerTarget: containerRef,
       wrapperTarget: wrapperRef,
       itemHeight: function itemHeight(index, item) {
-        var title = showCodeName ? "".concat(item[fieldNameValue], "-").concat(isCASCADER ? item === null || item === void 0 ? void 0 : item.title : item[fieldNameLabel]) : "".concat(isCASCADER ? item === null || item === void 0 ? void 0 : item.title : item[fieldNameLabel]);
+        var title = handleGetTitle(item);
         return Math.floor(getLineHeight(title, 406)) + 12;
       }
     }),
@@ -185,7 +206,7 @@ function List(props, ref) {
             children: (0, _jsxRuntime.jsx)(_antd.Row, {
               children: list.map(function (_item) {
                 var item = _item.data;
-                var title = showCodeName ? "".concat(item[fieldNameValue], "-").concat(isCASCADER ? item === null || item === void 0 ? void 0 : item.title : item[fieldNameLabel]) : "".concat(isCASCADER ? item === null || item === void 0 ? void 0 : item.title : item[fieldNameLabel]);
+                var title = handleGetTitle(item);
                 var content = optionRender ? optionRender(item, searchStr) : (0, _jsxRuntime.jsx)(_SearchTitle.default, {
                   label: title,
                   searchStr: searchStr
@@ -223,7 +244,7 @@ function List(props, ref) {
         value: checkedValues,
         children: (0, _jsxRuntime.jsx)(_antd.Row, {
           children: treeData.map(function (item) {
-            var title = showCodeName ? "".concat(item[fieldNameValue], "-").concat(isCASCADER ? item === null || item === void 0 ? void 0 : item.title : item[fieldNameLabel]) : "".concat(isCASCADER ? item === null || item === void 0 ? void 0 : item.title : item[fieldNameLabel]);
+            var title = handleGetTitle(item);
             var content = optionRender ? optionRender(item, searchStr) : (0, _jsxRuntime.jsx)(_SearchTitle.default, {
               label: title,
               searchStr: searchStr
@@ -260,7 +281,12 @@ function List(props, ref) {
         ref: wrapperRef,
         children: list.map(function (_item) {
           var item = _item.data;
-          var title = showCodeName ? "".concat(item[fieldNameValue], "-").concat(item[fieldNameLabel]) : item[fieldNameLabel];
+          var title = item[fieldNameLabel];
+          if (showCodeName) {
+            if (item[fieldNameValue] && item[fieldNameLabel]) {
+              title = "".concat(item[fieldNameValue], "-").concat(item[fieldNameLabel]);
+            }
+          }
           return (0, _jsxRuntime.jsxs)("div", {
             className: "pro-tree-modal-checkbox-content",
             children: [(0, _jsxRuntime.jsx)("div", {

package/package.json

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