@zat-design/sisyphus-react 3.1.5 → 3.2.0-beta.1

package/lib/ProForm/components/combination/FormList/components/ActionButton.js

@@ -14,6 +14,7 @@ var _antd = require("antd");
 var _lodash = require("lodash");
 var _icons = require("@ant-design/icons");
 var _ProIcon = _interopRequireDefault(require("../../../../../ProIcon"));
+var _locale = _interopRequireDefault(require("../../../../../locale"));
 var _excluded = ["label", "onClick", "onHandle", "actionType", "needConfirm", "confirmProps", "title"],
   _excluded2 = ["onClick", "label"];
 var getDefaultActions = function getDefaultActions(mode) {
@@ -22,26 +23,24 @@ var getDefaultActions = function getDefaultActions(mode) {
       onClick: function onClick(record, _ref) {
         var namePath = _ref.namePath,
           index = _ref.index,
-          operation = _ref.operation,
-          form = _ref.form;
+          operation = _ref.operation;
         var add = operation.add;
         add(undefined, index + 1);
       },
       type: 'text',
-      label: '新增',
+      label: "".concat(_locale.default.ProForm.formList_actions[0]),
       icon: (0, _jsxRuntime.jsx)(_icons.PlusSquareOutlined, {})
     },
     delete: {
       onClick: function onClick(record, _ref2) {
         var namePath = _ref2.namePath,
           index = _ref2.index,
-          operation = _ref2.operation,
-          form = _ref2.form;
+          operation = _ref2.operation;
         var remove = operation.remove;
         remove(index);
       },
       type: 'text',
-      label: '删除',
+      label: "".concat(_locale.default.ProForm.formList_actions[1]),
       icon: mode === 'less' ? (0, _jsxRuntime.jsx)(_ProIcon.default, {
         type: "solid-close",
         className: "single-delete"
@@ -53,39 +52,36 @@ var getDefaultActions = function getDefaultActions(mode) {
       onClick: function onClick(record, _ref3) {
         var namePath = _ref3.namePath,
           index = _ref3.index,
-          operation = _ref3.operation,
-          form = _ref3.form;
+          operation = _ref3.operation;
         var add = operation.add;
         add(record, index + 1);
       },
       type: 'text',
-      label: '复制',
+      label: "".concat(_locale.default.ProForm.formList_actions[2]),
       icon: (0, _jsxRuntime.jsx)(_icons.CopyOutlined, {})
     },
     moveUp: {
       onClick: function onClick(record, _ref4) {
         var namePath = _ref4.namePath,
           index = _ref4.index,
-          operation = _ref4.operation,
-          form = _ref4.form;
+          operation = _ref4.operation;
         var move = operation.move;
         move(index, index - 1);
       },
       type: 'text',
-      label: '上移',
+      label: "".concat(_locale.default.ProForm.formList_actions[3]),
       icon: (0, _jsxRuntime.jsx)(_icons.UpSquareOutlined, {})
     },
     moveDown: {
       onClick: function onClick(record, _ref5) {
         var namePath = _ref5.namePath,
           index = _ref5.index,
-          operation = _ref5.operation,
-          form = _ref5.form;
+          operation = _ref5.operation;
         var move = operation.move;
         move(index, index + 1);
       },
       type: 'text',
-      label: '下移',
+      label: "".concat(_locale.default.ProForm.formList_actions[4]),
       icon: (0, _jsxRuntime.jsx)(_icons.DownSquareOutlined, {})
     }
   };
@@ -193,7 +189,7 @@ var ActionButton = function ActionButton(props) {
           return false;
         }
         return _needConfirm ? (0, _jsxRuntime.jsx)(_antd.Popconfirm, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-          title: title !== null && title !== void 0 ? title : '您确定要删除该条数据吗?',
+          title: title !== null && title !== void 0 ? title : "".concat(_locale.default.ProForm.formList_confirmMessage),
           onCancel: function onCancel(e) {
             return e.stopPropagation();
           },
@@ -216,7 +212,7 @@ var ActionButton = function ActionButton(props) {
         }), "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index));
       }
       return needConfirm ? (0, _jsxRuntime.jsx)(_antd.Popconfirm, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-        title: title !== null && title !== void 0 ? title : '您确定要删除该条数据吗?',
+        title: title !== null && title !== void 0 ? title : "".concat(_locale.default.ProForm.formList_confirmMessage),
         onCancel: function onCancel(e) {
           return e.stopPropagation();
         },

package/lib/ProForm/components/combination/FormList/components/ToolbarButton.js

@@ -13,6 +13,7 @@ var _antd = require("antd");
 var _icons = require("@ant-design/icons");
 var _lodash = require("lodash");
 var _react = require("react");
+var _locale = _interopRequireDefault(require("../../../../../locale"));
 var _excluded = ["label", "onClick", "onHandle", "actionType"],
   _excluded2 = ["onClick", "label"];
 var actions = {
@@ -23,7 +24,7 @@ var actions = {
         namePath = _ref.namePath;
       operation.add();
     },
-    label: '新增一行',
+    label: "".concat(_locale.default.ProForm.formList_actions[5]),
     type: 'link',
     icon: (0, _jsxRuntime.jsx)(_icons.PlusOutlined, {})
   }

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

@@ -1,17 +1,18 @@
 .pro-form-list-block-title {
-  height: 14px;
-  margin: 3px 0;
-  padding-left: 7px;
-  font-weight: 600;
-  line-height: 14px;
-  border-left: 4px solid #006aff;
+  height      : 14px;
+  margin      : @zaui-space-size-xs 0;
+  padding-left: @zaui-space-size-sm;
+  font-weight : 600;
+  line-height : 14px;
+  border-left : 4px solid @zaui-brand;
 }
 
 .pro-form-list {
-  display: flex;
+  display       : flex;
   padding-bottom: 0;
 
   &.pro-form-list-last {
+
     .pro-form-list-drag-handle,
     .ant-form-item {
       margin-bottom: 0 !important;
@@ -19,12 +20,12 @@
   }
 
   .single-delete {
-    width: 14px !important;
+    width : 14px !important;
     height: 14px !important;
-    color: #939599;
+    color : @zaui-placeholder;
 
     &:hover {
-      color: #8f8c8c;
+      color: @zaui-aide-text;
     }
   }
 
@@ -35,19 +36,19 @@
   .pro-form-list-action {
     padding-bottom: var(--zaui-height-size-md, 16px);
 
-    & > .ant-space-item:first-child > .ant-btn-link {
-      margin-left: 8px;
+    &>.ant-space-item:first-child>.ant-btn-link {
+      margin-left: @zaui-space-size-sm;
     }
   }
 
   .pro-form-list-drag-handle {
-    display: flex;
-    align-items: center;
-    height: @zaui-height-size-lg;
-    margin-bottom: 22px;
-    padding: 0;
+    display      : flex;
+    align-items  : center;
+    height       : @zaui-height-size-lg;
+    margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
+    padding      : 0;
     padding-right: @zaui-space-size-sm;
-    border: none;
+    border       : none;
   }
 }
 
@@ -62,7 +63,7 @@
 .pro-form-list-toolbar,
 .pro-form-list-action {
   .ant-btn-link {
-    padding: 4px 0;
+    padding: @zaui-space-size-xs 0;
   }
 
   .ant-btn-text:hover {

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

@@ -33,7 +33,7 @@ var Group = function Group(props) {
     var fieldList = [];
     var result = columns.map(function (item) {
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({
-        disabled: props === null || props === void 0 ? void 0 : props.disabled
+        disabled: Boolean(props === null || props === void 0 ? void 0 : props.disabled)
       }, item), {}, {
         noStyle: (space === null || space === void 0 ? void 0 : space.compact) || (space === null || space === void 0 ? void 0 : space.separator),
         parentNames: _parentNames
@@ -47,7 +47,7 @@ var Group = function Group(props) {
       columns: (0, _utils.insertSeparator)(result, space, node, otherProps),
       fieldList: fieldList
     };
-  }, [name, columns, space]);
+  }, [name, columns, space, props]);
   var _className = (0, _classnames2.default)((0, _defineProperty2.default)({
     'pro-group': true,
     'pro-group-diy-width': columns.some(function (item) {

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

@@ -19,8 +19,10 @@ var _antd = require("antd");
 var _utils = require("@zat-design/utils");
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _useEnum = _interopRequireDefault(require("../../../../ProEnum/hooks/useEnum"));
-var _excluded = ["getPopupContainer", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator"];
+var _locale = _interopRequireDefault(require("../../../../locale"));
+var _excluded = ["className", "getPopupContainer", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator"];
 var transformDataName = _utils.tools.transformDataName;
+var Text = _antd.Typography.Text;
 var filterDataSource = function filterDataSource(dataSource, level) {
   return dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
     return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
@@ -46,7 +48,7 @@ var levelMap = {
   3: 'county'
 };
 var ProAddressBar = function ProAddressBar(props) {
-  var _otherProps$otherProp, _ref11, _ref11$filter;
+  var _otherProps$otherProp, _ref11, _ref11$filter, _locale$ProAddressBar, _locale$ProAddressBar2, _locale$ProAddressBar3;
   var _ref = (0, _ProConfigProvider.useProConfig)('ProAddressBar') || {},
     configUseRequest = _ref.useRequest,
     configTransformResponse = _ref.transformResponse,
@@ -55,8 +57,8 @@ var ProAddressBar = function ProAddressBar(props) {
     configFieldNames = _ref.fieldNames,
     configEnumCode = _ref.enumCode,
     configCode = _ref.code;
-  // console.count('地址组件渲染次数');
-  var getPopupContainer = props.getPopupContainer,
+  var className = props.className,
+    getPopupContainer = props.getPopupContainer,
     _props$hasDetail = props.hasDetail,
     hasDetail = _props$hasDetail === void 0 ? true : _props$hasDetail,
     _props$detailMaxLengt = props.detailMaxLength,
@@ -173,7 +175,7 @@ var ProAddressBar = function ProAddressBar(props) {
               transFormData = transformDataName(newData, {
                 label: fieldNames.label,
                 value: fieldNames.value,
-                children: 'children'
+                children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
               });
               setServiceData(realLevel === 2 ? filterDataSource(transFormData, level) : transFormData);
             }
@@ -267,19 +269,19 @@ var ProAddressBar = function ProAddressBar(props) {
   }, [service]);
   (0, _react.useEffect)(function () {
     // 传入useRequest时初始化province展示
-    if (service && !fetched && province) {
+    if (service && loadData && !fetched && province) {
       initAddressLabel('province', province, provinceOptions);
     }
   }, [province, fetched, provinceOptions]);
   (0, _react.useEffect)(function () {
     // 传入useRequest时初始化city展示
-    if (service && !fetched && province && city) {
+    if (service && loadData && !fetched && province && city) {
       initAddressLabel('city', city, (0, _defineProperty2.default)({}, parentKey, province));
     }
   }, [province, city, fetched]);
   (0, _react.useEffect)(function () {
     // 传入useRequest时初始化county展示
-    if (service && !fetched && city && county) {
+    if (service && loadData && !fetched && city && county) {
       initAddressLabel('county', county, (0, _defineProperty2.default)({}, parentKey, city));
     }
   }, [city, county, fetched]);
@@ -289,6 +291,12 @@ var ProAddressBar = function ProAddressBar(props) {
       setDefaultLabel(getAddressLabel(realDataSource, value));
     }
   }, [realIsView, value, realDataSource]);
+  (0, _react.useEffect)(function () {
+    // 传入useRequest但loadData为fasle查看时初始化展示
+    if (realIsView && value && (serviceData === null || serviceData === void 0 ? void 0 : serviceData.length) > 0) {
+      setDefaultLabel(getAddressLabel(serviceData, value));
+    }
+  }, [realIsView, value, serviceData]);
   var handleLoadData = /*#__PURE__*/function () {
     var _ref10 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4(selectedOptions) {
       var targetOption, data;
@@ -322,14 +330,14 @@ var ProAddressBar = function ProAddressBar(props) {
       return _ref10.apply(this, arguments);
     };
   }();
-  var handleChange = function handleChange(changeValue) {
+  var handleChange = function handleChange(changeValue, selectedOptions) {
     if (onChange) {
       if (hasDetail && address) {
         var realValue = changeValue || [];
         realValue[realLevel] = address;
-        onChange(realValue);
+        onChange(realValue, selectedOptions);
       } else {
-        onChange(changeValue);
+        onChange(changeValue, selectedOptions);
       }
     }
   };
@@ -364,56 +372,66 @@ var ProAddressBar = function ProAddressBar(props) {
   var viewValue = ((_ref11 = [provinceLabel, cityLabel, countyLabel, value === null || value === void 0 ? void 0 : value[realLevel]]) === null || _ref11 === void 0 ? void 0 : (_ref11$filter = _ref11.filter(function (item) {
     return !!item;
   })) === null || _ref11$filter === void 0 ? void 0 : _ref11$filter.join(separator)) || '-';
-  return (0, _jsxRuntime.jsx)("div", {
-    className: "pro-address",
-    children: realIsView ? viewValue : (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-      children: [dataSource || addressCode || !loadData ? (0, _jsxRuntime.jsx)(_antd.Cascader, {
-        className: hasDetail ? '' : 'no-detail',
-        placeholder: "\u8BF7\u9009\u62E9",
-        value: addressValue,
-        options: !loadData ? serviceData : realDataSource,
-        disabled: disabled,
-        displayRender: function displayRender(label) {
-          return label === null || label === void 0 ? void 0 : label.filter(function (item) {
-            return !!item;
-          }).join('/');
-        },
-        showSearch: {
-          filter: handlefilter
-        },
-        onChange: handleChange
-      }) : (0, _jsxRuntime.jsx)(_antd.Cascader, {
-        className: hasDetail ? '' : 'no-detail',
-        placeholder: "\u8BF7\u9009\u62E9",
-        value: addressValue,
-        loadData: handleLoadData,
-        // @ts-ignore
-        options: provinces,
-        disabled: disabled,
-        displayRender: displayRender,
-        changeOnSelect: true,
-        // @ts-ignore
-        onChange: handleChange
-      }), hasDetail && (tooltip && disabled && address ? (0, _jsxRuntime.jsx)(_antd.Tooltip, {
-        title: address,
-        children: (0, _jsxRuntime.jsx)("span", {
-          className: "pro-address-detail",
-          children: (0, _jsxRuntime.jsx)(_antd.Input, {
-            disabled: disabled,
-            value: address
-          })
-        })
-      }) : (0, _jsxRuntime.jsx)(_antd.Input, {
-        allowClear: true,
-        autoComplete: "off",
-        disabled: disabled,
-        value: address,
-        maxLength: detailMaxLength,
-        placeholder: "\u8BF7\u8F93\u5165\u8BE6\u7EC6\u5730\u5740",
-        // @ts-ignore
-        onChange: handleAddressChange
-      }))]
+  return realIsView ? tooltip ? (0, _jsxRuntime.jsx)(_antd.Tooltip, {
+    className: className,
+    title: tooltip === true ? viewValue : tooltip,
+    children: (0, _jsxRuntime.jsx)(Text, {
+      ellipsis: {
+        tooltip: false
+      },
+      children: viewValue
     })
+  }) : (0, _jsxRuntime.jsx)("span", {
+    className: className,
+    children: viewValue
+  }) : (0, _jsxRuntime.jsxs)("div", {
+    className: "pro-address ".concat(className),
+    children: [dataSource || addressCode || !loadData ? (0, _jsxRuntime.jsx)(_antd.Cascader, {
+      className: hasDetail ? '' : 'no-detail',
+      placeholder: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProAddressBar = _locale.default.ProAddressBar) === null || _locale$ProAddressBar === void 0 ? void 0 : _locale$ProAddressBar.placeholder,
+      value: addressValue,
+      options: !loadData ? serviceData : realDataSource,
+      disabled: disabled,
+      displayRender: function displayRender(label) {
+        return label === null || label === void 0 ? void 0 : label.filter(function (item) {
+          return !!item;
+        }).join('/');
+      },
+      showSearch: {
+        filter: handlefilter
+      },
+      onChange: handleChange
+    }) : (0, _jsxRuntime.jsx)(_antd.Cascader, {
+      className: hasDetail ? '' : 'no-detail',
+      placeholder: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProAddressBar2 = _locale.default.ProAddressBar) === null || _locale$ProAddressBar2 === void 0 ? void 0 : _locale$ProAddressBar2.placeholder,
+      value: addressValue,
+      loadData: handleLoadData,
+      // @ts-ignore
+      options: provinces,
+      disabled: disabled,
+      displayRender: displayRender,
+      changeOnSelect: true,
+      // @ts-ignore
+      onChange: handleChange
+    }), hasDetail && (tooltip && disabled && address ? (0, _jsxRuntime.jsx)(_antd.Tooltip, {
+      title: address,
+      children: (0, _jsxRuntime.jsx)("span", {
+        className: "pro-address-detail",
+        children: (0, _jsxRuntime.jsx)(_antd.Input, {
+          disabled: disabled,
+          value: address
+        })
+      })
+    }) : (0, _jsxRuntime.jsx)(_antd.Input, {
+      allowClear: true,
+      autoComplete: "off",
+      disabled: disabled,
+      value: address,
+      maxLength: detailMaxLength,
+      placeholder: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProAddressBar3 = _locale.default.ProAddressBar) === null || _locale$ProAddressBar3 === void 0 ? void 0 : _locale$ProAddressBar3.detailPlaceholder,
+      // @ts-ignore
+      onChange: handleAddressChange
+    }))]
   });
 };
 // @ts-ignore

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

@@ -3,11 +3,12 @@ import { DefaultOptionType } from 'rc-select/lib/Select';
 import { Service } from 'ahooks/lib/useRequest/src/types';
 export interface AddressProps {
     getPopupContainer?: () => ReactNode;
+    className?: string;
     isView?: boolean;
     value?: string[];
     disabled?: boolean;
     hasDetail?: boolean;
-    tooltip?: boolean;
+    tooltip?: boolean | ReactNode;
     detailMaxLength?: number;
     fieldNames?: {
         label: string;
@@ -20,7 +21,7 @@ export interface AddressProps {
         defaultParams?: any;
         parentKey?: string;
     };
-    onChange?: (value: string[]) => void;
+    onChange?: (value: string[], selectedOptions?: any[]) => void;
     transformResponse?: (data: any[]) => any[];
     level?: number;
     enumCode?: string;

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

@@ -23,7 +23,8 @@ var _index = require("../../../../index");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _view = _interopRequireDefault(require("../../../../assets/view.svg"));
 var _useRequestList2 = _interopRequireDefault(require("./hooks/useRequestList"));
-var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "isTooltip", "otherProps", "searchForm"],
+var _locale = _interopRequireDefault(require("../../../../locale"));
+var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "isTooltip", "otherProps", "searchForm", "defaultOne"],
   _excluded2 = ["onOk"],
   _excluded3 = ["rowKey", "columns", "rowSelection"];
 var ProModalSelect = function ProModalSelect(props, ref) {
@@ -49,6 +50,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     isTooltip = props.isTooltip,
     otherProps = props.otherProps,
     searchForm = props.searchForm,
+    defaultOne = props.defaultOne,
     restInputProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var contentForm = _antd.Form.useFormInstance();
   if (!configOption || Object.prototype.toString.call(configOption) !== '[object Object]') {
@@ -126,7 +128,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       transformResponse: transformResponse
     }, (0, _objectSpread2.default)({
       manual: true,
-      ready: (useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) || visible
+      ready: (useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) || visible || defaultOne
     }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options)),
     data = _useRequestList.data,
     loading = _useRequestList.loading,
@@ -289,7 +291,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               _context2.next = 4;
               break;
             }
-            _antd.message.error('请先勾选');
+            _antd.message.error(_locale.default.ProModalSelect.checkMsg);
             return _context2.abrupt("return", false);
           case 4:
             _data = isMultiple ? selectedRows : selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows[0];
@@ -411,14 +413,14 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   // 初始化回显，当传入initParams时，前端用来回险
   var getInitValues = /*#__PURE__*/function () {
     var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4() {
-      var _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _list, list, _res$data, _data2, nextSelectRowKeys;
+      var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _list, list, _res$data, _data2, nextSelectRowKeys;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
             if (typeof (useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) === 'function') {
-              useRequest.initParams = useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams(value, contentForm.getFieldsValue());
+              useRequest.initParams = useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams(value, contentForm === null || contentForm === void 0 ? void 0 : (_contentForm$getField = contentForm.getFieldsValue) === null || _contentForm$getField === void 0 ? void 0 : _contentForm$getField.call(contentForm));
             }
-            if (!(useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams)) {
+            if (!((useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) || defaultOne)) {
               _context4.next = 13;
               break;
             }
@@ -432,7 +434,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
             });
             return _context4.abrupt("return");
           case 5:
-            queryBean = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.defaultParams), useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams);
+            queryBean = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.defaultParams), (useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) || {});
             page = (0, _objectSpread2.default)({
               pageNum: 1,
               pageSize: 10
@@ -475,6 +477,61 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       return _ref9.apply(this, arguments);
     };
   }();
+  // 初始化回显，当传入initParams时，前端用来回险
+  var getDefaultOneValues = /*#__PURE__*/function () {
+    var _ref10 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee5() {
+      var _useRequest$options4, _useRequest$options5;
+      var queryBean, page, params, res, _list2, list, _res$data2, _data3, nextSelectRowKeys;
+      return (0, _regeneratorRuntime2.default)().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
+          case 0:
+            queryBean = (0, _objectSpread2.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options4 = useRequest.options) === null || _useRequest$options4 === void 0 ? void 0 : _useRequest$options4.defaultParams);
+            page = (0, _objectSpread2.default)({
+              pageNum: 1,
+              pageSize: 10
+            }, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options5 = useRequest.options) === null || _useRequest$options5 === void 0 ? void 0 : _useRequest$options5.page);
+            params = withPagination ? (0, _objectSpread2.default)((0, _objectSpread2.default)({}, page), {}, {
+              queryBean: queryBean !== null && queryBean !== void 0 ? queryBean : {}
+            }) : queryBean;
+            params = transformParams ? transformParams(params) : params;
+            _context5.next = 6;
+            return runAsync(params);
+          case 6:
+            res = _context5.sent;
+            if (res === null || res === void 0 ? void 0 : res.data) {
+              list = [];
+              if (transformResponse) {
+                list = transformResponse(res === null || res === void 0 ? void 0 : res.data);
+              } else {
+                list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.list : res === null || res === void 0 ? void 0 : res.data;
+              }
+              _data3 = isMultiple ? list : (_list2 = list) === null || _list2 === void 0 ? void 0 : _list2[0];
+              nextSelectRowKeys = isMultiple ? value : [value];
+              if (labelInValue) {
+                onChange(_data3);
+              } else {
+                onChange(isMultiple ? _data3.map(function (item) {
+                  return item[valueKey];
+                }) : _data3[valueKey]);
+              }
+              // 更新内部展示值
+              setState({
+                _value: _data3,
+                isInit: false,
+                selectedRows: list,
+                selectedRowKeys: nextSelectRowKeys
+              });
+            }
+          case 8:
+          case "end":
+            return _context5.stop();
+        }
+      }, _callee5);
+    }));
+    return function getDefaultOneValues() {
+      return _ref10.apply(this, arguments);
+    };
+  }();
   (0, _react.useImperativeHandle)(ref, function () {
     return {
       handleClick: handleClick,
@@ -506,8 +563,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   });
   (0, _react.useEffect)(function () {
     if (onOff && !visible) {
-      var _useRequest$options4;
-      if ((useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options4 = useRequest.options) === null || _useRequest$options4 === void 0 ? void 0 : _useRequest$options4.manual) !== true) {
+      var _useRequest$options6;
+      if ((useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options6 = useRequest.options) === null || _useRequest$options6 === void 0 ? void 0 : _useRequest$options6.manual) !== true) {
         onReset();
       }
       var nextState = {
@@ -539,11 +596,15 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   }, [value, visible, isInit]);
   (0, _react.useEffect)(function () {
     if (!value) {
-      setState({
-        _value: undefined,
-        selectedRowKeys: [],
-        selectedRows: []
-      });
+      if (defaultOne) {
+        getDefaultOneValues();
+      } else {
+        setState({
+          _value: undefined,
+          selectedRowKeys: [],
+          selectedRows: []
+        });
+      }
     }
     if (labelInValue && _value && !(0, _lodash.isEqual)(value, _value)) {
       setState({
@@ -594,7 +655,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       onChange: handleChangeValue,
       disabled: disabled,
       addonAfter: forceAddonAfterRender(),
-      placeholder: "\u8BF7\u9009\u62E9",
+      placeholder: _locale.default.ProModalSelect.select,
       autoComplete: "off"
     }, restInputProps)), (0, _jsxRuntime.jsx)(_antd.Input, {
       type: "hidden",

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

@@ -37,6 +37,7 @@ interface ProModalPropsType {
     viewEmpty?: React.ReactNode;
     otherProps?: ProFormOtherProps;
     labelInValue?: boolean;
+    defaultOne?: boolean;
     beforeOpen?: any;
     isTooltip?: any;
     showCodeName?: boolean;

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

@@ -22,7 +22,7 @@
 
       > span {
         position: relative;
-        font-size: var(--zaui-font-size-sm, 12px );
+        font-size: var(--zaui-font-size, 14px);
         border: none;
         border-radius: 50%;
       }
@@ -57,7 +57,7 @@
     &:hover {
       .ant-input,
       .ant-input-group-addon {
-        border-color: #d9d9d9;
+        border-color: @zaui-form-control-line;
       }
     }
   }
@@ -73,7 +73,7 @@
   }
 
   .ant-input-group-addon {
-    padding: 0px var(--zaui-space-size-md, 8px);
+    padding: 0px var(--zaui-space-size-sm, 8px);
     background-color: var(--zaui-base-bg, #ffffff);
     cursor: pointer;