@zat-design/sisyphus-react 3.4.11-beta.9 → 3.4.12

package/lib/ProForm/components/render/Render.js

@@ -274,7 +274,7 @@ var Render = function Render(props) {
       }, 60);
     }
     // ProTreeSelect返回option
-    if (['ProTree'].includes(type)) {
+    if (['ProTree'].includes(type) && !_args[2].option) {
       var _args2, _args2$;
       _args[2].option = (0, _index.findOptionByValue)(lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.dataSource, (_args2 = _args) === null || _args2 === void 0 ? void 0 : (_args2$ = _args2[0]) === null || _args2$ === void 0 ? void 0 : _args2$[0], (lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.fieldNames) || {});
     }

package/lib/ProTable/components/RenderColumn/index.js

@@ -45,6 +45,9 @@ var RenderColumn = function RenderColumn(props) {
         title: originalDiffTip ? (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
           children: ["\u521D\u59CB\u503C\uFF1A", originalValue, (0, _jsxRuntime.jsx)("br", {}), ellipsis ? "\u5F53\u524D\u503C\uFF1A".concat(currentValue) : undefined]
         }) : node,
+        getPopupContainer: function getPopupContainer(triggerNode) {
+          return triggerNode.parentNode;
+        },
         children: renderNode
       });
     }
@@ -84,7 +87,11 @@ var RenderColumn = function RenderColumn(props) {
         width: width
       },
       ellipsis: {
-        tooltip: true
+        tooltip: {
+          getPopupContainer: function getPopupContainer(triggerNode) {
+            return triggerNode.parentNode;
+          }
+        }
       },
       children: node
     }) : '-';

package/lib/ProTabs/style/index.less

@@ -82,3 +82,36 @@
     }
   }
 }
