@zat-design/sisyphus-react 3.13.19-beta.9 → 3.13.19

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

@@ -1,5 +1,3 @@
-import "antd/es/space/style";
-import _Space from "antd/es/space";
 import "antd/es/input/style";
 import _Input from "antd/es/input";
 import "antd/es/button/style";
@@ -7,6 +5,8 @@ import _Button from "antd/es/button";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/input-number/style";
 import _InputNumber from "antd/es/input-number";
+import "antd/es/space/style";
+import _Space from "antd/es/space";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { useSetState, useDeepCompareEffect } from 'ahooks';
 import { isEmpty } from 'lodash';
@@ -19,7 +19,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var formatAmount = tools.formatAmount;
 var ProNumberRange = props => {
-  var _document$querySelect, _valueProps, _ref2, _ref3, _value$, _valueProps2, _ref4, _ref5, _value$2, _valueProps3, _valueProps4;
+  var _valueProps, _ref2, _ref3, _value$, _valueProps2, _ref4, _ref5, _value$2, _valueProps3, _valueProps4;
   var _props$value = props.value,
     value = _props$value === void 0 ? [] : _props$value,
     _props$onChange = props.onChange,
@@ -35,16 +35,16 @@ var ProNumberRange = props => {
     childProps = props.childProps,
     addonBefore = props.addonBefore,
     addonAfter = props.addonAfter,
-    _props$separator = props.separator,
-    separator = _props$separator === void 0 ? '~' : _props$separator,
     inValueType = props.valueType,
+    _props$split = props.split,
+    split = _props$split === void 0 ? '~' : _props$split,
     id = props.id;
   var _ref = ProForm.useFieldProps() || {},
     isViewCon = _ref.isView,
     viewEmpty = _ref.viewEmpty,
     valueType = _ref.valueType;
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
-  var addonAfterDomWidth = (_document$querySelect = document.querySelector('.ant-input-number-group-addon')) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.clientWidth;
+
   var _useSetState = useSetState({
       range: value || []
     }),
@@ -101,25 +101,53 @@ var ProNumberRange = props => {
       case 'percentage':
         return /*#__PURE__*/_jsx(Container, {
           viewEmpty: viewEmpty,
-          children: `${formatAmount(value[0], precision || decimal)} ${separator} ${formatAmount(value[1], precision || decimal)}`
+          children: /*#__PURE__*/_jsxs(_Space, {
+            split: split,
+            children: [/*#__PURE__*/_jsx("span", {
+              children: formatAmount(value[0], precision || decimal)
+            }), /*#__PURE__*/_jsx("span", {
+              children: formatAmount(value[1], precision || decimal)
+            })]
+          })
         });
       // 千分比
       case 'permillage':
         return /*#__PURE__*/_jsx(Container, {
           viewEmpty: viewEmpty,
-          children: `${formatAmount(value[0], precision || decimal)} ${separator} ${formatAmount(value[1], precision || decimal)}`
+          children: /*#__PURE__*/_jsxs(_Space, {
+            split: split,
+            children: [/*#__PURE__*/_jsx("span", {
+              children: formatAmount(value[0], precision || decimal)
+            }), /*#__PURE__*/_jsx("span", {
+              children: formatAmount(value[1], precision || decimal)
+            })]
+          })
         });
       // 千分位
       case 'amount':
       case 'thousandth':
         return /*#__PURE__*/_jsx(Container, {
           viewEmpty: viewEmpty,
-          children: `${formatAmount(value[0], precision || decimal)} ${separator} ${formatAmount(value[1], precision || decimal)}`
+          children: /*#__PURE__*/_jsxs(_Space, {
+            split: split,
+            children: [/*#__PURE__*/_jsx("span", {
+              children: formatAmount(value[0], precision || decimal)
+            }), /*#__PURE__*/_jsx("span", {
+              children: formatAmount(value[1], precision || decimal)
+            })]
+          })
         });
       default:
         return /*#__PURE__*/_jsx(Container, {
           viewEmpty: viewEmpty,
-          children: `${value[0] || '-'} ${separator} ${value[1] || '-'}`
+          children: /*#__PURE__*/_jsxs(_Space, {
+            split: split,
+            children: [/*#__PURE__*/_jsx("span", {
+              children: value[0] || '-'
+            }), /*#__PURE__*/_jsx("span", {
+              children: value[1] || '-'
+            })]
+          })
         });
     }
   }
@@ -199,7 +227,7 @@ var ProNumberRange = props => {
           'range-split': true,
           'range-split-disabled': !!disabled
         }),
