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

package/es/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 = useProConfig(),
     config = _useProConfig.state,
     dispatch = _useProConfig.dispatch;
-  var ProForm = config.ProForm;
   var _useState = useState([{
       color: '#006AFF',
       active: true
@@ -46,6 +44,9 @@ var PrdTools = function PrdTools(_ref) {
     }, {
       color: '#A00F20',
       active: false
+    }, {
+      color: '#31AF96',
+      active: false
     }]),
     _useState2 = _slicedToArray(_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) {
       }), _jsx("div", {
         className: "pro-theme-tools-item",
         children: _jsxs(_Radio.Group, {
-          value: ProForm === null || ProForm === void 0 ? void 0 : ProForm.labelAlign,
+          value: state.zauiFormAlign,
           onChange: function onChange(e) {
+            setState(_objectSpread(_objectSpread({}, state), {}, {
+              zauiFormAlign: e.target.value
+            }));
+            setThemes({
+              'zaui-form-align': e.target.value
+            });
             dispatch({
               type: 'setWithLocal',
               payload: {

package/es/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/es/ProTree/components/ProTree.js

@@ -5,6 +5,8 @@ import _Input from "antd/es/input";
 import "antd/es/spin/style";
 import _Spin from "antd/es/spin";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import "antd/es/message/style";
@@ -159,10 +161,7 @@ var ProTree = function ProTree(props) {
     }
   }, [dataSource, enumCode]);
   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 _typeof(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
+    });
+  };
   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 _typeof(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 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(props, info) {
+      var values;
+      return _regeneratorRuntime().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 = classNames(_defineProperty({
     '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/es/ProTree/components/ProTreeSelect/index.js

@@ -193,12 +193,8 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     }
   }, [enumCode, dataSource]);
   useDeepCompareEffect(function () {
-    // code存在，不执行接口请求
-    if (enumCode) {
-      return undefined;
-    }
-    // dataSource存在不执行接口请求
-    if (dataSource) {
+    // code存在huo dataSource存在，不执行接口请求
+    if (enumCode || dataSource) {
       return undefined;
     }
     // disabled 状态时，不查询接口
@@ -411,13 +407,13 @@ export var 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('');
   };
@@ -490,7 +486,7 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     allowClear: allowClear || true,
     showArrow: true,
     treeNodeFilterProp: treeNodeFilterProp,
-    virtual: false
+    virtual: true
   }, selectProps);
   if (value === null) {
     delete treeProps.value;

package/es/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;
                 }

package/es/ProTree/components/Tree.js

@@ -3,16 +3,18 @@ import _Tree from "antd/es/tree";
 import "antd/es/popover/style";
 import _Popover from "antd/es/popover";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["checkedValues", "disabled", "searchStr", "originalTreeData", "showCodeName", "checkStrictly", "flatTreeData", "mode", "fieldNames", "tags", "onCheck", "optionRender", "treeData", "showLine", "switcherIcon", "checkable", "menu", "innerExpandKeys", "selectedKey", "disabledMode"];
+var _excluded = ["checkedValues", "disabled", "searchStr", "originalTreeData", "showCodeName", "checkStrictly", "flatTreeData", "mode", "fieldNames", "tags", "onCheck", "optionRender", "treeData", "showLine", "switcherIcon", "checkable", "menu", "innerExpandKeys", "selectedKey", "disabledMode", "isRadioSelect"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /*
  *@Date: 2023-07-25 13:49:35
  *@LastEditTime: 2023-07-25 13:49:35
  *@Author: liudongliang
  *@Description: 树每行节点渲染组件，复选时阻止点击事件冒泡，只有点击树节点文本会向上触发onSelect事件
-*/
+ */
 /* eslint-disable no-plusplus */
 import React, { useEffect, useState } from 'react';
 import { useSetState } from 'ahooks';
@@ -50,19 +52,22 @@ function List(props) {
     innerExpandKeys = props.innerExpandKeys,
     selectedKey = props.selectedKey,
     disabledMode = props.disabledMode,
+    isRadioSelect = props.isRadioSelect,
     other = _objectWithoutProperties(props, _excluded);
   var fieldNameLabel = fieldNames.label;
   var fieldNameValue = fieldNames.value;
   var _useSetState = useSetState({
       expandedKeys: [],
       autoExpandParent: true,
-      currentClickTreeNode: null
+      currentClickTreeNode: null,
+      handing: false
     }),
     _useSetState2 = _slicedToArray(_useSetState, 2),
     _useSetState2$ = _useSetState2[0],
     expandedKeys = _useSetState2$.expandedKeys,
     autoExpandParent = _useSetState2$.autoExpandParent,
     currentClickTreeNode = _useSetState2$.currentClickTreeNode,
+    handing = _useSetState2$.handing,
     setState = _useSetState2[1];
   useEffect(function () {
     if (searchStr) {
@@ -102,18 +107,44 @@ function List(props) {
       });
     }
   }, [selectedKey]);
-  var onSelect = function onSelect(value, item) {
-    var _props$onSelect;
-    var val = value;
-    if (value === currentClickTreeNode) {
-      // 如果当前点击了已经选中节点，那么取消选择
-      val = '';
-    }
-    setState({
-      currentClickTreeNode: val
-    });
-    props === null || props === void 0 ? void 0 : (_props$onSelect = props.onSelect) === null || _props$onSelect === void 0 ? void 0 : _props$onSelect.call(props, val, item);
-  };
+  var onSelect = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(value, item) {
+      var _props$onSelect;
+      var val;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!handing) {
+              _context.next = 2;
+              break;
+            }
+            return _context.abrupt("return", null);
+          case 2:
+            val = value;
+            if (!isRadioSelect && value === currentClickTreeNode) {
+              // 如果当前点击了已经选中节点，那么取消选择
+              val = '';
+            }
+            setState({
+              currentClickTreeNode: val,
+              handing: true
+            });
+            _context.next = 7;
+            return props === null || props === void 0 ? void 0 : (_props$onSelect = props.onSelect) === null || _props$onSelect === void 0 ? void 0 : _props$onSelect.call(props, val, item);
+          case 7:
+            setState({
+              handing: false
+            });
+          case 8:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function onSelect(_x, _x2) {
+      return _ref.apply(this, arguments);
+    };
+  }();
   var TreeNodeRow = function TreeNodeRow(props) {
     var nodeClass = props.nodeClass,
       item = props.item,
@@ -263,7 +294,6 @@ function List(props) {
       })]
     }, onlyKey);
   };
-  // const _treeData = useMemo(() => {
   function fn() {
     var loop = function loop(data, index) {
       index++;
@@ -275,33 +305,27 @@ function List(props) {
           isChecked = true;
         }
         var title = showCodeName ? "".concat(item[fieldNameValue], "-").concat(item[fieldNameLabel]) : item[fieldNameLabel];
+        var nodeTitle = _jsx(TreeNodeRow, {
+          nodeClass: nodeClass,
+          item: item,
+          index: index,
+          title: (item === null || item === void 0 ? void 0 : item.title) || title,
+          isChecked: isChecked,
+          onlyKey: item[fieldNameValue]
+        });
         if (item[fieldNames.children]) {
-          return {
-            title: _jsx(TreeNodeRow, {
-              nodeClass: nodeClass,
-              item: item,
-              index: index,
-              title: title,
-              isChecked: isChecked,
-              onlyKey: item[fieldNameValue]
-            }),
-            key: item[fieldNameValue],
+          return _objectSpread(_objectSpread({}, item), {}, {
+            title: nodeTitle,
+            key: (item === null || item === void 0 ? void 0 : item.key) || item[fieldNameValue],
             children: loop(item[fieldNames.children], index)
-          };
+          });
         }
-        return {
-          title: _jsx(TreeNodeRow, {
-            nodeClass: nodeClass,
-            item: item,
-            index: index,
-            title: title,
-            isChecked: isChecked,
-            onlyKey: item[fieldNameValue]
-          }),
-          key: item[fieldNameValue]
-        };
+        return _objectSpread(_objectSpread({}, item), {}, {
+          title: nodeTitle,
+          key: (item === null || item === void 0 ? void 0 : item.key) || item[fieldNameValue]
+        });
       });
-      return treeRow; // .filter((item) => item);
+      return treeRow;
     };
     if ((other === null || other === void 0 ? void 0 : other.mode) === 'view') {
       return;
@@ -312,8 +336,6 @@ function List(props) {
     }
     return loop(newTreeData, -1);
   }
-  // return fn();
-  // }, [searchStr, expandedKeys, showCodeName, originalTreeData, currentClickTreeNode]);
   var _treeData = fn();
   var onExpand = function onExpand(newExpandedKeys) {
     setState({