@zat-design/sisyphus-react 3.4.5 → 3.4.6-beta.10

package/lib/ProTree/components/Tree.js

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
@@ -17,13 +19,13 @@ var _icons = require("@ant-design/icons");
 var _SearchTitle = _interopRequireDefault(require("./SearchTitle"));
 var _utils = require("../utils");
 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"];
+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
  *@Author: liudongliang
  *@Description: 树每行节点渲染组件，复选时阻止点击事件冒泡，只有点击树节点文本会向上触发onSelect事件
-*/
+ */
 /* eslint-disable no-plusplus */
 var tagsBgColors = ['rgba(0, 106, 255,0.16)', 'rgba(0, 196, 74,0.16)', 'rgba(255, 140, 0,0.16)', 'rgba(255, 80, 80,0.16)', 'rgba(97, 97, 97, 0.16)'];
 var tagsColors = ['#006AFF', '#00C44A', '#FF8C00', '#FF5050', '#616161'];
@@ -55,19 +57,22 @@ function List(props) {
     innerExpandKeys = props.innerExpandKeys,
     selectedKey = props.selectedKey,
     disabledMode = props.disabledMode,
+    isRadioSelect = props.isRadioSelect,
     other = (0, _objectWithoutProperties2.default)(props, _excluded);
   var fieldNameLabel = fieldNames.label;
   var fieldNameValue = fieldNames.value;
   var _useSetState = (0, _ahooks.useSetState)({
       expandedKeys: [],
       autoExpandParent: true,
-      currentClickTreeNode: null
+      currentClickTreeNode: null,
+      handing: false
     }),
     _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
     _useSetState2$ = _useSetState2[0],
     expandedKeys = _useSetState2$.expandedKeys,
     autoExpandParent = _useSetState2$.autoExpandParent,
     currentClickTreeNode = _useSetState2$.currentClickTreeNode,
+    handing = _useSetState2$.handing,
     setState = _useSetState2[1];
   (0, _react.useEffect)(function () {
     if (searchStr) {
@@ -107,18 +112,44 @@ function List(props) {
       });
     }
   }, [selectedKey]);
-  var onSelect = function onSelect(value, item) {
-    var _props$onSelect;
-    var val = value;
-    if (value === currentClickTreeNode) {
-      // 如果当前点击了已经选中节点，那么取消选择
-      val = '';
-    }
-    setState({
-      currentClickTreeNode: val
-    });
-    props === null || props === void 0 ? void 0 : (_props$onSelect = props.onSelect) === null || _props$onSelect === void 0 ? void 0 : _props$onSelect.call(props, val, item);
-  };
+  var onSelect = /*#__PURE__*/function () {
+    var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(value, item) {
+      var _props$onSelect;
+      var val;
+      return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!handing) {
+              _context.next = 2;
+              break;
+            }
+            return _context.abrupt("return", null);
+          case 2:
+            val = value;
+            if (!isRadioSelect && value === currentClickTreeNode) {
+              // 如果当前点击了已经选中节点，那么取消选择
+              val = '';
+            }
+            setState({
+              currentClickTreeNode: val,
+              handing: true
+            });
+            _context.next = 7;
+            return props === null || props === void 0 ? void 0 : (_props$onSelect = props.onSelect) === null || _props$onSelect === void 0 ? void 0 : _props$onSelect.call(props, val, item);
+          case 7:
+            setState({
+              handing: false
+            });
+          case 8:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function onSelect(_x, _x2) {
+      return _ref.apply(this, arguments);
+    };
+  }();
   var TreeNodeRow = function TreeNodeRow(props) {
     var nodeClass = props.nodeClass,
       item = props.item,
@@ -268,7 +299,6 @@ function List(props) {
       })]
     }, onlyKey);
   };