-        placeholder: "~",
+        placeholder: split,
         disabled: true
       }), /*#__PURE__*/_jsx(_InputNumber, _objectSpread(_objectSpread({
         className: "range-right",

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

@@ -71,9 +71,10 @@ export interface ProNumberRangeType {
      * @default           '-'
      */
     /**
-     * 查看分割符
+     * @description       查看分割符
+     * @default           '-'
      */
-    separator?: React.ReactNode | string;
+    split?: React.ReactNode | string;
     childProps?: any[];
     otherProps?: ProFormOtherType;
     id?: string;

package/es/ProForm/components/combination/ProNumberRange/style/index.less

@@ -4,7 +4,7 @@
 .pro-number-range {
   display: block;
   .@{ant-prefix}-space-compact {
-    display: block;
+    display: flex;
   }
 
   .range-split {

package/lib/ProEnum/index.js

@@ -33,7 +33,7 @@ require("./style/index.less");
 var _useFieldProps2 = require("../ProForm/utils/useFieldProps");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["code", "type", "dataSource", "useRequest", "value", "component", "onChange", "transformResponse", "otherProps", "isView"],
-  _excluded2 = ["fieldNames", "clear", "storage", "cacheKey", "showCodeName", "useRequest", "transformResponse"];
+  _excluded2 = ["fieldNames", "clear", "cacheKey", "showCodeName"];
 var ProEnum = props => {
   var _otherProps$isView, _enumProps$showCodeNa;
   var code = props.code,
@@ -57,19 +57,10 @@ var ProEnum = props => {
     fieldNames = _ref2.fieldNames,
     _ref2$clear = _ref2.clear,
     clear = _ref2$clear === void 0 ? true : _ref2$clear,
-    _ref2$storage = _ref2.storage,
-    storage = _ref2$storage === void 0 ? 'localStorage' : _ref2$storage,
     _ref2$cacheKey = _ref2.cacheKey,
     cacheKey = _ref2$cacheKey === void 0 ? 'zat-design-pro-component-cacheKey' : _ref2$cacheKey,
     showCodeName = _ref2.showCodeName,
-    configUseRequest = _ref2.useRequest,
-    configTransformResponse = _ref2.transformResponse,
     resProps = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
-
-  // 优先使用props中的配置，如果没有则使用全局配置
-  var finalUseRequest = useRequest || configUseRequest;
-  var finalTransformResponse = transformResponse || configTransformResponse;
-  var cacheData = (0, _utils.getEnumData)(storage, cacheKey);
   var _isView = isView !== undefined && isView !== null ? isView : (_otherProps$isView = otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView) !== null && _otherProps$isView !== void 0 ? _otherProps$isView : configIsView;
   enumProps.showCodeName = (_enumProps$showCodeNa = enumProps.showCodeName) !== null && _enumProps$showCodeNa !== void 0 ? _enumProps$showCodeNa : showCodeName;
   var label = 'label';
@@ -96,7 +87,7 @@ var ProEnum = props => {
   }
 
   // 这种时候优先级最高、完全走自定义
-  if (finalUseRequest !== null && finalUseRequest !== void 0 && finalUseRequest.service && props.fieldNames) {
+  if (useRequest !== null && useRequest !== void 0 && useRequest.service && props.fieldNames) {
     var _props$fieldNames5, _props$fieldNames6;
     if ((_props$fieldNames5 = props.fieldNames) !== null && _props$fieldNames5 !== void 0 && _props$fieldNames5.label) label = props.fieldNames.label;
     if ((_props$fieldNames6 = props.fieldNames) !== null && _props$fieldNames6 !== void 0 && _props$fieldNames6.value) fieldValue = props.fieldNames.value;
@@ -104,13 +95,13 @@ var ProEnum = props => {
   var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProEnum'),
     _useProConfig$dics = _useProConfig.dics,
     dics = _useProConfig$dics === void 0 ? {} : _useProConfig$dics;
-  var _useRequestFunc = (0, _ahooks.useRequest)(finalUseRequest === null || finalUseRequest === void 0 ? void 0 : finalUseRequest.service, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+  var _useRequestFunc = (0, _ahooks.useRequest)(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       manual: true,
       cacheTime: -1
-    }, finalUseRequest === null || finalUseRequest === void 0 ? void 0 : finalUseRequest.options), {}, {
+    }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
       onSuccess: res => {
-        if (finalTransformResponse && typeof finalTransformResponse === 'function') {
-          var responseData = finalTransformResponse(res);
+        if (transformResponse && typeof transformResponse === 'function') {
+          var responseData = transformResponse(res);
           if (typeof responseData !== 'object') {
             var _locale$ProEnum;
             return _message2.default.error((_locale$ProEnum = _locale.default.ProEnum) === null || _locale$ProEnum === void 0 ? void 0 : _locale$ProEnum.errorMessage);
@@ -142,14 +133,13 @@ var ProEnum = props => {
 
   // 自定义请求
   (0, _ahooks.useDeepCompareEffect)(() => {
-    var _ref3 = (finalUseRequest === null || finalUseRequest === void 0 ? void 0 : finalUseRequest.options) || {},
+    var _ref3 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
       defaultParams = _ref3.defaultParams;
     var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
-    // 如果缓存数据存在，则不请求
-    if (finalUseRequest !== null && finalUseRequest !== void 0 && finalUseRequest.service && (!Object.keys(cacheData).length || cacheData !== null && cacheData !== void 0 && cacheData.data && !Object.keys(cacheData === null || cacheData === void 0 ? void 0 : cacheData.data).length)) {
+    if (useRequest !== null && useRequest !== void 0 && useRequest.service) {
       run(params);
     }
-  }, [finalUseRequest === null || finalUseRequest === void 0 ? void 0 : finalUseRequest.options]);
+  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options]);
   var enumLists = (0, _react.useMemo)(() => {
     var lists = [];
     if ((0, _lodash.isString)(code)) {
@@ -168,8 +158,8 @@ var ProEnum = props => {
     // 优先使用组件内部自己传入的数据源或者请求得到的数据
     list = (0, _lodash.cloneDeep)(dataList && dataList.length ? dataList : enumLists);
     // 对数据进行一系列的过滤等操作
-    if (!(finalUseRequest !== null && finalUseRequest !== void 0 && finalUseRequest.service) && finalTransformResponse) {
-      list = finalTransformResponse(list);
+    if (!(useRequest !== null && useRequest !== void 0 && useRequest.service) && transformResponse) {
+      list = transformResponse(list);
       if (!Array.isArray(list)) {
         var _locale$ProEnum3;
         console.error((_locale$ProEnum3 = _locale.default.ProEnum) === null || _locale$ProEnum3 === void 0 ? void 0 : _locale$ProEnum3.errorArrayMessage);

package/lib/ProForm/components/combination/Group/index.js

@@ -33,7 +33,9 @@ var _jsxRuntime = require("react/jsx-runtime");
     otherProps = props.otherProps,
     id = props.id,
     isParentView = props.isView,
-    formDisabled = props.disabled;
+    formDisabled = props.disabled,
+    _props$split = props.split,
+    split = _props$split === void 0 ? '/' : _props$split;
   var _ref = otherProps || {},
     desensitizationKey = _ref.desensitizationKey;
   var contextProps = _ProForm.default.useFieldProps() || {};
@@ -44,6 +46,7 @@ var _jsxRuntime = require("react/jsx-runtime");
     index = contextProps.index,
     isView = contextProps.isView;
   var nextOption = _react.default.useRef([]);
+  var nextIsView = isParentView || isView || otherProps.isView;
 
   // 组合onChange
   var handleChange = (value, option, index) => {
@@ -75,12 +78,16 @@ var _jsxRuntime = require("react/jsx-runtime");
     'pro-group-width-auto': columns.some(item => {
       return ['Radio', 'Checkbox', 'Switch'].includes(item.type);
     }),
+    'pro-group-view': nextIsView,
     [`${className}`]: className
   });
+  if (nextIsView && (0, _lodash.isEmpty)(value)) {
+    return (otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewEmpty) || '-';
+  }
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     className: nextClassName,
     id: id,
-    children: space.compact || space !== null && space !== void 0 && space.separator ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_space.default.Compact, {
+    children: (space.compact || space !== null && space !== void 0 && space.separator) && !nextIsView ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_space.default.Compact, {
       children: columns.map((column, index) => {
         column.otherProps = otherProps;
         // 自定义间隔移除对应参数
@@ -90,12 +97,14 @@ var _jsxRuntime = require("react/jsx-runtime");
         }
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(_ComRender.default, (0, _objectSpread2.default)({
           contextProps: contextProps,
-          isView: isParentView || isView
+          isView: nextIsView
         }, column), column.name || index);
       })
     }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_space.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       align: "start"
     }, (0, _lodash.omit)(space, ['separator', 'compact'])), {}, {
+      split: nextIsView ? split : null,
+      size: nextIsView ? 0 : space.size,
       children: columns.map((column, index) => {
         column.otherProps = otherProps;
         if (column !== null && column !== void 0 && column.separator) {
@@ -104,7 +113,7 @@ var _jsxRuntime = require("react/jsx-runtime");
         }
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(_ComRender.default, (0, _objectSpread2.default)({
           contextProps: contextProps,
-          isView: isParentView || isView
+          isView: nextIsView
         }, column), column.name || index);
       })
     }))

package/lib/ProForm/components/combination/Group/propsType.d.ts

@@ -27,6 +27,8 @@ export interface GroupType {
     value?: any[];
     onChange?: (value: any[] | null, options?: any[]) => void;
     otherProps?: any;
+    /** 分隔符 */
+    split?: string | React.ReactNode;
 }
 export type GroupColumnType<Values = any> = {
     component?: React.ReactNode | ReactiveFunction<Values, React.ReactNode>;

package/lib/ProForm/components/combination/Group/style/index.less

@@ -21,6 +21,13 @@
 .pro-group {
   width: unset !important;
   display: flex;
+  &.pro-group-view {
+    .@{ant-prefix}-space {
+      .@{ant-prefix}-space-item {
+        width: auto;
+      }
+    }
+  }
 
   &.pro-group-diy-width, &.pro-group-width-auto {
     .@{ant-prefix}-space .@{ant-prefix}-space-item {

package/lib/ProForm/components/combination/ProNumberRange/index.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/space/style");
-var _space = _interopRequireDefault(require("antd/es/space"));
 require("antd/es/input/style");
 var _input = _interopRequireDefault(require("antd/es/input"));
 require("antd/es/button/style");
@@ -14,6 +12,8 @@ var _button = _interopRequireDefault(require("antd/es/button"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 require("antd/es/input-number/style");
 var _inputNumber = _interopRequireDefault(require("antd/es/input-number"));
+require("antd/es/space/style");
+var _space = _interopRequireDefault(require("antd/es/space"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _ahooks = require("ahooks");
 var _lodash = require("lodash");
@@ -25,7 +25,7 @@ var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _jsxRuntime = require("react/jsx-runtime");
 var formatAmount = _utils.tools.formatAmount;
 var ProNumberRange = props => {
-  var _document$querySelect, _valueProps, _ref2, _ref3, _value$, _valueProps2, _ref4, _ref5, _value$2, _valueProps3, _valueProps4;
+  var _valueProps, _ref2, _ref3, _value$, _valueProps2, _ref4, _ref5, _value$2, _valueProps3, _valueProps4;
   var _props$value = props.value,
     value = _props$value === void 0 ? [] : _props$value,
     _props$onChange = props.onChange,
@@ -41,16 +41,16 @@ var ProNumberRange = props => {
     childProps = props.childProps,
     addonBefore = props.addonBefore,
     addonAfter = props.addonAfter,
-    _props$separator = props.separator,
-    separator = _props$separator === void 0 ? '~' : _props$separator,
     inValueType = props.valueType,
+    _props$split = props.split,
+    split = _props$split === void 0 ? '~' : _props$split,
     id = props.id;
   var _ref = _ProForm.default.useFieldProps() || {},
     isViewCon = _ref.isView,
     viewEmpty = _ref.viewEmpty,
     valueType = _ref.valueType;
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
-  var addonAfterDomWidth = (_document$querySelect = document.querySelector('.ant-input-number-group-addon')) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.clientWidth;
+
   var _useSetState = (0, _ahooks.useSetState)({
       range: value || []
     }),
@@ -107,25 +107,53 @@ var ProNumberRange = props => {
       case 'percentage':
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Container.default, {
           viewEmpty: viewEmpty,
-          children: `${formatAmount(value[0], precision || decimal)} ${separator} ${formatAmount(value[1], precision || decimal)}`
+          children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
+            split: split,
+            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+              children: formatAmount(value[0], precision || decimal)
+            }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+              children: formatAmount(value[1], precision || decimal)
+            })]
+          })
         });
       // 千分比
       case 'permillage':
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Container.default, {
           viewEmpty: viewEmpty,
-          children: `${formatAmount(value[0], precision || decimal)} ${separator} ${formatAmount(value[1], precision || decimal)}`
+          children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
+            split: split,
+            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+              children: formatAmount(value[0], precision || decimal)
+            }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+              children: formatAmount(value[1], precision || decimal)
+            })]
+          })
         });
       // 千分位
       case 'amount':
       case 'thousandth':
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Container.default, {
           viewEmpty: viewEmpty,
-          children: `${formatAmount(value[0], precision || decimal)} ${separator} ${formatAmount(value[1], precision || decimal)}`
+          children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
+            split: split,
+            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+              children: formatAmount(value[0], precision || decimal)
+            }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+              children: formatAmount(value[1], precision || decimal)
+            })]
+          })
         });
       default:
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Container.default, {
           viewEmpty: viewEmpty,
-          children: `${value[0] || '-'} ${separator} ${value[1] || '-'}`
+          children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
+            split: split,
+            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+              children: value[0] || '-'
+            }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+              children: value[1] || '-'
+            })]
+          })
         });
     }
   }
