@zat-design/sisyphus-react 3.4.5 → 3.4.6-beta.10

package/lib/ProStep/style/index.less

@@ -27,6 +27,43 @@
     height: 48px;
     font-size: var(--zaui-font-size-lg, 16px);
     border-bottom: 1px solid var(--zaui-line, #dddddd);
+    > .anticon {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 48px;
+      height: 24px;
+      > .menu-icon {
+        width: auto !important;
+        height: auto !important;
+        font-size: var(--zaui-font-size-lg-title, 24px);
+        fill: var(--zaui-brand, #006aff);
+        > div {
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          width: 48px;
+          height: 24px;
+        }
+      }
+      > button {
+        width: auto !important;
+        height: auto !important;
+        > .menu-icon {
+          width: auto !important;
+          height: auto !important;
+          font-size: var(--zaui-font-size-lg-title, 24px);
+          fill: var(--zaui-brand, #006aff);
+          > div {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            width: 48px;
+            height: 24px;
+          }
+        }
+      }
+    }
 
     > .menu-icon {
       font-size: var(--zaui-font-size-lg-title, 24px);

package/lib/ProTable/utils.js

@@ -276,19 +276,22 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
         'varied-cell': originalValue !== undefined,
         'empty-cell': isEmpty
       });
-      var renderValue = (0, _jsxRuntime.jsx)(_ProForm.default.ProAddressBar, {
+      var renderValue = (0, _jsxRuntime.jsx)(_ProForm.default.ProCascader, {
         isView: true,
+        mode: "address",
         code: code,
         value: realValue
       });
-      var originalRenderValue = (0, _jsxRuntime.jsx)(_ProForm.default.ProAddressBar, {
+      var originalRenderValue = (0, _jsxRuntime.jsx)(_ProForm.default.ProCascader, {
         isView: true,
+        mode: "address",
         code: code,
         value: originalRealValue
       });
-      return (0, _jsxRuntime.jsx)(_ProForm.default.ProAddressBar, {
+      return (0, _jsxRuntime.jsx)(_ProForm.default.ProCascader, {
         className: className,
         isView: true,
+        mode: "address",
         code: code,
         value: realValue,
         tooltip: originalValue !== undefined ? (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {

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

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

package/lib/ProThemeTools/component/PrdTools/index.js

@@ -28,12 +28,10 @@ var PrdTools = function PrdTools(_ref) {
     open = _ref.open,
     state = _ref.state,
     tableBorder = _ref.tableBorder,
-    tableStripe = _ref.tableStripe,
-    prefixCls = _ref.prefixCls;
+    tableStripe = _ref.tableStripe;
   var _useProConfig = (0, _ProConfigProvider.useProConfig)(),
     config = _useProConfig.state,
     dispatch = _useProConfig.dispatch;
-  var ProForm = config.ProForm;
   var _useState = (0, _react.useState)([{
       color: '#006AFF',
       active: true
@@ -46,6 +44,9 @@ var PrdTools = function PrdTools(_ref) {
     }, {
       color: '#A00F20',
       active: false
+    }, {
+      color: '#31AF96',
+      active: false
     }]),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     active = _useState2[0],
@@ -57,6 +58,7 @@ var PrdTools = function PrdTools(_ref) {
       _ref2$zauiBrand = _ref2.zauiBrand,
       zauiBrand = _ref2$zauiBrand === void 0 ? '#006AFF' : _ref2$zauiBrand;
     if (zauiBrand) {
+      var _config$theme;
       var newArray = active.map(function (activeItem) {
         activeItem.active = false;
         return {
@@ -69,7 +71,8 @@ var PrdTools = function PrdTools(_ref) {
         type: 'set',
         payload: {
           theme: {
-            primaryColor: zauiBrand
+            primaryColor: zauiBrand,
+            qiankunPrimaryColor: config === null || config === void 0 ? void 0 : (_config$theme = config.theme) === null || _config$theme === void 0 ? void 0 : _config$theme.qiankunPrimaryColor
           }
         }
       });
@@ -117,7 +120,8 @@ var PrdTools = function PrdTools(_ref) {
                 type: 'set',
                 payload: {
                   theme: {
-                    primaryColor: item.color
+                    primaryColor: item.color,
+                    qiankunPrimaryColor: item.color
                   }
                 }
               });
@@ -167,8 +171,14 @@ var PrdTools = function PrdTools(_ref) {
       }), (0, _jsxRuntime.jsx)("div", {
         className: "pro-theme-tools-item",
         children: (0, _jsxRuntime.jsxs)(_antd.Radio.Group, {
-          value: ProForm === null || ProForm === void 0 ? void 0 : ProForm.labelAlign,
+          value: state.zauiFormAlign,
           onChange: function onChange(e) {
+            setState((0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
+              zauiFormAlign: e.target.value
+            }));
+            (0, _index.setThemes)({
+              'zaui-form-align': e.target.value
+            });
             dispatch({
               type: 'setWithLocal',
               payload: {

package/lib/ProThemeTools/component/PrdTools/style/index.less

@@ -16,20 +16,20 @@
   }
 
   p {
-    padding-left : 12px;
-    position     : relative;
+    position: relative;
     margin-bottom: var(--zaui-space-size-md, 16px);
-    font-size    : var(--zaui-font-size, 14px);
+    padding-left: 12px;
+    font-size: var(--zaui-font-size, 14px);
 
     &:before {
-      content      : '';
-      position     : absolute;
-      left         : 0;
-      top          : 4px;
-      width        : 4px;
-      height       : 14px;
-      background   : var(--zaui-brand, #006aff);
+      position: absolute;
+      top: 4px;
+      left: 0;
+      width: 4px;
+      height: 14px;
+      background: var(--zaui-brand, #006aff);
       border-radius: var(zaui-border-radius-card, 4px);
+      content: '';
     }
   }
 
@@ -37,19 +37,19 @@
     display: flex;
 
     li {
-      width          : 38px;
-      height         : 38px;
-      border-radius  : 50%;
-      background     : #fff;
-      display        : flex;
+      display: flex;
+      align-items: center;
       justify-content: center;
-      align-items    : center;
-      border         : 6px solid #fff;
-      color          : #fff;
-      margin-right   : 34px;
+      width: 38px;
+      height: 38px;
+      margin-right: 34px;
+      color: #fff;
+      background: #fff;
+      border: 6px solid #fff;
+      border-radius: 50%;
 
       span {
-        font-size     : var(--zaui-font-size, 14px);
+        font-size: var(--zaui-font-size, 14px);
         vertical-align: -7px;
       }
 
@@ -81,8 +81,16 @@
       }
 
       &:nth-child(4) {
+        background: #a00f20;
+
+        &.active,
+        &:hover {
+          border-color: #f2dbdb;
+        }
+      }
+      &:nth-child(5) {
         margin-right: 0;
-        background  : #a00f20;
+        background: #31af96;
 
         &.active,
         &:hover {
@@ -98,16 +106,16 @@
 
   .copy-btn {
     position: absolute;
-    width   : calc(100% - 64px);
-    bottom  : 20px;
-    left    : 32px;
-    z-index : 10;
+    bottom: 20px;
+    left: 32px;
+    z-index: 10;
+    width: calc(100% - 64px);
   }
 
   .pro-theme-tools-box {
-    display        : flex;
+    display: flex;
+    flex-wrap: wrap;
     justify-content: space-between;
-    flex-wrap      : wrap;
   }
 
   .pro-theme-tools-space {
@@ -129,22 +137,22 @@
   }
 
   .pro-drawer-close {
-    position       : absolute;
-    top            : 6px;
-    left           : -37px;
-    display        : flex;
-    align-items    : center;
+    position: absolute;
+    top: 6px;
+    left: -37px;
+    display: flex;
+    align-items: center;
     justify-content: center;
-    width          : 32px;
-    height         : 38px;
-    color          : #fff;
-    cursor         : pointer;
+    width: 32px;
+    height: 38px;
+    color: #fff;
+    cursor: pointer;
 
     .close-icon {
-      position : relative;
-      left     : 4px;
-      z-index  : 1;
-      color    : var(--zaui-text, #343434);
+      position: relative;
+      left: 4px;
+      z-index: 1;
+      color: var(--zaui-text, #343434);
       font-size: var(--zaui-font-size-lg, 16px);
       transform: translateZ(100px);
 
@@ -155,14 +163,14 @@
   }
 
   .pro-drawer-close::after {
-    position        : absolute;
-    top             : 0;
-    right           : 0;
-    bottom          : 0;
-    left            : 0;
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
     background-color: #fff;
-    border-radius   : 4px 0px 0px 4px;
-    transform       : perspective(0.15em) rotateY(-2deg);
-    content         : '';
+    border-radius: 4px 0px 0px 4px;
+    transform: perspective(0.15em) rotateY(-2deg);
+    content: '';
   }
 }

package/lib/ProTree/components/ProTree.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -159,10 +161,7 @@ var ProTree = function ProTree(props) {
     }
   }, [dataSource, enumCode]);
   (0, _ahooks.useDeepCompareEffect)(function () {
-    if (enumCode) {
-      return undefined;
-    }
-    if (dataSource) {
+    if (enumCode || dataSource) {
       return undefined;
     }
     var _ref = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
@@ -174,56 +173,60 @@ var ProTree = function ProTree(props) {
     // 执行用户配置的枚举服务，拉取枚举数据进行更新
     fetchFunction.run(defaultParams);
   }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options]);
+  var handleSignalSelect = function handleSignalSelect(value) {
+    var checkedValues = [];
+    var innerVal = value;
+    if (labelInValue) {
+      checkedValues = innerVal[fieldNameValue];
+    } else {
+      // 单选值场景为string走到这里
+      checkedValues = innerVal;
+    }
+    setState({
+      checkedValues: checkedValues
+    });
+  };
+  var handleCheckSelect = function handleCheckSelect(allKeys) {
+    var checkedValues = [];
+    if (allValue && typeof value === 'string') {
+      // 如果value等于allValue那么全选中，否则选中value得值
+      if (value === allValue) {
+        checkedValues = allKeys;
+      } else {
+        checkedValues = [value];
+      }
+    } else {
+      var innerVal = value;
+      // 开启 labelInValue [{ label:xx, value: ""}] 形式、需要取出来 value
+      if (labelInValue) {
+        var isObjectArray = innerVal && innerVal.every(function (element) {
+          return (0, _typeof2.default)(element) === 'object' && element !== null;
+        });
+        if (!isObjectArray) {
+          console.error('Please enter an array object');
+        }
+        checkedValues = innerVal && innerVal.map(function (item) {
+          return item[fieldNameValue];
+        });
+      } else {
+        // 复选，单纯value数组场景
+        checkedValues = innerVal;
+      }
+    }
+    setState({
+      checkedValues: checkedValues,
+      checkAll: checkedValues.length === allKeys.length
+    });
+  };
   (0, _react.useEffect)(function () {
     if (value) {
-      var checkedValues = [];
       var allKeys = state.allKeys;
       if (!(other === null || other === void 0 ? void 0 : other.checkable)) {
         // 单选
-        var innerVal = value;
-        if (labelInValue) {
-          checkedValues = innerVal[fieldNameValue];
-        } else {
-          // 单选值场景为string走到这里
-          checkedValues = innerVal;
-        }
-        setState({
-          checkedValues: checkedValues
-        });
+        handleSignalSelect(value);
       } else {
         // 复选
-        if (allValue && typeof value === 'string') {
-          // 如果value等于allValue那么全选中，否则选中value得值
-          if (value === allValue) {
-            checkedValues = allKeys;
-          } else {
-            checkedValues = [value];
-          }
-        } else {
-          var _innerVal = value;
-          // 开启 labelInValue [{ label:xx, value: ""}] 形式、需要取出来 value
-          if (labelInValue) {
-            var isObjectArray = _innerVal && _innerVal.every(function (element) {
-              return (0, _typeof2.default)(element) === 'object' && element !== null;
-            });
-            if (!isObjectArray) {
-              console.error('Please enter an array object');
-              checkedValues = [];
-            }
-            checkedValues = _innerVal && _innerVal.map(function (item) {
-              return item[fieldNameValue];
-            });
-          } else {
-            // 复选，单纯value数组场景
-            checkedValues = _innerVal;
-          }
-        }
-        // treeViewData = filterCheckedNodes(originalTreeData, checkedValues, '', fieldNames);
-        setState({
-          checkedValues: checkedValues,
-          checkAll: checkedValues.length === allKeys.length
-          // treeViewData,
-        });
+        handleCheckSelect(allKeys);
       }
     } else if (!(other === null || other === void 0 ? void 0 : other.checkable)) {
       // 单选--场景-->如果表单的value没有值，那么配置的selectedKey就起作用了，选中树节点
@@ -336,39 +339,58 @@ var ProTree = function ProTree(props) {
     handleFinish(allValue, checked, checkedValues);
   };
   /** 点击了树节点开始loading,改变自身state并将值通过onchange上传到form */
-  var onSelectTreeNode = function onSelectTreeNode(props, info) {
-    if (disabled || isView) {
-      return null;
-    }
-    setState({
-      clickShowLoading: loading
-    });
-    if (onSelect) {
-      var _onSelect;
-      (_onSelect = onSelect(props, info)) === null || _onSelect === void 0 ? void 0 : _onSelect.then(function () {
-        setState({
-          clickShowLoading: false
-        });
-      });
-    }
-    if (!(other === null || other === void 0 ? void 0 : other.checkable)) {
-      // 单选将选中节点值冒泡到form
-      var values = props;
-      if (labelInValue) {
-        values = state.flatTreeData.filter(function (item) {
-          return values === item[fieldNameValue];
-        });
-      }
-      onChange && onChange(values);
-    }
-  };
+  var onSelectTreeNode = /*#__PURE__*/function () {
+    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(props, info) {
+      var values;
+      return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!(disabled || isView)) {
+              _context.next = 2;
+              break;
+            }
+            return _context.abrupt("return", null);
+          case 2:
+            setState({
+              clickShowLoading: loading
+            });
+            if (!onSelect) {
+              _context.next = 7;
+              break;
+            }
+            _context.next = 6;
+            return onSelect(props, info);
+          case 6:
+            setState({
+              clickShowLoading: false
+            });
+          case 7:
+            if (!(other === null || other === void 0 ? void 0 : other.checkable)) {
+              // 单选将选中节点值冒泡到form
+              values = props;
+              if (labelInValue) {
+                values = state.flatTreeData.filter(function (item) {
+                  return values === item[fieldNameValue];
+                });
+              }
+              onChange && onChange(values);
+            }
+          case 8:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function onSelectTreeNode(_x, _x2) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
   var boxClass = (0, _classnames.default)((0, _defineProperty2.default)({
     'pro-tree': true,
     'footer-shadow': footer
   }, className, className));
   var toggleExpand = function toggleExpand() {
     var _state$innerExpandKey;
-    // expandedKeys
     if (state === null || state === void 0 ? void 0 : (_state$innerExpandKey = state.innerExpandKeys) === null || _state$innerExpandKey === void 0 ? void 0 : _state$innerExpandKey.length) {
       setState({
         innerExpandKeys: []

package/lib/ProTree/components/ProTreeSelect/index.js

@@ -195,12 +195,8 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     }
   }, [enumCode, dataSource]);
   (0, _ahooks.useDeepCompareEffect)(function () {
-    // code存在，不执行接口请求
-    if (enumCode) {
-      return undefined;
-    }
-    // dataSource存在不执行接口请求
-    if (dataSource) {
+    // code存在huo dataSource存在，不执行接口请求
+    if (enumCode || dataSource) {
       return undefined;
     }
     // disabled 状态时，不查询接口
@@ -413,13 +409,13 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     }
     return result;
   }
-  var handleChange = function handleChange(newVal, option) {
+  var handleChange = function handleChange(newVal, label, extra) {
     // newVal回来得一定是label、value
     var result = newVal;
     if (props === null || props === void 0 ? void 0 : props.labelInValue) {
       result = getLabelByValue(selectList, newVal);
     }
-    onChange && onChange(result, selectList, null);
+    onChange && onChange(result, label, extra);
     // 重置搜索
     showSearch && searchTreeEvent('');
   };
@@ -492,7 +488,7 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     allowClear: allowClear || true,
     showArrow: true,
     treeNodeFilterProp: treeNodeFilterProp,
-    virtual: false
+    virtual: true
   }, selectProps);
   if (value === null) {
     delete treeProps.value;

package/lib/ProTree/components/ProTreeSelect/style/index.less

@@ -40,6 +40,12 @@
                 color: red;
             }
         }
+        // 隐藏单选下拉树后面勾号
+        .@{ant-prefix}-select-tree-node-content-wrapper{
+            .check-mark-icon{
+                display: none;
+            }
+        }
         // 单选
         &.signal-tree{
             .@{ant-prefix}-select-tree{
@@ -63,14 +69,6 @@
                         display: block;
                     }
                 }
-                .@{ant-prefix}-select-tree-node-content-wrapper{
-                    background-color: transparent;
-                    &.@{ant-prefix}-select-tree-node-selected{
-                        .check-mark-icon{
-                            display: block;
-                        }
-                    }
-                }
                 .@{ant-prefix}-select-tree-treenode:hover{
                     background-color: #f5f5f5;
                 }