-  // const _treeData = useMemo(() => {
   function fn() {
     var loop = function loop(data, index) {
       index++;
@@ -280,33 +310,27 @@ function List(props) {
           isChecked = true;
         }
         var title = showCodeName ? "".concat(item[fieldNameValue], "-").concat(item[fieldNameLabel]) : item[fieldNameLabel];
+        var nodeTitle = (0, _jsxRuntime.jsx)(TreeNodeRow, {
+          nodeClass: nodeClass,
+          item: item,
+          index: index,
+          title: (item === null || item === void 0 ? void 0 : item.title) || title,
+          isChecked: isChecked,
+          onlyKey: item[fieldNameValue]
+        });
         if (item[fieldNames.children]) {
-          return {
-            title: (0, _jsxRuntime.jsx)(TreeNodeRow, {
-              nodeClass: nodeClass,
-              item: item,
-              index: index,
-              title: title,
-              isChecked: isChecked,
-              onlyKey: item[fieldNameValue]
-            }),
-            key: item[fieldNameValue],
+          return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
+            title: nodeTitle,
+            key: (item === null || item === void 0 ? void 0 : item.key) || item[fieldNameValue],
             children: loop(item[fieldNames.children], index)
-          };
+          });
         }
-        return {
-          title: (0, _jsxRuntime.jsx)(TreeNodeRow, {
-            nodeClass: nodeClass,
-            item: item,
-            index: index,
-            title: title,
-            isChecked: isChecked,
-            onlyKey: item[fieldNameValue]
-          }),
-          key: item[fieldNameValue]
-        };
+        return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
+          title: nodeTitle,
+          key: (item === null || item === void 0 ? void 0 : item.key) || item[fieldNameValue]
+        });
       });
-      return treeRow; // .filter((item) => item);
+      return treeRow;
     };
     if ((other === null || other === void 0 ? void 0 : other.mode) === 'view') {
       return;
@@ -317,8 +341,6 @@ function List(props) {
     }
     return loop(newTreeData, -1);
   }