@@ -205,7 +233,7 @@ var ProNumberRange = props => {
           'range-split': true,
           'range-split-disabled': !!disabled
         }),
-        placeholder: "~",
+        placeholder: split,
         disabled: true
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_inputNumber.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
         className: "range-right",

package/lib/ProForm/components/combination/ProNumberRange/propsType.d.ts

@@ -71,9 +71,10 @@ export interface ProNumberRangeType {
      * @default           '-'
      */
     /**
-     * 查看分割符
+     * @description       查看分割符
+     * @default           '-'
      */
-    separator?: React.ReactNode | string;
+    split?: React.ReactNode | string;
     childProps?: any[];
     otherProps?: ProFormOtherType;
     id?: string;

package/lib/ProForm/components/combination/ProNumberRange/style/index.less

@@ -4,7 +4,7 @@
 .pro-number-range {
   display: block;
   .@{ant-prefix}-space-compact {
-    display: block;
+    display: flex;
   }
 
   .range-split {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.13.19-beta.9",
+  "version": "3.13.19",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -8,9 +8,10 @@
   "homepage": "https://procomponents.zhongan.tech",
   "scripts": {
     "analyze": "ANALYZE=1 dumi build",
-    "build": "father build",
+    "build": "father build && mv dist/index.min.css dist/index.esm.css && mv dist/less.min.css dist/less.esm.css",
     "build-es": "father build --format esm",
     "build-lib": "father build --format cjs",
+    "build-dist": "father build --format umd",
     "docs": "dumi build",
     "docs:deploy": "gh-pages -d docs-dist",
     "lint": "npm run lint:js && npm run lint:style && npm run lint:prettier",
@@ -120,6 +121,7 @@
     "husky": "^4.0.7",
     "jest-canvas-mock": "^2.5.2",
     "lint-staged": "^10.0.0",
+    "mini-css-extract-plugin": "^2.9.4",
     "mockjs": "^1.0.0",
     "prettier": "^2.5.0",
     "pretty-quick": "^3.1.3",