@zat-design/sisyphus-react 3.13.6-beta.1 → 3.13.6-beta.2

package/es/ProTree/components/AdaptiveTooltip.js

@@ -1,45 +1,19 @@
 import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
-import { useEffect, useState } from 'react';
+import { jsx as _jsx } from "react/jsx-runtime";
 var AdaptiveTooltip = function AdaptiveTooltip(_ref) {
   var children = _ref.children;
-  var _useState = useState('right'),
-    _useState2 = _slicedToArray(_useState, 2),
-    placement = _useState2[0],
-    setPlacement = _useState2[1];
-  useEffect(function () {
-    var handleResize = function handleResize() {
-      var tooltipElement = document.getElementById('adaptive-tooltip');
-      if (tooltipElement) {
-        var boundingRect = tooltipElement.getBoundingClientRect();
-        var windowWidth = window.innerWidth;
-        if (windowWidth - boundingRect.right < 150) {
-          setPlacement('left');
-        } else {
-          setPlacement('right');
-        }
-      }
-    };
-    window.addEventListener('resize', handleResize);
-    handleResize();
-    return function () {
-      window.removeEventListener('resize', handleResize);
-    };
-  }, [children]);
   return _jsx(_Tooltip, {
-    placement: placement,
+    placement: "rightTop",
     title: _jsx("div", {
       onMouseDown: function onMouseDown(e) {
         return e.stopPropagation();
       },
       children: children
     }),
-    id: "adaptive-tooltip",
-    children: _jsxs("span", {
+    children: _jsx("span", {
       className: "pro-tree-wrap-ellipse",
-      children: [" ", children]
+      children: children
     })
   });
 };

package/es/ProTree/components/ProTree.js

@@ -75,7 +75,6 @@ var ProTree = function ProTree(props) {
     showExpand = _props$showExpand === void 0 ? false : _props$showExpand,
     defaultExpandAll = props.defaultExpandAll,
     other = _objectWithoutProperties(props, _excluded);
-  var fieldNameLabel = fieldNames.label;
   var fieldNameValue = fieldNames.value;
   var _useSetState = useSetState({
       open: false,

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

@@ -12,7 +12,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import "antd/es/tree-select/style";
 import _TreeSelect from "antd/es/tree-select";
-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"],
+var _excluded = ["disabled", "code", "dataSource", "defaultDisableValue", "onChange", "useRequest", "transformResponse", "fieldNames", "placeholder", "tooltip", "showSearch", "filterTreeNode", "treeNodeFilterProp", "defaultExpandAll", "expandedKeys", "treeCheckable", "onSearch", "otherProps", "width", "dropdownStyle", "popupClassName", "style", "allowClear", "listHeight", "showCodeName", "className", "checkStrictly", "checkable"],
   _excluded2 = ["children"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /* eslint-disable react/no-danger */
@@ -21,6 +21,7 @@ import { useDeepCompareEffect, useRequest as useRequestFunc, useSetState } from
 import classnames from 'classnames';
 import { useImperativeHandle, forwardRef } from 'react';
 import { cloneDeep, debounce } from 'lodash';
+import locale from '../../../locale';
 import { useProConfig } from '../../../ProConfigProvider';
 import Container from '../../../ProForm/components/Container';
 import AdaptiveTooltip from '../AdaptiveTooltip';
@@ -50,6 +51,7 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     useRequest = props.useRequest,
     transformResponse = props.transformResponse,
     fieldNames = props.fieldNames,
+    placeholder = props.placeholder,
     _props$tooltip = props.tooltip,
     tooltip = _props$tooltip === void 0 ? false : _props$tooltip,
     _props$showSearch = props.showSearch,
@@ -171,26 +173,29 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
   // 配置了异步数据源，拉取枚举数据逻辑 如果有code不掉接口从local里根据code取值
   var fetchFunction = useRequestFunc(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, _objectSpread({
     manual: true,
-    onSuccess: function onSuccess(data) {
-      // 用户配置了处理枚举函数
+    debounceWait: 300
+  }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options));
+  useImperativeHandle(ref, function () {
+    return {
+      useRequestRef: fetchFunction
+    };
+  });
+  // 请求成功
+  useDeepCompareEffect(function () {
+    if (fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data) {
       if (transformResponse && typeof transformResponse === 'function') {
-        var responseData = transformResponse(data);
+        var responseData = transformResponse(fetchFunction.data);
+        // debugger;
         var resultData = transferDataSource(responseData, showCodeName);
         setState({
           selectList: countChild(resultData),
           origDataSource: resultData
         });
       } else {
-        defaultOnSuccessFun(data);
+        defaultOnSuccessFun(fetchFunction.data);
       }
-    },
-    debounceWait: 300
-  }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options));
-  useImperativeHandle(ref, function () {
-    return {
-      useRequestRef: fetchFunction
-    };
-  });
+    }
+  }, [fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data]);
   useDeepCompareEffect(function () {
     if (enumCode) {
       var dictEnum = dics[enumCode] || [];
@@ -565,6 +570,7 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     onClick: nodeChangeEvent,
     className: cls,
     children: _jsx(_TreeSelect, _objectSpread(_objectSpread({
+      placeholder: placeholder || locale.ProForm.treeSelectPlaceholder,
       maxTagPlaceholder: function maxTagPlaceholder(rest) {
         var _rest = rest.map(function (tag) {
           var _tag$label, _tag$label$props, _tag$label2, _tag$label2$props, _tag$label2$props$chi, _tag$label2$props$chi2, _tag$label2$props$chi3, _tag$label3, _tag$label3$props, _tag$label3$props$dan;

package/es/locale/en_US.d.ts

@@ -25,6 +25,7 @@ declare const _default: {
         unfold: string;
         packUp: string;
         inputPlaceholder: string;
+        treeSelectPlaceholder: string;
         selectPlaceHolder: string;
         switchText: string[];
         ruleStartEndText: string[];

package/es/locale/en_US.js

@@ -25,6 +25,7 @@ export default {
     unfold: 'Unfold',
     packUp: 'PackUp',
     inputPlaceholder: 'Please enter',
+    treeSelectPlaceholder: 'Please select',
     selectPlaceHolder: 'Please select',
     switchText: ['Yes', 'No'],
     ruleStartEndText: ['start value', 'end value'],

package/es/locale/zh_CN.d.ts

@@ -25,6 +25,7 @@ declare const _default: {
         unfold: string;
         packUp: string;
         inputPlaceholder: string;
+        treeSelectPlaceholder: string;
         selectPlaceHolder: string;
         switchText: string[];
         ruleStartEndText: string[];

package/es/locale/zh_CN.js

@@ -25,6 +25,7 @@ export default {
     unfold: '展开',
     packUp: '收起',
     inputPlaceholder: '请输入',
+    treeSelectPlaceholder: '请选择',
     selectPlaceHolder: '请选择',
     switchText: ['是', '否'],
     ruleStartEndText: ['起始值', '截止值'],

package/lib/ProTree/components/AdaptiveTooltip.js

@@ -1,51 +1,24 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
-var _react = require("react");
 var AdaptiveTooltip = function AdaptiveTooltip(_ref) {
   var children = _ref.children;
-  var _useState = (0, _react.useState)('right'),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    placement = _useState2[0],
-    setPlacement = _useState2[1];
-  (0, _react.useEffect)(function () {
-    var handleResize = function handleResize() {
-      var tooltipElement = document.getElementById('adaptive-tooltip');
-      if (tooltipElement) {
-        var boundingRect = tooltipElement.getBoundingClientRect();
-        var windowWidth = window.innerWidth;
-        if (windowWidth - boundingRect.right < 150) {
-          setPlacement('left');
-        } else {
-          setPlacement('right');
-        }
-      }
-    };
-    window.addEventListener('resize', handleResize);
-    handleResize();
-    return function () {
-      window.removeEventListener('resize', handleResize);
-    };
-  }, [children]);
   return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
-    placement: placement,
+    placement: "rightTop",
     title: (0, _jsxRuntime.jsx)("div", {
       onMouseDown: function onMouseDown(e) {
         return e.stopPropagation();
       },
       children: children
     }),
-    id: "adaptive-tooltip",
-    children: (0, _jsxRuntime.jsxs)("span", {
+    children: (0, _jsxRuntime.jsx)("span", {
       className: "pro-tree-wrap-ellipse",
-      children: [" ", children]
+      children: children
     })
   });
 };

package/lib/ProTree/components/ProTree.js

@@ -75,7 +75,6 @@ var ProTree = function ProTree(props) {
     showExpand = _props$showExpand === void 0 ? false : _props$showExpand,
     defaultExpandAll = props.defaultExpandAll,
     other = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var fieldNameLabel = fieldNames.label;
   var fieldNameValue = fieldNames.value;
   var _useSetState = (0, _ahooks.useSetState)({
       open: false,

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

@@ -17,10 +17,11 @@ var _antd = require("antd");
 var _classnames3 = _interopRequireDefault(require("classnames"));
 var _react = require("react");
 var _lodash = require("lodash");
+var _locale = _interopRequireDefault(require("../../../locale"));
 var _ProConfigProvider = require("../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../../ProForm/components/Container"));
 var _AdaptiveTooltip = _interopRequireDefault(require("../AdaptiveTooltip"));
-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"],
+var _excluded = ["disabled", "code", "dataSource", "defaultDisableValue", "onChange", "useRequest", "transformResponse", "fieldNames", "placeholder", "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 */
@@ -50,6 +51,7 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     useRequest = props.useRequest,
     transformResponse = props.transformResponse,
     fieldNames = props.fieldNames,
+    placeholder = props.placeholder,
     _props$tooltip = props.tooltip,
     tooltip = _props$tooltip === void 0 ? false : _props$tooltip,
     _props$showSearch = props.showSearch,
@@ -171,26 +173,29 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
   // 配置了异步数据源，拉取枚举数据逻辑 如果有code不掉接口从local里根据code取值
   var fetchFunction = (0, _ahooks.useRequest)(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, (0, _objectSpread2.default)({
     manual: true,
-    onSuccess: function onSuccess(data) {
-      // 用户配置了处理枚举函数
+    debounceWait: 300
+  }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options));
+  (0, _react.useImperativeHandle)(ref, function () {
+    return {
+      useRequestRef: fetchFunction
+    };
+  });
+  // 请求成功
+  (0, _ahooks.useDeepCompareEffect)(function () {
+    if (fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data) {
       if (transformResponse && typeof transformResponse === 'function') {
-        var responseData = transformResponse(data);
+        var responseData = transformResponse(fetchFunction.data);
+        // debugger;
         var resultData = transferDataSource(responseData, showCodeName);
         setState({
           selectList: countChild(resultData),
           origDataSource: resultData
         });
       } else {
-        defaultOnSuccessFun(data);
+        defaultOnSuccessFun(fetchFunction.data);
       }
-    },
-    debounceWait: 300
-  }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options));
-  (0, _react.useImperativeHandle)(ref, function () {
-    return {
-      useRequestRef: fetchFunction
-    };
-  });
+    }
+  }, [fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data]);
   (0, _ahooks.useDeepCompareEffect)(function () {
     if (enumCode) {
       var dictEnum = dics[enumCode] || [];
@@ -565,6 +570,7 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     onClick: nodeChangeEvent,
     className: cls,
     children: (0, _jsxRuntime.jsx)(_antd.TreeSelect, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      placeholder: placeholder || _locale.default.ProForm.treeSelectPlaceholder,
       maxTagPlaceholder: function maxTagPlaceholder(rest) {
         var _rest = rest.map(function (tag) {
           var _tag$label, _tag$label$props, _tag$label2, _tag$label2$props, _tag$label2$props$chi, _tag$label2$props$chi2, _tag$label2$props$chi3, _tag$label3, _tag$label3$props, _tag$label3$props$dan;

package/lib/locale/en_US.d.ts

@@ -25,6 +25,7 @@ declare const _default: {
         unfold: string;
         packUp: string;
         inputPlaceholder: string;
+        treeSelectPlaceholder: string;
         selectPlaceHolder: string;
         switchText: string[];
         ruleStartEndText: string[];

package/lib/locale/en_US.js

@@ -31,6 +31,7 @@ var _default = exports.default = {
     unfold: 'Unfold',
     packUp: 'PackUp',
     inputPlaceholder: 'Please enter',
+    treeSelectPlaceholder: 'Please select',
     selectPlaceHolder: 'Please select',
     switchText: ['Yes', 'No'],
     ruleStartEndText: ['start value', 'end value'],

package/lib/locale/zh_CN.d.ts

@@ -25,6 +25,7 @@ declare const _default: {
         unfold: string;
         packUp: string;
         inputPlaceholder: string;
+        treeSelectPlaceholder: string;
         selectPlaceHolder: string;
         switchText: string[];
         ruleStartEndText: string[];

package/lib/locale/zh_CN.js

@@ -31,6 +31,7 @@ var _default = exports.default = {
     unfold: '展开',
     packUp: '收起',
     inputPlaceholder: '请输入',
+    treeSelectPlaceholder: '请选择',
     selectPlaceHolder: '请选择',
     switchText: ['是', '否'],
     ruleStartEndText: ['起始值', '截止值'],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.13.6-beta.1",
+  "version": "3.13.6-beta.2",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",