@zat-design/sisyphus-react 3.4.9 → 3.4.10-beta.2

package/lib/ProSelect/index.js

@@ -24,10 +24,11 @@ require("./index.less");
 var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "isView"];
 var Option = _antd.Select.Option;
 var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
-  var _locale$ProSelect;
+  var _selectProps$showCode, _locale$ProSelect;
   var _ref = (0, _ProConfigProvider.useProConfig)('ProSelect') || {},
     _ref$fieldNames = _ref.fieldNames,
-    proSelectFieldNames = _ref$fieldNames === void 0 ? {} : _ref$fieldNames;
+    proSelectFieldNames = _ref$fieldNames === void 0 ? {} : _ref$fieldNames,
+    showCodeName = _ref.showCodeName;
   var label = 'label';
   var code = 'value';
   if (proSelectFieldNames && Object.keys(proSelectFieldNames).length) {
@@ -55,6 +56,7 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     transformResponse = props.transformResponse,
     isViewPro = props.isView,
     selectProps = (0, _objectWithoutProperties2.default)(props, _excluded);
+  selectProps.showCodeName = (_selectProps$showCode = selectProps.showCodeName) !== null && _selectProps$showCode !== void 0 ? _selectProps$showCode : showCodeName;
   var value = props.value;
   var _ref2 = _.ProForm.useFieldProps() || {},
     isViewCon = _ref2.isView,
@@ -275,7 +277,8 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
       otherProps: otherProps,
       value: props.value,
       dataSource: selectList,
-      labelInValue: labelInValue
+      labelInValue: labelInValue,
+      fieldNames: fieldNames
     });
   }
   return (0, _jsxRuntime.jsx)(_antd.Select, (0, _objectSpread2.default)((0, _objectSpread2.default)({

package/lib/ProSelect/utils/index.d.ts

@@ -1,9 +1,10 @@
 /**
  * 返回当前组件可以显示的数据源
  */
-export declare const getSelectList: ({ otherProps, value, dataSource, labelInValue, }: {
+export declare const getSelectList: ({ otherProps, value, dataSource, labelInValue, fieldNames, }: {
     otherProps: any;
     value: any;
     dataSource: any;
     labelInValue: any;
+    fieldNames: any;
 }) => any;

package/lib/ProSelect/utils/index.js

@@ -14,7 +14,8 @@ var findSelectNameValues = function findSelectNameValues(_ref) {
     selectName = _ref.selectName,
     value = _ref.value,
     dataSource = _ref.dataSource,
-    labelInValue = _ref.labelInValue;
+    labelInValue = _ref.labelInValue,
+    fieldNames = _ref.fieldNames;
   var selectValues = [];
   list.forEach(function (item) {
     var result = item;
@@ -37,7 +38,7 @@ var findSelectNameValues = function findSelectNameValues(_ref) {
   });
   var diffList = _lodash.default.difference(selectValues, [value]);
   return dataSource.filter(function (item) {
-    return !diffList.includes(labelInValue ? item : item.value);
+    return !diffList.includes(labelInValue ? item : item[fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value] || (item === null || item === void 0 ? void 0 : item.value));
   });
 };
 /**
@@ -47,15 +48,16 @@ var getSelectList = exports.getSelectList = function getSelectList(_ref2) {
   var otherProps = _ref2.otherProps,
     value = _ref2.value,
     dataSource = _ref2.dataSource,
-    labelInValue = _ref2.labelInValue;
+    labelInValue = _ref2.labelInValue,
+    fieldNames = _ref2.fieldNames;
   if (!otherProps) {
     return null;
   }
   var listName = otherProps.listName,
     form = otherProps.form;
-  var firstNumberIndex = listName.findIndex(function (item) {
+  var firstNumberIndex = listName.lastIndexOf(listName.findLast(function (item) {
     return typeof item === 'number';
-  });
+  }));
   var fatherName = listName.slice(0, firstNumberIndex);
   var selectName = listName.slice(firstNumberIndex + 1);
   return findSelectNameValues({
@@ -63,6 +65,7 @@ var getSelectList = exports.getSelectList = function getSelectList(_ref2) {
     selectName: selectName,
     value: value,
     dataSource: dataSource,
-    labelInValue: labelInValue
+    labelInValue: labelInValue,
+    fieldNames: fieldNames
   });
 };

package/lib/ProTree/components/ProTree.js

@@ -88,11 +88,18 @@ var ProTree = function ProTree(props) {
       checkAll: false,
       allKeys: [],
       clickShowLoading: false,
-      innerExpandKeys: []
+      innerExpandKeys: undefined // 将传入德默认展开德节点传入内部state德innerExpandKeys上面，后续由innerExpandKeys控制展开节点
     }),
     _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
     state = _useSetState2[0],
     setState = _useSetState2[1];
+  (0, _react.useEffect)(function () {
+    if (expandedKeys) {
+      setState({
+        innerExpandKeys: expandedKeys
+      });
+    }
+  }, [expandedKeys]);
   var fetchFunction = (0, _ahooks.useRequest)(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, (0, _objectSpread2.default)({
     manual: true,
     onSuccess: function onSuccess(res) {
@@ -104,8 +111,8 @@ var ProTree = function ProTree(props) {
           treeData: responseData,
           originalTreeData: responseData,
           flatTreeData: flatTrees,
-          allKeys: allKey,
-          innerExpandKeys: (props === null || props === void 0 ? void 0 : props.expandedKeys) ? props === null || props === void 0 ? void 0 : props.expandedKeys : (0, _utils.getDefaultExpandKeys)(defaultExpandAll, allKey)
+          allKeys: allKey
+          // innerExpandKeys: props?.expandedKeys ? props?.expandedKeys : getDefaultExpandKeys(defaultExpandAll, allKey),
         });
       } else {
         var _res$status = res.status,
@@ -122,8 +129,8 @@ var ProTree = function ProTree(props) {
           treeData: data,
           originalTreeData: data,
           flatTreeData: _flatTrees,
-          allKeys: _allKey,
-          innerExpandKeys: (props === null || props === void 0 ? void 0 : props.expandedKeys) ? props === null || props === void 0 ? void 0 : props.expandedKeys : (0, _utils.getDefaultExpandKeys)(defaultExpandAll, _allKey)
+          allKeys: _allKey
+          // innerExpandKeys: props?.expandedKeys ? props?.expandedKeys : getDefaultExpandKeys(defaultExpandAll, allKey),
         });
       }
     },
@@ -136,8 +143,8 @@ var ProTree = function ProTree(props) {
         treeData: dataSource,
         originalTreeData: (0, _lodash.cloneDeep)(dataSource),
         flatTreeData: (0, _utils.getFlatTreeData)(dataSource, fieldNames),
-        allKeys: allKey,
-        innerExpandKeys: (props === null || props === void 0 ? void 0 : props.expandedKeys) ? props === null || props === void 0 ? void 0 : props.expandedKeys : (0, _utils.getDefaultExpandKeys)(defaultExpandAll, allKey)
+        allKeys: allKey
+        // innerExpandKeys: props?.expandedKeys ? props?.expandedKeys : getDefaultExpandKeys(defaultExpandAll, allKey),
       });
     } else if (enumCode) {
       var dictEnum = dics[enumCode] || [];
@@ -155,8 +162,8 @@ var ProTree = function ProTree(props) {
         treeData: dictEnum,
         originalTreeData: (0, _lodash.cloneDeep)(dictEnum),
         flatTreeData: (0, _utils.getFlatTreeData)(dictEnum, fieldNames),
-        allKeys: (0, _utils.getAllKeys)(dictEnum, fieldNames),
-        innerExpandKeys: (props === null || props === void 0 ? void 0 : props.expandedKeys) ? props === null || props === void 0 ? void 0 : props.expandedKeys : (0, _utils.getDefaultExpandKeys)(defaultExpandAll, _allKey2)
+        allKeys: (0, _utils.getAllKeys)(dictEnum, fieldNames)
+        // innerExpandKeys: props?.expandedKeys ? props?.expandedKeys : getDefaultExpandKeys(defaultExpandAll, allKey),
       });
     }
   }, [dataSource, enumCode]);
@@ -455,6 +462,7 @@ var ProTree = function ProTree(props) {
             originalTreeData: state.originalTreeData,
             flatTreeData: state.flatTreeData,
             checkedValues: state.checkedValues,
+            defaultExpandAll: defaultExpandAll,
             innerExpandKeys: state === null || state === void 0 ? void 0 : state.innerExpandKeys,
             optionRender: optionRender,
             searchStr: state.searchStr,

package/lib/ProTree/components/Tree.js

@@ -62,7 +62,7 @@ function List(props) {
   var fieldNameLabel = fieldNames.label;
   var fieldNameValue = fieldNames.value;
   var _useSetState = (0, _ahooks.useSetState)({
-      expandedKeys: [],
+      expandedKeys: undefined,
       autoExpandParent: true,
       currentClickTreeNode: null,
       handing: false
@@ -92,9 +92,11 @@ function List(props) {
     }
   }, [searchStr]);
   (0, _react.useEffect)(function () {
-    setState({
-      expandedKeys: innerExpandKeys
-    });
+    if (innerExpandKeys) {
+      setState({
+        expandedKeys: innerExpandKeys
+      });
+    }
   }, [innerExpandKeys]);
   (0, _react.useEffect)(function () {
     if (!checkable) {
@@ -342,23 +344,29 @@ function List(props) {
     return loop(newTreeData, -1);
   }
   var _treeData = fn();
-  var onExpand = function onExpand(newExpandedKeys) {
+  var onExpand = function onExpand(newExpandedKeys, nextPara) {
     setState({
       expandedKeys: newExpandedKeys,
       autoExpandParent: false
     });
+    if (other.onExpand) {
+      other.onExpand(newExpandedKeys, nextPara);
+    }
   };
   var others = other;
+  var additionProps = {};
+  if (expandedKeys) {
+    additionProps.expandedKeys = expandedKeys;
+  }
   return (0, _jsxRuntime.jsx)("div", {
     className: disabledMode === 'hide' ? 'hide-disable-node' : '',
-    children: (_treeData === null || _treeData === void 0 ? void 0 : _treeData.length) ? (0, _jsxRuntime.jsx)(_antd.Tree, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, others), {}, {
+    children: (_treeData === null || _treeData === void 0 ? void 0 : _treeData.length) ? (0, _jsxRuntime.jsx)(_antd.Tree, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, others), expandedKeys), {}, {
       disabled: disabled,
       style: {
         width: '100%'
       },
       treeData: _treeData,
       onExpand: onExpand,
-      expandedKeys: expandedKeys,
       autoExpandParent: autoExpandParent,
       selectable: false,
       onCheck: onCheck,

package/lib/ProTree/index.js

@@ -22,7 +22,8 @@ var ProTreeHandle = function ProTreeHandle(props) {
     mode = _props$mode === void 0 ? 'tree' : _props$mode;
   if (mode === 'treeSelect') {
     var adaptorProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
-      treeCheckable: props === null || props === void 0 ? void 0 : props.checkable
+      treeCheckable: props === null || props === void 0 ? void 0 : props.checkable,
+      treeCheckStrictly: props === null || props === void 0 ? void 0 : props.checkStrictly
     });
     return (0, _jsxRuntime.jsx)(_ProTreeSelect.default, (0, _objectSpread2.default)({}, adaptorProps));
   }

package/lib/ProTree/propsType.d.ts

@@ -65,6 +65,11 @@ export interface ProTreeProps extends PropTreeSelectProps {
     onSelect?: (values: string[] | AllValueType, info?: any) => any;
     /** 复选情况下点击checkbox触发,参照antd */
     onCheck?: (values: string[] | AllValueType, info?: any) => any;
+    onExpand?: (newExpandedKeys: React.Key[], nextPara: {
+        expanded: boolean;
+        node: DataOption;
+        nativeEvent: PointerEvent;
+    }) => void;
     /** 自定义展示 */
     optionRender?: (item: any, searchStr: string) => string | ReactNode;
     /** 对后台返回数据进行格式化 */

package/lib/ProUpload/style/index.less

@@ -7,70 +7,67 @@
   // 拖拽上传
   .pro-upload-dragger {
     .pro-upload-handle-box {
-      background   : #F8F9FA;
+      padding: var(--zaui-space-size-sm, 8px);
+      background: #f8f9fa;
       border-radius: var(--zaui-border-radius, 8px);
-      padding      : var(--zaui-space-size-sm, 8px);
 
       .@{ant-prefix}-upload.@{ant-prefix}-upload-drag {
         background-color: var(--zaui-base-bg, #fff);
       }
 
       .drag-upload-inner {
-        min-width      : 392px;
-        height         : 110px;
-        display        : flex;
-        align-items    : center;
+        display: flex;
+        align-items: center;
         justify-content: center;
+        min-width: 392px;
+        height: 110px;
 
         .upload-dragger-control {
           background-color: var(--zaui-base-bg, #fff);
 
           .dragger-txt-line1 {
-            display    : flex;
-            line-height: 26px;
+            display: flex;
             align-items: center;
+            line-height: 26px;
 
             .icon-upload {
-              display  : inline-block;
+              display: inline-block;
+              color: #c5c7cd;
               font-size: 30px;
-              color    : #C5C7CD;
             }
 
             .dragger-txt {
               margin-left: 9px;
-              font-size  : var(--zaui-font-size, 14px);
 
-
-              color      : rgba(0, 0, 0, 0.85);
+              color: rgba(0, 0, 0, 0.85);
+              font-size: var(--zaui-font-size, 14px);
               line-height: 20px;
             }
 
             .click-txt {
-              color: var(--zaui-brand, #006AFF);
+              color: var(--zaui-brand, #006aff);
             }
           }
 
           .file-ext {
-            text-align: center;
             margin-top: 10px;
-            font-size : var(--zaui-font-size-sm, 12px);
 
-
-            color      : #939599;
+            color: #939599;
+            font-size: var(--zaui-font-size-sm, 12px);
             line-height: 14px;
-
+            text-align: center;
           }
         }
 
         // 单个文件展示样式
         .dragger-single-file {
-          display        : flex;
+          display: flex;
+          flex-direction: column;
           justify-content: center;
-          flex-direction : column;
-          padding        : 0 var(--zaui-space-size-lg, 32px);
+          padding: 0 var(--zaui-space-size-lg, 32px);
 
           .file-type-icon {
-            width : 18px;
+            width: 18px;
             height: 22px;
             margin: 0 auto;
           }
@@ -79,21 +76,20 @@
             padding: 0 var(--zaui-space-size-lg, 32px);
           }
 
-
           .file-info-box {
+            display: flex;
             margin-top: 11px;
-            display   : flex;
 
             &.file-box-error {
               color: var(--zaui-danger);
             }
 
             .file-name {
-              display   : box;
-              overflow  : hidden;
+              display: box;
+              overflow: hidden;
+              word-break: break-all;
               line-clamp: 1;
               box-orient: vertical;
-              word-break: break-all;
             }
 
             .file-ext {
@@ -104,148 +100,143 @@
               word-break: keep-all;
             }
 
-
             .file-download {
               margin-left: var(--zaui-space-size-sm, 8px);
             }
           }
 
           .file-action-box {
-            display        : flex;
+            display: flex;
             justify-content: center;
-            margin-top     : 3px;
-
+            margin-top: 3px;
+            color: #1890ff;
+            & > div {
+              cursor: pointer;
+            }
             .file-del {
-              margin-left: 30px
+              margin-left: 30px;
             }
           }
         }
-
       }
     }
-
   }
 
   // 按钮上传
   .pro-upload-button {
     display: flex;
 
-    >span {
-      width  : 100%;
+    > span {
       display: block;
+      width: 100%;
     }
 
     .pro-upload-button-inner {
       display: flex;
 
       .pro-upload-button-inner-right {
-        line-height: 32px;
         margin-left: 10px;
+        line-height: 32px;
       }
     }
 
     .upload-tip-txt {
       margin-left: 10px;
-      line-height: 32px;
-      font-size  : var(--zaui-font-size-sm, 12px);
-
 
       color: #939599;
+      font-size: var(--zaui-font-size-sm, 12px);
+      line-height: 32px;
     }
   }
 
-
   // 图片
   .pro-upload-image {
-
     position: relative;
-    display : inline-flex;
+    display: inline-flex;
 
     .@{ant-prefix}-upload-list-picture-card-container,
     .@{ant-prefix}-upload-select-picture-card {
-      width : 126px;
+      width: 126px;
       height: 126px;
     }
 
     .image-example {
-      position     : absolute;
-      word-break   : keep-all;
-      top          : 0;
-      right        : -10px;
-      width        : 88px;
-      height       : 32px;
-      transform    : translate(100%, 0);
-      text-align   : center;
-      line-height  : 32px;
-      background   : #FFFFFF;
+      position: absolute;
+      top: 0;
+      right: -10px;
+      width: 88px;
+      height: 32px;
+      line-height: 32px;
+      text-align: center;
+      word-break: keep-all;
+      background: #ffffff;
+      border: 1px solid #dcdcdc;
       border-radius: var(--zaui-border-radius, 8px);
-      border       : 1px solid #DCDCDC;
-
+      transform: translate(100%, 0);
     }
 
     .file-item-image {
-      position        : relative;
-      overflow        : hidden;
+      position: relative;
+      width: 126px;
       // height       : 100%;
-      height          : 126px;
-      width           : 126px;
-      border          : 1px dashed #d9d9d9;
-      overflow        : hidden;
-      border-radius   : 8px;
+      height: 126px;
+      overflow: hidden;
+      overflow: hidden;
+      border: 1px dashed #d9d9d9;
+      border-radius: 8px;
 
       .file-type-icon-img {
-        position : absolute;
-        width    : 30px;
-        top      : 50%;
-        left     : 50%;
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        width: 30px;
         transform: translate(-50%, -50%);
-
       }
 
       .image-con {
         display: block;
-        width  : 100%;
-        height : 100%;
+        width: 100%;
+        height: 100%;
       }
 
       &:hover .actions-wrap {
-        display         : block;
+        display: block;
         background-color: rgba(0, 0, 0, 0.75);
       }
 
       .actions-wrap {
-        transition      : all 2s;
-        position        : absolute;
-        display         : none;
-        width           : 100%;
-        top             : 0;
-        bottom          : 0;
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        display: none;
+        width: 100%;
         background-color: rgba(0, 0, 0, 0.5);
+        transition: all 2s;
 
         .action-top {
-          flex           : 1;
-          display        : flex;
-          align-items    : center;
-          flex-direction : column;
-          height         : calc(100% - 36px);
+          display: flex;
+          flex: 1;
+          flex-direction: column;
+          align-items: center;
           justify-content: center;
+          height: calc(100% - 36px);
         }
 
         .action-button {
-          height     : 36px;
+          height: 36px;
           line-height: 36px;
-          background : #FFFFFF;
-          text-align : center;
+          text-align: center;
+          background: #ffffff;
         }
 
         .action-item {
-          color    : #fff;
+          color: #fff;
           font-size: var(--zaui-font-size-sm, 12px);
-          opacity  : 0.8;
+          opacity: 0.8;
 
           .action-icon {
             margin-right: 10px;
-            transform   : translate(0, 3px);
+            transform: translate(0, 3px);
           }
 
           &:hover {
@@ -255,21 +246,21 @@
 
         .action-button {
           .action-item {
-            color: var(--zaui-danger, #FF005F);
+            color: var(--zaui-danger, #ff005f);
           }
         }
       }
     }
 
     .file-item-image.actions-wrap-error {
-      border: 1px solid #FF005F;
+      border: 1px solid #ff005f;
     }
 
     .image-uploading {
-      padding    : 20px;
-      display    : flex;
+      display: flex;
       align-items: center;
-      height     : inherit;
+      height: inherit;
+      padding: 20px;
     }
   }
 
@@ -289,38 +280,37 @@
     }
 
     .action-icon {
-      display       : inline-flex;
-      align-items   : center;
-      color         : inherit;
-      font-style    : normal;
-      text-align    : center;
+      display: inline-flex;
+      align-items: center;
+      color: inherit;
+      font-style: normal;
+      text-align: center;
       text-transform: none;
       vertical-align: -0.15em;
       text-rendering: optimizeLegibility;
 
       span {
-        display       : inline-flex;
-        align-items   : center;
-        color         : inherit;
-        font-style    : normal;
-        text-align    : center;
+        display: inline-flex;
+        align-items: center;
+        color: inherit;
+        font-style: normal;
+        text-align: center;
         text-transform: none;
         vertical-align: -0.15em;
         text-rendering: optimizeLegibility;
       }
-
     }
   }
 }
 
 .pro-upload-example {
-  width          : 100%;
-  max-height     : 400px;
-  min-height     : 200px;
-  overflow-y     : auto;
-  display        : flex;
-  align-items    : center;
+  display: flex;
+  align-items: center;
   justify-content: center;
+  width: 100%;
+  min-height: 200px;
+  max-height: 400px;
+  overflow-y: auto;
 }
 
 .proupload-modal-preview {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.4.9",
+  "version": "3.4.10-beta.2",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -58,7 +58,7 @@
     "@dnd-kit/sortable": "^7.0.2",
     "@dnd-kit/utilities": "^3.2.1",
     "@pansy/react-watermark": "^3.1.13",
-    "@zat-design/utils": "^1.1.20",
+    "@zat-design/utils": "^1.1.22",
     "ahooks": "3.7.4",
     "antd": "4.24.8",
     "big.js": "^6.2.1",

package/es/ProForm/components/combination/_Group/index.d.ts

@@ -1,4 +0,0 @@
-import React from 'react';
-import { GroupProps } from './propsType';
-declare const Group: React.FC<GroupProps>;
-export default Group;