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

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.9",
+  "version": "3.4.10-beta.10",
   "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;

package/es/ProForm/components/combination/_Group/index.js

@@ -1,109 +0,0 @@
-import "antd/es/space/style";
-import _Space from "antd/es/space";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import "antd/es/button/style";
-import _Button from "antd/es/button";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { useMemo } from 'react';
-import { omit, isFunction, union, isNumber } from 'lodash';
-import { useDeepCompareEffect } from 'ahooks';
-import classnames from 'classnames';
-import RenderFields from '../../render/RenderFields';
-import { insertSeparator, transformNamesString } from './utils';
-import ProForm from '../../../../ProForm';
-var Group = function Group(props) {
-  var columns = props.children,
-    otherProps = props.otherProps,
-    className = props.className,
-    _props$space = props.space,
-    space = _props$space === void 0 ? {
-      size: 12
-    } : _props$space,
-    id = props.id,
-    value = props.value,
-    isView = props.isView,
-    index = props.index,
-    onFieldChange = props.onFieldChange,
-    namePath = props.namePath;
-  var _ref = ProForm.useFieldProps() || {},
-    names = _ref.names,
-    name = _ref.name,
-    form = _ref.form,
-    _namePath = _ref.namePath;
-  var newNamePath = namePath || _namePath || [];
-  if (!Array.isArray(names)) {
-    console.error('Warning: Composite form components whose type is Group must be configured with names');
-  }
-  var data = useMemo(function () {
-    var fieldList = [];
-    var result = columns.map(function (item) {
-      return _objectSpread(_objectSpread({
-        disabled: Boolean(props === null || props === void 0 ? void 0 : props.disabled)
-      }, item), {}, {
-        isView: isView !== null && isView !== void 0 ? isView : item.isView,
-        noStyle: (space === null || space === void 0 ? void 0 : space.compact) || (space === null || space === void 0 ? void 0 : space.separator),
-        parentNames: id,
-        namePath: newNamePath
-      });
-    });
-    var node = _jsx(_Button, {
-      className: "group-separator",
-      children: space.separator
-    });
-    return {
-      columns: insertSeparator(result, space, node, otherProps),
-      fieldList: fieldList
-    };
-  }, [name, columns, space, props, names]);
-  var _className = classnames(_defineProperty({
-    'pro-group': true,
-    'pro-group-diy-width': columns.some(function (item) {
-      var _item$fieldProps, _item$fieldProps$styl;
-      return item === null || item === void 0 ? void 0 : (_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 ? void 0 : (_item$fieldProps$styl = _item$fieldProps.style) === null || _item$fieldProps$styl === void 0 ? void 0 : _item$fieldProps$styl.width;
-    }),
-    'pro-group-width-auto': columns.some(function (item) {
-      return ['Radio', 'Checkbox', 'Switch'].includes(item.type);
-    })
-  }, "".concat(className), className));
-  // 用于formList场景下names移除掉了前缀，需要再次合并回来
-  var _names = names.map(function (item) {
-    if (isNumber(item === null || item === void 0 ? void 0 : item[0])) {
-      return union(newNamePath, item);
-    }
-    return item;
-  });
-  useDeepCompareEffect(function () {
-    var _document, _document$activeEleme;
-    // 焦点激活的表单
-    var touchName = ((_document = document) === null || _document === void 0 ? void 0 : (_document$activeEleme = _document.activeElement) === null || _document$activeEleme === void 0 ? void 0 : _document$activeEleme.id) || '';
-    // 模拟change,初始化不执行onFieldChange
-    if (isFunction(onFieldChange) && form.isFieldsTouched(_names) && transformNamesString(_names).includes(touchName)) {
-      onFieldChange(value, (newNamePath === null || newNamePath === void 0 ? void 0 : newNamePath.length) ? form.getFieldValue(newNamePath, true) : form.getFieldsValue(), {
-        form: form,
-        namePath: newNamePath,
-        index: index
-      });
-    }
-  }, [value]);
-  var _otherProps = omit(otherProps, ['colProps', 'required']);
-  return _jsx("div", {
-    className: _className,
-    children: space.compact || (space === null || space === void 0 ? void 0 : space.separator) ? _jsx(_Space.Compact, {
-      children: _jsx(RenderFields, _objectSpread({
-        columns: data.columns,
-        form: form
-      }, _otherProps))
-    }) : _jsx(_Space, _objectSpread(_objectSpread({
-      align: "start"
-    }, omit(space, ['separator', 'compact'])), {}, {
-      children: data.columns.map(function (column, index) {
-        return _jsx(RenderFields, _objectSpread({
-          columns: [column],
-          form: form
-        }, _otherProps), (column === null || column === void 0 ? void 0 : column.name) || index);
-      })
-    }))
-  });
-};
-export default Group;

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

@@ -1,35 +0,0 @@
-import React from 'react';
-import { RowProps, SpaceProps } from 'antd';
-import { FormInstance } from 'antd/es/form/Form';
-import { NamePath } from 'antd/lib/form/interface';
-import { ProColumnProps, ProFormOtherProps } from '../../../propsType';
-export interface SpaceType extends SpaceProps {
-    /**
-     * 是否紧凑合并
-     */
-    compact?: Boolean;
-    /**
-     * 分隔符
-     */
-    separator?: string | React.ReactNode;
-    /** 间隔距离 */
-    size?: number;
-}
-export interface GroupProps {
-    children?: ProColumnProps[];
-    space?: SpaceType;
-    otherProps?: ProFormOtherProps;
-    rowProps?: RowProps;
-    className?: string;
-    value?: any;
-    id?: string;
-    disabled?: boolean | (() => void);
-    isView?: boolean;
-    namePath?: NamePath;
-    index?: number;
-    onFieldChange?: (value: any[] | null, record: any, { form, }: {
-        form: FormInstance;
-        namePath?: NamePath;
-        index?: number;
-    }) => any;
-}

package/es/ProForm/components/combination/_Group/propsType.js

@@ -1 +0,0 @@
-export {};