+
+.@{ant-prefix}-tabs-dropdown-menu {
+  .pro-tabs-card {
+    width: 200px;
+    padding: calc(9px * var(--zaui-size; 1)) 16px calc(9px * var(--zaui-size; 1)) 24px;
+    border: 1px solid var(--zaui-line, #dddddd);
+
+    .pro-tabs-card-left {
+      width: 104px;
+      text-shadow: none;
+
+      .pro-tabs-card-left-total {
+        color: var(--zaui-text, #343434);
+        font-weight: 600;
+        font-size: var(--zaui-font-size-lg-title, 24px);
+      }
+
+      .pro-tabs-card-left-label {
+        color: var(--aui-text, #343434);
+        font-weight: 400;
+        font-size: var(--zaui-font-size, 14px);
+      }
+    }
+
+    .pro-tabs-card-right {
+      display: flex;
+
+      img {
+        width: 48px;
+      }
+    }
+  }
+}

package/lib/ProTooltip/index.js

@@ -76,6 +76,9 @@ var ProTooltip = function ProTooltip(props) {
       title: text
     }, restProps), {}, {
       overlayStyle: overlayStyle,
+      getPopupContainer: function getPopupContainer(triggerNode) {
+        return triggerNode.parentNode;
+      },
       children: (0, _jsxRuntime.jsx)("div", (0, _objectSpread2.default)((0, _objectSpread2.default)({}, specialProps), {}, {
         style: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, multiStyle), {}, {
           width: localWidth,
@@ -108,6 +111,9 @@ var ProTooltip = function ProTooltip(props) {
       title: text
     }, restProps), {}, {
       overlayStyle: overlayStyle,
+      getPopupContainer: function getPopupContainer(triggerNode) {
+        return triggerNode.parentNode;
+      },
       children: (0, _jsxRuntime.jsx)("div", (0, _objectSpread2.default)((0, _objectSpread2.default)({}, specialProps), {}, {
         style: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, multiStyle), {}, {
           width: localWidth,
@@ -255,6 +261,9 @@ var ProTooltip = function ProTooltip(props) {
     children: isResponsiveWidth && isShowToolTip ? (0, _jsxRuntime.jsx)(_antd.Tooltip, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       title: text
     }, restProps), {}, {
+      getPopupContainer: function getPopupContainer(triggerNode) {
+        return triggerNode.parentNode;
+      },
       children: (0, _jsxRuntime.jsx)("div", {
         className: isMultiLine ? 'multiLine' : 'singleLine',
         style: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, multiStyle), {}, {
@@ -273,6 +282,9 @@ var ProTooltip = function ProTooltip(props) {
     }) : mode === 'default' ? (0, _jsxRuntime.jsx)(_antd.Tooltip, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       title: text
     }, restProps), {}, {
+      getPopupContainer: function getPopupContainer(triggerNode) {
+        return triggerNode.parentNode;
+      },
       children: (0, _jsxRuntime.jsx)("div", {
         className: isMultiLine ? 'multiLine' : 'singleLine',
         style: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, multiStyle), {}, {

package/lib/ProTooltip/propsType.d.ts

@@ -14,3 +14,6 @@ export interface ProTooltipPropsType {
 export interface RefObjectPropsType<T> {
     readonly current: T | null;
 }
+export type ProtooltipTriggerNodeType = HTMLElement & {
+    parentNode: HTMLElement;
+};

package/lib/ProTree/components/ProTree.js

@@ -245,7 +245,7 @@ var ProTree = function ProTree(props) {
   /**
    * 复选事件处理函数，全选事件处理函数
    */
-  var handleFinish = function handleFinish(allValue, checkAll, checkedValues) {
+  var handleFinish = function handleFinish(allValue, checkAll, checkedValues, checkedNode) {
     if (disabled || isView) {
       return null;
     }
@@ -257,16 +257,24 @@ var ProTree = function ProTree(props) {
       onChange && onChange(allValue);
     } else {
       var values = checkedValues;
+      var options = state.flatTreeData.filter(function (item) {
+        return values.includes(item[fieldNameValue]);
+      });
+      if (checkedNode) {
+        options = checkedNode;
+        delete options[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'];
+      }
       if (labelInValue) {
         values = state.flatTreeData.filter(function (item) {
           return values.includes(item[fieldNameValue]);
         });
       }
-      onChange && onChange(values);
+      onChange && onChange(values, options);
     }
   };
   // 该方法只有复选框，在勾中checkbox后才会走到这个方法
   var onCheck = function onCheck(checkedKeys, info) {
+    var _info$node;
     if (disabled || isView) {
       return null;
     }
@@ -310,7 +318,11 @@ var ProTree = function ProTree(props) {
     setState({
       checkAll: checkAllTemp
     });
-    handleFinish(allValue, checkAllTemp, checkedValues);
+    var checkNodeValue = info === null || info === void 0 ? void 0 : (_info$node = info.node) === null || _info$node === void 0 ? void 0 : _info$node[fieldNameValue];
+    var options = state.flatTreeData.filter(function (item) {
+      return checkNodeValue === item[fieldNameValue];
+    });
+    handleFinish(allValue, checkAllTemp, checkedValues, Array.isArray(options) ? options === null || options === void 0 ? void 0 : options[0] : options);
     if (other === null || other === void 0 ? void 0 : other.onCheck) {
       other.onCheck(checkedKeys, {
         checked: info.checked,
@@ -343,12 +355,12 @@ var ProTree = function ProTree(props) {
     setState({
       checkAll: checked
     });
-    handleFinish(allValue, checked, checkedValues);
+    handleFinish(allValue, checked, checkedValues, null);
   };
   /** 点击了树节点开始loading,改变自身state并将值通过onchange上传到form */
   var onSelectTreeNode = /*#__PURE__*/function () {
     var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(props, info) {
-      var values;
+      var values, options, option;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -372,17 +384,24 @@ var ProTree = function ProTree(props) {
               clickShowLoading: false
             });
           case 7:
+            values = props;
+            options = state.flatTreeData.filter(function (item) {
+              return values === item[fieldNameValue];
+            });
+            if (labelInValue) {
+              values = state.flatTreeData.filter(function (item) {
+                return values === item[fieldNameValue];
+              });
+            }
+            option = options === null || options === void 0 ? void 0 : options[0];
+            delete option[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'];
             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);
+              // 单选将选中节点值冒泡到form, 给onFieldChange添加options
+              onChange && onChange(values, option);
+            } else {
+              onChange && onChange(value, option);
             }
-          case 8:
+          case 13:
           case "end":
             return _context.stop();
         }

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

@@ -17,7 +17,7 @@ var _react = require("react");
 var _lodash = require("lodash");
 var _ProConfigProvider = require("../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../../ProForm/components/Container"));
-var _excluded = ["disabled", "code", "dataSource", "defaultDisableValue", "onChange", "useRequest", "transformResponse", "fieldNames", "tooltip", "showSearch", "filterTreeNode", "treeNodeFilterProp", "defaultExpandAll", "expandedKeys", "treeCheckable", "onSearch", "otherProps", "width", "dropdownStyle", "popupClassName", "style", "allowClear", "listHeight", "showCodeName", "className"],
+var _excluded = ["disabled", "code", "dataSource", "defaultDisableValue", "onChange", "useRequest", "transformResponse", "fieldNames", "tooltip", "showSearch", "filterTreeNode", "treeNodeFilterProp", "defaultExpandAll", "expandedKeys", "treeCheckable", "onSearch", "otherProps", "width", "dropdownStyle", "popupClassName", "style", "allowClear", "listHeight", "showCodeName", "className", "checkStrictly", "checkable"],
   _excluded2 = ["children"];
 /* eslint-disable react/no-danger */
 /* eslint-disable react/jsx-closing-tag-location */
@@ -67,6 +67,8 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     listHeight = props.listHeight,
     showCodeName = props.showCodeName,
     className = props.className,
+    checkStrictly = props.checkStrictly,
+    checkable = props.checkable,
     selectProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _props$value = props.value,
     value = _props$value === void 0 ? undefined : _props$value;
@@ -379,9 +381,11 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     var filterData = function filterData(data) {
       for (var i = 0; i < data.length; i++) {
         var item = data[i];
-        if (item[code] === nodeValue) {
-          result.value = nodeValue;
+        if (item[code] === nodeValue || Array.isArray(nodeValue) && nodeValue.includes(item[code])) {
+          result = (0, _objectSpread2.default)({}, item);
+          result.value = item[code];
           result.label = item[label];
+          delete result[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'];
           return null;
         }
         // 一直递归到最后一层子节点
@@ -415,7 +419,8 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     if (props === null || props === void 0 ? void 0 : props.labelInValue) {
       result = getLabelByValue(selectList, newVal);
     }
-    onChange && onChange(result, label, extra);
+    var options = findTreeNode(selectList, extra === null || extra === void 0 ? void 0 : extra.triggerValue);
+    onChange && onChange(result, options, extra);
     // 重置搜索
     showSearch && searchTreeEvent('');
   };
@@ -488,7 +493,8 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     allowClear: allowClear || true,
     showArrow: true,
     treeNodeFilterProp: treeNodeFilterProp,
-    virtual: true
+    virtual: true,
+    treeCheckStrictly: checkStrictly
   }, selectProps);
   if (value === null) {
     delete treeProps.value;

package/lib/ProTree/components/ProTreeSelect/propsType.d.ts

@@ -71,6 +71,8 @@ export interface PropTreeSelectProps extends Omit<TreeSelectProps, 'onSearch'> {
     };
     defaultExpandAll?: boolean;
     expandedKeys?: any[];
+    checkStrictly?: boolean;
+    checkable?: boolean;
 }
 export interface ProSelectAction {
     /** 获取发生请求的 useRequest 的 ref */

package/lib/ProTree/propsType.d.ts

@@ -60,7 +60,7 @@ export interface ProTreeProps extends PropTreeSelectProps {
     /** 树节点文本宽度 */
     ellipseWidth?: string;
     /** value改变的回调 */
-    onChange?: (values: string[] | AllValueType) => void;
+    onChange?: (values: string[] | AllValueType, options?: object[]) => void;
     /** 点击树节点触发 */
     onSelect?: (values: string[] | AllValueType, info?: any) => any;
     /** 复选情况下点击checkbox触发,参照antd */
@@ -193,6 +193,7 @@ export interface PropTreeSelectProps extends Omit<TreeSelectProps, 'onSearch'> {
         service: Service<any, any>;
         options?: Options<any, any>;
     };
+    checkable?: boolean;
 }
 export interface ProSelectAction {
     /** 获取发生请求的 useRequest 的 ref */

package/lib/ProUpload/components/DragRender.js

@@ -33,9 +33,7 @@ var DragRender = function DragRender(props) {
     setFileList = props.setFileList,
     onChange = props.onChange;
   var refReSelect = (0, _react.useRef)();
-  if (isView) return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-    children: "-"
-  });
+  // if (isView) return <>-</>;
   // 拖拽模式下单个文件可用
   var showDraggerSingleRender = maxCount === 1 && fileList[0];
   /**
@@ -98,13 +96,13 @@ var DragRender = function DragRender(props) {
         onPreview: onPreview
       }), file.status !== 'uploading' && (0, _jsxRuntime.jsxs)("div", {
         className: "file-action-box",
-        children: [(0, _jsxRuntime.jsx)("div", {
+        children: [!isView && !disabled && (0, _jsxRuntime.jsx)("div", {
           className: "file-name",
           onClick: function onClick() {
             handleReSelect(file);
           },
           children: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProUpload = _locale.default.ProUpload) === null || _locale$ProUpload === void 0 ? void 0 : _locale$ProUpload.draggerSelect
-        }), (0, _jsxRuntime.jsx)("div", {
+        }), !isView && !disabled && (0, _jsxRuntime.jsx)("div", {
           className: "file-del",
           onClick: function onClick() {
             handleDelFile(file);

package/lib/ProUpload/style/fileItem.less

@@ -1,4 +1,15 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-upload  {
+  .@{ant-prefix}-upload-disabled{
+    .file-action-box{
+      .file-name, .file-del{
+        color: #ccc;
+        cursor: not-allowed !important;
+      }
+    }
+  }
 
   .filelist-item-wrapper {
     .file-info-box {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.4.11-beta.9",
+  "version": "3.4.12",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",