@zat-design/sisyphus-react 3.5.1 → 3.5.2-beta.1

package/lib/ProTable/utils.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isListResult = exports.getParentElement = exports.getColumnDataIndex = exports.formatColumn = void 0;
+exports.isListResult = exports.getRowKey = exports.getParentElement = exports.getColumnDataIndex = exports.formatColumn = void 0;
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
 var _moment15 = _interopRequireDefault(require("moment"));
@@ -65,7 +65,9 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
     suffix = column.suffix,
     dataIndex = column.dataIndex,
     _column$originalDiffT = column.originalDiffTip,
-    originalDiffTip = _column$originalDiffT === void 0 ? true : _column$originalDiffT;
+    originalDiffTip = _column$originalDiffT === void 0 ? true : _column$originalDiffT,
+    _column$toolTipProps = column.toolTipProps,
+    toolTipProps = _column$toolTipProps === void 0 ? {} : _column$toolTipProps;
   // 前缀处理
   var prefixNode = function prefixNode(value, record, index) {
     if (!prefix) {
@@ -129,7 +131,8 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
         node: renderValue,
         value: value,
         currentValue: renderValue,
-        originalDiffTip: originalDiffTip
+        originalDiffTip: originalDiffTip,
+        toolTipProps: toolTipProps
       });
     };
     // 千分位, 千分位带CNY前缀
@@ -158,7 +161,8 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
         node: node,
         value: value,
         currentValue: renderValue,
-        originalDiffTip: originalDiffTip
+        originalDiffTip: originalDiffTip,
+        toolTipProps: toolTipProps
       });
     };
   } else if (['datePicker', 'date', 'dateTime', 'dateStartTime', 'dateEndTime', 'dateStartEndTime'].includes(valueType)) {
@@ -210,7 +214,8 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
         node: node,
         value: value,
         currentValue: renderValue,
-        originalDiffTip: originalDiffTip
+        originalDiffTip: originalDiffTip,
+        toolTipProps: toolTipProps
       });
     };
   } else if (['enumName', 'enumCodeName'].includes(valueType)) {
@@ -231,7 +236,8 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
         node: node,
         value: value,
         currentValue: renderValue,
-        originalDiffTip: originalDiffTip
+        originalDiffTip: originalDiffTip,
+        toolTipProps: toolTipProps
       });
     };
   } else if (precision || prefix || suffix) {
@@ -257,7 +263,8 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
         node: node,
         value: value,
         currentValue: renderValue,
-        originalDiffTip: originalDiffTip
+        originalDiffTip: originalDiffTip,
+        toolTipProps: toolTipProps
       });
     };
   } else if (valueType === 'address') {
@@ -312,7 +319,8 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
           width: width,
           node: value,
           value: value,
-          currentValue: value
+          currentValue: value,
+          toolTipProps: toolTipProps
         }), suffixNode(value, record, index)]
       });
     };
@@ -332,7 +340,8 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
           node: value,
           value: value,
           currentValue: value || '-',
-          originalDiffTip: originalDiffTip
+          originalDiffTip: originalDiffTip,
+          toolTipProps: toolTipProps
         }), suffixNode(value, record, index)]
       });
     };
@@ -354,7 +363,8 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
         node: node,
         value: value,
         currentValue: value || '-',
-        originalDiffTip: originalDiffTip
+        originalDiffTip: originalDiffTip,
+        toolTipProps: toolTipProps
       });
     };
   }
