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

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) {
@@ -352,16 +354,19 @@ function List(props) {
     }
   };
   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/ProUpload/components/ButtonRender.d.ts

@@ -13,6 +13,7 @@ interface DragRenderProps extends Pick<ProUploadProps, 'buttonProps' | 'disabled
     onDownload: any;
     afterRender: string | ReactNode;
     extExt: any[];
+    isConfirmDelete?: boolean;
 }
 declare const ButtonRender: FC<DragRenderProps>;
 export default ButtonRender;

package/lib/ProUpload/components/ButtonRender.js

@@ -29,7 +29,8 @@ var ButtonRender = function ButtonRender(props) {
     extraTipText = props.extraTipText,
     afterRender = props.afterRender,
     _props$buttonText = props.buttonText,
-    buttonText = _props$buttonText === void 0 ? _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProUpload = _locale.default.ProUpload) === null || _locale$ProUpload === void 0 ? void 0 : _locale$ProUpload.buttonText : _props$buttonText;
+    buttonText = _props$buttonText === void 0 ? _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProUpload = _locale.default.ProUpload) === null || _locale$ProUpload === void 0 ? void 0 : _locale$ProUpload.buttonText : _props$buttonText,
+    isConfirmDelete = props.isConfirmDelete;
   // 按钮类型的props
   var buttonUploadProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, baseUploadProps), {}, {
     fileList: fileList,
@@ -39,6 +40,7 @@ var ButtonRender = function ButtonRender(props) {
         children: (0, _jsxRuntime.jsx)(_FileItem.FileItem, {
           disabled: disabled || isView,
           file: file,
+          isConfirmDelete: isConfirmDelete,
           onPreview: onPreview,
           onRemove: actions.remove,
           onDownload: onDownload

package/lib/ProUpload/components/FileItem.d.ts

@@ -27,6 +27,7 @@ interface FileItemProps {
     onDownload?: Function;
     onPreview?: Function;
     disabled?: boolean;
+    isConfirmDelete?: boolean;
 }
 declare const FileItem: React.FC<FileItemProps>;
 declare const DragSingleFileItem: React.FC<FileItemProps>;

package/lib/ProUpload/components/FileItem.js

@@ -56,7 +56,8 @@ var FileItem = exports.FileItem = function FileItem(props) {
     onDownload = props.onDownload,
     onPreview = props.onPreview,
     _props$showRemoveIcon = props.showRemoveIcon,
-    showRemoveIcon = _props$showRemoveIcon === void 0 ? true : _props$showRemoveIcon;
+    showRemoveIcon = _props$showRemoveIcon === void 0 ? true : _props$showRemoveIcon,
+    isConfirmDelete = props.isConfirmDelete;
   var _onPreview = function _onPreview() {
     if (onPreview) {
       return onPreview(file);
@@ -119,7 +120,22 @@ var FileItem = exports.FileItem = function FileItem(props) {
               color: "#006aff",
               src: _look.default
             })
-          }), _showRemoveIcon && !disabled && (0, _jsxRuntime.jsx)(_antd.Button, {
+          }), _showRemoveIcon && !disabled && (isConfirmDelete ? (0, _jsxRuntime.jsx)(_antd.Popconfirm, {
+            title: "\u786E\u5B9A\u5220\u9664?",
+            onConfirm: _onRemove,
+            okText: "\u786E\u8BA4",
+            cancelText: "\u53D6\u6D88",
+            children: (0, _jsxRuntime.jsx)(_antd.Button, {
+              type: "link",
+              className: "file-action-item",
+              disabled: disabled,
+              children: (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
+                className: "action-icon",
+                wrapper: "span",
+                src: _delete.default
+              })
+            })
+          }) : (0, _jsxRuntime.jsx)(_antd.Button, {
             type: "link",
             className: "file-action-item",
             disabled: disabled,
@@ -129,7 +145,7 @@ var FileItem = exports.FileItem = function FileItem(props) {
               wrapper: "span",
               src: _delete.default
             })
-          })]
+          }))]
         })
       })]
     }), file.status === 'uploading' && (0, _jsxRuntime.jsx)("div", {

package/lib/ProUpload/index.js

@@ -21,7 +21,7 @@ var _ButtonRender = _interopRequireDefault(require("./components/ButtonRender"))
 var _ImageRender = _interopRequireDefault(require("./components/ImageRender"));
 var _uitls = require("./uitls");
 var _locale = _interopRequireDefault(require("../locale"));
-var _excluded = ["value", "size", "action", "maxCount", "headerRender", "footerRender", "disabled", "uploadType", "buttonProps", "accept", "extraTipText", "beforeUpload", "onChange", "onDownload", "onPreview", "onRemove", "filterOriginFileObj", "method", "className", "dataParams", "name", "showExampleContent", "showUploadList", "otherProps", "transformResponse", "exampleTitle", "exampleContent", "exampleModalProps", "buttonText", "afterRender", "fieldNames"];
+var _excluded = ["value", "size", "action", "maxCount", "headerRender", "footerRender", "disabled", "uploadType", "buttonProps", "accept", "extraTipText", "beforeUpload", "onChange", "onDownload", "onPreview", "onRemove", "filterOriginFileObj", "method", "className", "dataParams", "name", "showExampleContent", "showUploadList", "otherProps", "transformResponse", "exampleTitle", "exampleContent", "exampleModalProps", "buttonText", "afterRender", "fieldNames", "isConfirmDelete"];
 /*
  * @Author: wangshengqiang
  * @Date: 2023-02-03 14:18:59
@@ -75,6 +75,7 @@ var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     buttonText = props.buttonText,
     afterRender = props.afterRender,
     fieldNames = props.fieldNames,
+    isConfirmDelete = props.isConfirmDelete,
     residueProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var isView = otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView;
   var sensor = (0, _core.useSensor)(_core.PointerSensor, {
@@ -270,7 +271,8 @@ var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     disabled: disabled || isView,
     buttonText: buttonText,
     extraTipText: extraTipText,
-    afterRender: afterRender
+    afterRender: afterRender,
+    isConfirmDelete: isConfirmDelete
   };
   (0, _react.useEffect)(function () {
     if (fieldNames && value.length > 0) {

package/lib/ProUpload/propsType.d.ts

@@ -184,6 +184,11 @@ export interface ProUploadProps {
      * @default    true
      */
     fieldNames?: fieldNamesProps;
+    /**
+     * @description 删除已经上传的文件时是否二次提示
+     * @default    false
+     */
+    isConfirmDelete?: boolean;
 }
 export interface DraggableUploadListItemProps {
     file: UploadFile<any>;

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.10",
+  "version": "3.4.11-beta.2",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",