-  // return fn();
-  // }, [searchStr, expandedKeys, showCodeName, originalTreeData, currentClickTreeNode]);
   var _treeData = fn();
   var onExpand = function onExpand(newExpandedKeys) {
     setState({

package/lib/ProTree/style/index.less

@@ -4,6 +4,30 @@
 .pro-tree {
   height: 100%; // tree auto css
 
+  .@{ant-prefix}-tree-node-content-wrapper{
+    display: flex;
+      align-items: baseline;
+  }
+
+  .@{ant-prefix}-tree .@{ant-prefix}-tree-treenode-disabled {
+    .@{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;
+    }
+  }
+
+  // 解决双滚动条
+  .@{ant-prefix}-select-dropdown.pro-tree-select-drop-down-container.checkable-tree{
+    overflow: hidden!important;
+  }
+
   .@{ant-prefix}-spin-nested-loading {
     height: 100%; // tree auto css
 
@@ -304,19 +328,6 @@
   }
 }
 
-.@{ant-prefix}-tree .@{ant-prefix}-tree-treenode-disabled {
-  .@{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;
-  }
-}
 
 // 重置ant-form view模式样式ant-tree样式
 .pro-form.pro-form-view .@{ant-prefix}-form-item .pro-tree * {
@@ -337,7 +348,18 @@
   height: 16px !important;
 }
 
-// 解决双滚动条
-.@{ant-prefix}-select-dropdown.pro-tree-select-drop-down-container.checkable-tree{
-  overflow: hidden!important;
+.pro-tree-select, .pro-tree-select-drop-down-container{
+  .@{ant-prefix}-select-selector{
+    .check-mark-icon{
+      display: none;
+  }
+  }
+  &.@{ant-prefix}-select-dropdown{
+  // 隐藏单选下拉树后面勾号
+    .@{ant-prefix}-select-tree-node-content-wrapper{
+        .check-mark-icon{
+            display: none;
+        }
+    }
+  }
 }

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", "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"];
 /*
  * @Author: wangshengqiang
  * @Date: 2023-02-03 14:18:59
@@ -54,6 +54,8 @@ var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     onDownload = props.onDownload,
     onPreview = props.onPreview,
     onRemove = props.onRemove,
+    _props$filterOriginFi = props.filterOriginFileObj,
+    filterOriginFileObj = _props$filterOriginFi === void 0 ? false : _props$filterOriginFi,
     _props$method = props.method,
     method = _props$method === void 0 ? 'post' : _props$method,
     className = props.className,
@@ -89,15 +91,11 @@ var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var uploadResTransform = function uploadResTransform(fileList) {
     var _list = fileList.map(function (file) {
       if (file.status === 'done' && file.response) {
-        var nfile = {
-          name: file.name,
-          size: file.size,
-          status: file.status,
-          type: file.type,
-          uid: file.uid,
-          response: file === null || file === void 0 ? void 0 : file.response
-          // url: file?.response?.data?.url,
-        };
+        var nfile = (0, _objectSpread2.default)({}, file);
+        // 过滤掉originFileObj
+        if (filterOriginFileObj) {
+          return (0, _lodash.omit)(nfile, 'originFileObj');
+        }
         if (transformResponse) {
           var data = transformResponse(file.response) || {};
           return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, nfile), data);
@@ -184,7 +182,6 @@ var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
    * @return {*}
    */
   var handleBeforeUpload = function handleBeforeUpload(file, fileList) {
-    // TODO
     if (!(0, _uitls.validateFileExt)(extExt, file)) {
       var _locale$ProUpload2;
       _antd.message.error("".concat(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProUpload2 = _locale.default.ProUpload) === null || _locale$ProUpload2 === void 0 ? void 0 : _locale$ProUpload2.errorInfoExt, "\u3010").concat(extExt.join('、'), "\u3011"));
@@ -252,7 +249,8 @@ var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     showUploadList: showUploadList,
     method: method,
     accept: accept,
-    data: (0, _objectSpread2.default)({}, dataParams)
+    data: (0, _objectSpread2.default)({}, dataParams),
+    name: name
   }, residueProps);
   var baseProps = {
     isView: isView,

package/lib/ProUpload/propsType.d.ts

@@ -18,10 +18,15 @@ export interface fieldNamesProps {
 }
 export interface ProUploadProps {
     /**
-     * @description       拖拽框顶部的内容
-     * @default           -
-     */
+   * @description       顶部的内容(button类型的上传不适用)
+   * @default           -
+   */
     headerRender?: React.ReactNode | (() => React.ReactNode);
+    /**
+     * @description       是否过滤掉file对象中的originFileObj
+     * @default           false
+     */
+    filterOriginFileObj?: boolean;
     /**
      * @description       拖拽框底部内容
      * @default           -

package/lib/assets/view.svg

@@ -2,7 +2,7 @@
 <svg width="19px" height="15px" viewBox="0 0 19 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>icon-dropdown-searchlist</title>
     <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="询报价录入交互说明" transform="translate(-531, -308)" fill="#999999" fill-rule="nonzero">
+        <g id="询报价录入交互说明" transform="translate(-531, -308)" fill="currentColor" fill-rule="nonzero">
             <g id="Dropdown/下拉弹窗切换/default备份-2" transform="translate(215, 299)">
                 <g id="编组-2" transform="translate(288, 1)">
                     <g id="编组" transform="translate(22, 0)">
@@ -17,4 +17,4 @@
             </g>
         </g>
     </g>
-</svg>
+</svg>

package/lib/global.less

@@ -5,37 +5,46 @@ pre {
 }
 
 * {
-  // 火狐浏览器
-  scrollbar-width: thin;
-  scrollbar-color: #8b8b8b transparent;
   // ie浏览器
-  scrollbar-face-color: #8b8b8b;
-  scrollbar-highlight-color: #606060;
-  scrollbar-3dlight-color: #606060;
-}
+  scrollbar-face-color: #d2d3d7;
+  scrollbar-highlight-color: #979797;
+  scrollbar-3dlight-color: #979797;
 
-::-webkit-scrollbar  {
-  width: 16px;
-}
+  ::-webkit-scrollbar  {
+    width: 16px;
+    background: transparent;
+  }
 
-// // 滑块
-::-webkit-scrollbar-thumb {
-  background-color: #8b8b8b;
-  background-clip: padding-box;
-  border-color: transparent;
-  border-style: dashed;
-  border-width: 4px;
-  border-radius: 10px;
-  -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
-}
+  // 轨道
+  ::-webkit-scrollbar-track {
+    background-color: #fff;
+    border-radius: 10px;
+  }
 
-// 轨道
-::-webkit-scrollbar-track {
-  background-color: transparent;
-  border-radius: 10px;
-}
+  // 悬浮轨道
+  ::-webkit-scrollbar-thumb:hover {
+    background-color: #979797;
+  }
+
+  :hover::-webkit-scrollbar-track {
+    background: transparent;
+  }
+
+  :hover::-webkit-scrollbar-thumb {
+    background-color: #d2d3d7;
+    background-clip: padding-box;
+    border-color: transparent;
+    border-style: dashed;
+    border-width: 4px;
+    border-radius: 10px;
+    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
+  }
+
+  :hover::-webkit-scrollbar-thumb:hover {
+    background-color: #979797;
+  }
 
-// 悬浮轨道
-::-webkit-scrollbar-thumb:hover {
-  background-color: #606060;
+  :hover::-webkit-scrollbar-track {
+    background-color: #fff;
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.4.5",
+  "version": "3.4.6-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.16",
+    "@zat-design/utils": "^1.1.20",
     "ahooks": "3.7.4",
     "antd": "4.24.8",
     "big.js": "^6.2.1",

package/es/ProForm/components/base/ProCascader/index.d.ts

@@ -1,14 +0,0 @@
-import { Service, Options } from 'ahooks/lib/useRequest/src/types';
-import { CascaderProps } from 'antd';
-interface RequestProps<T, P extends any[]> {
-    service: Service<T, P>;
-    options?: Options<T, P>;
-}
-export type Props<T, RT extends T[], RP> = CascaderProps<T> & {
-    useRequest?: RequestProps<RT, [RP]>;
-    otherProps?: any;
-    isView?: boolean;
-    dataSource?: T[];
-};
-declare const ProCascader: <T, RT extends T[], RP>(props: Props<T, RT, RP>) => JSX.Element;
-export default ProCascader;

package/es/ProForm/components/base/ProCascader/index.js

@@ -1,72 +0,0 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/cascader/style";
-import _Cascader from "antd/es/cascader";
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-var _excluded = ["useRequest", "otherProps", "dataSource", "options"];
-import { jsx as _jsx } from "react/jsx-runtime";
-import { useRequest } from 'ahooks';
-import Container from '../../Container';
-import ProForm from '../../../../ProForm';
-var defaultFieldNames = {
-  value: 'value',
-  label: 'label',
-  children: 'children'
-};
-/**
- * 获取值对应的选项对象
- */
-var findTreeTarget = function findTreeTarget(dataSource, value, fieldNames) {
-  var level = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
-  var stack = _toConsumableArray(dataSource);
-  if ((dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) && (value === null || value === void 0 ? void 0 : value.length)) {
-    var valueName = fieldNames.value,
-      label = fieldNames.label,
-      children = fieldNames.children;
-    return value === null || value === void 0 ? void 0 : value.map(function (valueItem) {
-      var index = 0;
-      while (stack.length) {
-        var target = stack.shift();
-        if (target[valueName] === valueItem) {
-          stack = target[children] ? _toConsumableArray(target[children]) : [];
-          return target;
-        }
-        index += 1;
-      }
-      return _defineProperty({}, valueName, valueItem);
-    });
-  }
-  return [];
-};
-var ProCascader = function ProCascader(props) {
-  var _restProps$fieldNames;
-  var requestProps = props.useRequest,
-    otherProps = props.otherProps,
-    dataSource = props.dataSource,
-    options = props.options,
-    restProps = _objectWithoutProperties(props, _excluded);
-  var _ref2 = ProForm.useFieldProps() || {},
-    isViewCon = _ref2.isView;
-  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
-  var _useRequest = useRequest(requestProps === null || requestProps === void 0 ? void 0 : requestProps.service, requestProps === null || requestProps === void 0 ? void 0 : requestProps.options),
-    data = _useRequest.data;
-  var _dataSource = data || dataSource || options;
-  var _fieldNames = (_restProps$fieldNames = restProps.fieldNames) !== null && _restProps$fieldNames !== void 0 ? _restProps$fieldNames : defaultFieldNames;
-  if (isView) {
-    var valueTarget = findTreeTarget(_dataSource, restProps.value, _fieldNames);
-    var valueName = _fieldNames.value,
-      label = _fieldNames.label;
-    var nameList = valueTarget.map(function (item) {
-      var _item$label;
-      return (_item$label = item[label]) !== null && _item$label !== void 0 ? _item$label : item[valueName];
-    });
-    return _jsx(Container, {
-      children: nameList.join('/')
-    });
-  }
-  return _jsx(_Cascader, _objectSpread(_objectSpread({}, restProps), {}, {
-    options: _dataSource
-  }));
-};
-export default ProCascader;