@@ -393,4 +403,13 @@ var getParentElement = exports.getParentElement = function getParentElement(elem
  */
 var isListResult = exports.isListResult = function isListResult(data) {
   return data.hasOwnProperty('total') && data.hasOwnProperty('list');
+};
+var getRowKey = exports.getRowKey = function getRowKey(rowKey, record) {
+  // 默认取id
+  var key = record.rowKey || 'id';
+  if (rowKey) {
+    var _ref;
+    key = (_ref = typeof rowKey === 'function' ? rowKey(record) : record[rowKey]) !== null && _ref !== void 0 ? _ref : key;
+  }
+  return key;
 };

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

@@ -506,7 +506,23 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
   return (0, _jsxRuntime.jsx)("div", {
     onClick: nodeChangeEvent,
     className: cls,
-    children: (0, _jsxRuntime.jsx)(_antd.TreeSelect, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, treeProps), {}, {
+    children: (0, _jsxRuntime.jsx)(_antd.TreeSelect, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      maxTagPlaceholder: function maxTagPlaceholder(rest) {
+        var _rest = rest.map(function (tag) {
+          var _tag$label, _tag$label$props, _tag$label$props$dang;
+          return (tag === null || tag === void 0 ? void 0 : (_tag$label = tag.label) === null || _tag$label === void 0 ? void 0 : (_tag$label$props = _tag$label.props) === null || _tag$label$props === void 0 ? void 0 : (_tag$label$props$dang = _tag$label$props.dangerouslySetInnerHTML) === null || _tag$label$props$dang === void 0 ? void 0 : _tag$label$props$dang.__html) || tag.label;
+        });
+        var _str = _rest.join('、');
+        return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
+          title: (0, _jsxRuntime.jsx)("div", {
+            children: _str
+          }),
+          children: (0, _jsxRuntime.jsxs)("span", {
+            children: ["+ ", rest.length, " ..."]
+          })
+        });
+      }
+    }, treeProps), {}, {
       children: selectList.map(function (node) {
         return renderTreeNode(node, 1);
       })

package/lib/ProTree/components/Tree.js

@@ -22,7 +22,7 @@ var _locale = _interopRequireDefault(require("../../locale"));
 var _excluded = ["checkedValues", "disabled", "searchStr", "originalTreeData", "showCodeName", "checkStrictly", "flatTreeData", "mode", "fieldNames", "tags", "onCheck", "optionRender", "treeData", "showLine", "switcherIcon", "checkable", "menu", "innerExpandKeys", "selectedKey", "disabledMode", "isRadioSelect"];
 /*
  *@Date: 2023-07-25 13:49:35
- *@LastEditTime: 2023-07-25 13:49:35
+ * @LastEditTime: 2024-05-20 11:47:45
  *@Author: liudongliang
  *@Description: 树每行节点渲染组件，复选时阻止点击事件冒泡，只有点击树节点文本会向上触发onSelect事件
  */
@@ -254,6 +254,12 @@ function List(props) {
       className: nodeClass,
       onClick: function onClick(e) {
         e.stopPropagation();
+        onSelect(item === null || item === void 0 ? void 0 : item[fieldNameValue], {
+          node: e === null || e === void 0 ? void 0 : e.target,
+          event: e,
+          item: item,
+          selected: !isChecked
+        });
       },
       children: [tags && tags.length ? (0, _jsxRuntime.jsx)("div", {
         className: "pro-tree-tree-node-tag",
@@ -268,20 +274,15 @@ function List(props) {
         className: "tree-node-show-text",
         children: [(0, _jsxRuntime.jsx)("div", {
           className: "tree-node-show-text-label",
-          onClick: function onClick(e) {
-            return onSelect(item === null || item === void 0 ? void 0 : item[fieldNameValue], {
-              node: e === null || e === void 0 ? void 0 : e.target,
-              event: e,
-              item: item,
-              selected: !isChecked
-            });
-          },
           children: optionRender ? optionRender(item, searchStr) : (0, _jsxRuntime.jsx)(_SearchTitle.default, (0, _objectSpread2.default)({
             label: title,
             searchStr: searchStr
           }, other))
         }), (0, _jsxRuntime.jsx)("div", {
           className: "operate-tree-node-btns",
+          onClick: function onClick(e) {
+            e.stopPropagation();
+          },
           children: (operateButton === null || operateButton === void 0 ? void 0 : operateButton.length) > 1 ? (0, _jsxRuntime.jsx)(_antd.Popover, {
             overlayClassName: "pro-tree-operate-container",
             content: (0, _jsxRuntime.jsx)("div", {

package/lib/ProTree/style/index.less

@@ -3,6 +3,9 @@
 
 .pro-tree {
   height: 100%; // tree auto css
+  .@{ant-prefix}-tree-iconEle{
+    margin-right: 8px;
+  }
 
   .@{ant-prefix}-tree-node-content-wrapper{
     display: flex;
@@ -13,11 +16,11 @@
     .@{ant-prefix}-tree-node-content-wrapper {
       color: var(--zaui-text);
     }
-  
+
     .pro-tree-tree-node.checked {
       color: var(--zaui-text);
     }
-  
+
     .pro-tree-tree-node.checked .brand-bg-opa-ten {
       background-color: inherit;
     }
@@ -362,4 +365,6 @@
         }
     }
   }
-}
+}
+
+

package/lib/ProTreeModal/components/Trigger.d.ts

@@ -1,4 +1,7 @@
 import { CSSProperties } from 'react';
+interface AppointProps {
+    disabled?: boolean | boolean[];
+}
 interface TriggerProps {
     checkedValues: any[];
     value: any;
@@ -7,6 +10,7 @@ interface TriggerProps {
     isView?: boolean;
     checkAll?: boolean;
     appoint: boolean;
+    appointProps?: AppointProps;
     allValue?: string | number;
     triggerStyle?: CSSProperties;
     handleClick: () => void;

package/lib/ProTreeModal/components/Trigger.js

@@ -25,12 +25,20 @@ function Trigger(props) {
     isView = props.isView,
     triggerStyle = props.triggerStyle,
     appoint = props.appoint,
+    appointProps = props.appointProps,
     allValue = props.allValue,
     checkAll = props.checkAll,
     checkedValues = props.checkedValues,
     handleClick = props.handleClick,
     handleClearAll = props.handleClearAll,
     appointChange = props.appointChange;
+  var _ref = appointProps || {},
+    appointDisabled = _ref.disabled;
+  var _tempAppointDisabled = appointDisabled || false;
+  var _ref2 = Array.isArray(appointDisabled) ? appointDisabled : [_tempAppointDisabled, _tempAppointDisabled],
+    _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
+    allDisabled = _ref3[0],
+    specifyDisabled = _ref3[1];
   var _useSetState = (0, _ahooks.useSetState)({
       mode: 'appoint'
     }),
@@ -96,9 +104,11 @@ function Trigger(props) {
           onChange: onAppointChange,
           children: [(0, _jsxRuntime.jsx)(_antd.Select.Option, {
             value: "all",
+            disabled: disabled || allDisabled,
             children: _locale.default === null || _locale.default === void 0 ? void 0 : _locale.default.ProTreeModal.specifyMode[0]
           }), (0, _jsxRuntime.jsx)(_antd.Select.Option, {
             value: "appoint",
+            disabled: disabled || specifyDisabled,
             children: _locale.default === null || _locale.default === void 0 ? void 0 : _locale.default.ProTreeModal.specifyMode[1]
           })]
         }), props.children]

package/lib/ProTreeModal/index.js

@@ -58,6 +58,7 @@ var ProTreeModal = function ProTreeModal(props) {
     draggable = props.draggable,
     span = props.span,
     appoint = props.appoint,
+    appointProps = props.appointProps,
     _props$fieldNames = props.fieldNames,
     fieldNames = _props$fieldNames === void 0 ? {
       label: 'label',
@@ -531,7 +532,8 @@ var ProTreeModal = function ProTreeModal(props) {
       label: props === null || props === void 0 ? void 0 : (_props$otherProps3 = props.otherProps) === null || _props$otherProps3 === void 0 ? void 0 : _props$otherProps3.label,
       handleClick: handleClick,
       handleClearAll: handleClearAll,
-      appointChange: appointChange
+      appointChange: appointChange,
+      appointProps: appointProps
     });
   }, [state.checkedValues, state.checkAll, style, disabled, isView]);
   /**

package/lib/ProTreeModal/propsType.d.ts

@@ -22,6 +22,9 @@ export interface FieldNamesType {
     children?: string;
 }
 export type TreeModalMode = 'tree' | 'list' | 'Cascader' | 'Tree' | 'List';
+export interface AppointProps {
+    disabled?: boolean | boolean[];
+}
 export interface ProTreeModalProps {
     /** value */
     value?: AllValueType | string[];
@@ -35,6 +38,8 @@ export interface ProTreeModalProps {
     mode?: TreeModalMode;
     /** 是否开启指定模式 */
     appoint?: boolean;
+    /** 指定模式下传递的额外参数 */
+    appointProps?: AppointProps;
     /** 开启后、提交给后端 [{ label:xx, value: ""}] 形式  */
     labelInValue?: boolean;
     /** 查看模式、同 disabled 一样 */

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

@@ -5,6 +5,7 @@ interface DragRenderProps extends Pick<ProUploadProps, 'buttonProps' | 'disabled
     isView?: boolean;
     headerRender: () => ReactNode;
     footerRender: () => ReactNode;
+    centerRender: React.ReactNode | (() => React.ReactNode);
     sensor: any;
     fileList: UploadFile[];
     baseUploadProps: any;

package/lib/ProUpload/components/ImageRender.js

@@ -14,6 +14,7 @@ var _antd = require("antd");
 var _react = require("react");
 var _core = require("@dnd-kit/core");
 var _sortable = require("@dnd-kit/sortable");
+var _lodash = require("lodash");
 var _reactSvg = require("react-svg");
 var _icons = require("@ant-design/icons");
 var _Example = require("./Example");
@@ -47,6 +48,7 @@ var ImageRender = function ImageRender(props) {
     disabled = props.disabled,
     headerRender = props.headerRender,
     footerRender = props.footerRender,
+    centerRender = props.centerRender,
     sensor = props.sensor,
     onDragEnd = props.onDragEnd,
     fileList = props.fileList,
@@ -234,7 +236,7 @@ var ImageRender = function ImageRender(props) {
           }),
           strategy: _sortable.rectSortingStrategy,
           children: (0, _jsxRuntime.jsx)(_antd.Upload, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, imageUploadProps), {}, {
-            children: fileList.length < maxCount && !isView && (0, _jsxRuntime.jsxs)("div", {
+            children: fileList.length < maxCount && !isView && (centerRender ? (0, _lodash.isFunction)(centerRender) ? centerRender() : centerRender : (0, _jsxRuntime.jsxs)("div", {
               className: "pro-upload-image-inner ".concat(disabled ? 'pro-upload-image-disabled' : '', " "),
               children: [(0, _jsxRuntime.jsx)(_icons.PlusOutlined, {}), (0, _jsxRuntime.jsx)("div", {
                 style: {
@@ -242,7 +244,7 @@ var ImageRender = function ImageRender(props) {
                 },
                 children: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProUpload4 = _locale.default.ProUpload) === null || _locale$ProUpload4 === void 0 ? void 0 : _locale$ProUpload4.buttonText
               })]
-            })
+            }))
           }))
         })
       }), showExampleContent && !isView && (0, _jsxRuntime.jsx)(_Example.Example, {

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", "isConfirmDelete"];
+var _excluded = ["value", "size", "action", "maxCount", "headerRender", "footerRender", "centerRender", "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
@@ -43,6 +43,7 @@ var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     maxCount = _props$maxCount === void 0 ? 1 : _props$maxCount,
     headerRender = props.headerRender,
     footerRender = props.footerRender,
+    centerRender = props.centerRender,
     disabled = props.disabled,
     _props$uploadType = props.uploadType,
     uploadType = _props$uploadType === void 0 ? 'drag' : _props$uploadType,
@@ -211,6 +212,13 @@ var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     }
     return headerRender;
   };
+  // 自定义顶部
+  // const _centerRender = () => {
+  //   if (isFunction(centerRender)) {
+  //     return centerRender();
+  //   }
+  //   return centerRender;
+  // };
   // 自定义底部
   var _footerRender = function _footerRender() {
     if ((0, _lodash.isFunction)(footerRender)) {
@@ -257,6 +265,7 @@ var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     isView: isView,
     headerRender: _headerRender,
     footerRender: _footerRender,
+    centerRender: centerRender,
     sensor: sensor,
     fileList: _fileList,
     baseUploadProps: baseUploadProps,
@@ -297,6 +306,7 @@ var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     }
   }, [value]);
   return (0, _jsxRuntime.jsxs)("div", {
+    id: residueProps.id,
     className: "pro-upload ".concat(className !== null && className !== void 0 ? className : ''),
     children: [uploadType === 'drag' && (0, _jsxRuntime.jsx)(_DragRender.default, (0, _objectSpread2.default)({}, baseProps)), uploadType === 'button' && (0, _jsxRuntime.jsx)(_ButtonRender.default, (0, _objectSpread2.default)({}, baseProps)), uploadType === 'image' && (0, _jsxRuntime.jsx)(_ImageRender.default, (0, _objectSpread2.default)({}, baseProps))]
   });

package/lib/ProUpload/propsType.d.ts

@@ -18,9 +18,9 @@ export interface fieldNamesProps {
 }
 export interface ProUploadProps {
     /**
-   * @description       顶部的内容(button类型的上传不适用)
-   * @default           -
-   */
+     * @description       顶部的内容(button类型的上传不适用)
+     * @default           -
+     */
     headerRender?: React.ReactNode | (() => React.ReactNode);
     /**
      * @description       是否过滤掉file对象中的originFileObj
@@ -32,6 +32,11 @@ export interface ProUploadProps {
      * @default           -
      */
     footerRender?: React.ReactNode | (() => React.ReactNode);
+    /**
+     * @description       自定义上传区域的内容
+     * @default           -
+     */
+    centerRender?: React.ReactNode | (() => React.ReactNode);
     /**
      * @description       是否显示示例弹窗
      * @default           false
@@ -189,6 +194,7 @@ export interface ProUploadProps {
      * @default    false
      */
     isConfirmDelete?: boolean;
+    id?: string;
 }
 export interface DraggableUploadListItemProps {
     file: UploadFile<any>;

package/lib/style/theme/antd.less

@@ -16,7 +16,7 @@
     }
   }
   .@{ant-prefix}-drawer-body{
-  
+
     .@{ant-prefix}-form-item{
       .@{ant-prefix}-form-item-label{
         &.@{ant-prefix}-form-item-label-left{
@@ -720,6 +720,9 @@
 .@{ant-prefix}-tooltip {
   > .@{ant-prefix}-tooltip-content {
     > .@{ant-prefix}-tooltip-inner {
+      max-height: 360px;
+      overflow: auto;
+      line-height: 23px;
       color: rgb(29, 33, 41);
       background-color: #fff;
       box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.5.1",
+  "version": "3.5.2-beta.1",
   "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.25",
+    "@zat-design/utils": "^1.1.26",
     "ahooks": "3.7.4",
     "antd": "4.24.8",
     "big.js": "^6.2.1",