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

package/lib/ProEditTable/utils/tools.d.ts

@@ -14,3 +14,15 @@ export declare const onDelete: ({ name, form, virtualKey, selectedRowKeys }: {
     virtualKey: any;
     selectedRowKeys: any;
 }) => void;
+/** 获取最终的disabled, 两张模式【子级优先，全局优先】
+ * 全局优先：globalControl为true时，全局控制
+ * 子级优先：globalControl为false时，子级控制
+ * @param globalControl 全局控制
+ * @param formDisabled 表单的disabled
+ * @param column 当前列
+ * @param tabledDisabled 表格的disabled
+ * @param columnFieldProps 当前列的fieldProps
+ * @param params 当前列的参数
+ * @param rowDisabled 行禁用参数
+ */
+export declare const getDisabled: ({ globalControl, formDisabled, column, tabledDisabled, columnFieldProps, params, rowDisabled }: any) => any;

package/lib/ProEditTable/utils/tools.js

@@ -1,9 +1,11 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.splitNames = exports.onDelete = exports.getRandom = exports.getNamePath = exports.difference = exports.customValidate = void 0;
+exports.splitNames = exports.onDelete = exports.getRandom = exports.getNamePath = exports.getDisabled = exports.difference = exports.customValidate = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _lodash = require("lodash");
 var getRandom = exports.getRandom = function getRandom() {
   return Math.random().toString(36).slice(-6);
@@ -12,7 +14,8 @@ var getRandom = exports.getRandom = function getRandom() {
 var difference = exports.difference = function difference(object, base) {
   var changes = function changes(object, base) {
     return (0, _lodash.transform)(object, function (result, value, key) {
-      if (key.indexOf('-') > -1) {
+      var _key$indexOf;
+      if ((key === null || key === void 0 ? void 0 : (_key$indexOf = key.indexOf) === null || _key$indexOf === void 0 ? void 0 : _key$indexOf.call(key, '-')) > -1) {
         result[key] = true;
       } else if (!(0, _lodash.isEqual)(value, base[key])) {
         result[key] = (0, _lodash.isObject)(value) && (0, _lodash.isObject)(base[key]) ? changes(value, base[key]) : value;
@@ -80,4 +83,79 @@ var onDelete = exports.onDelete = function onDelete(_ref) {
       form.setFieldValue(namePath, virtualList);
     }
   }
+};
+/** 获取最终的disabled, 两张模式【子级优先，全局优先】
+ * 全局优先：globalControl为true时，全局控制
+ * 子级优先：globalControl为false时，子级控制
+ * @param globalControl 全局控制
+ * @param formDisabled 表单的disabled
+ * @param column 当前列
+ * @param tabledDisabled 表格的disabled
+ * @param columnFieldProps 当前列的fieldProps
+ * @param params 当前列的参数
+ * @param rowDisabled 行禁用参数
+ */
+var getDisabled = exports.getDisabled = function getDisabled(_ref2) {
+  var globalControl = _ref2.globalControl,
+    formDisabled = _ref2.formDisabled,
+    column = _ref2.column,
+    tabledDisabled = _ref2.tabledDisabled,
+    columnFieldProps = _ref2.columnFieldProps,
+    params = _ref2.params,
+    rowDisabled = _ref2.rowDisabled;
+  var convertToBoolean = function convertToBoolean(value) {
+    if (Array.isArray(value)) {
+      return value;
+    }
+    if (value === null || value === undefined || value === '') {
+      return false;
+    }
+    if (value === 0) {
+      return true;
+    }
+    return Boolean(value);
+  };
+  // 判断是否有column的disabled属性
+  var noColumnDisabled = function noColumnDisabled() {
+    if ((0, _lodash.isFunction)(column === null || column === void 0 ? void 0 : column.disabled) || (0, _lodash.isFunction)(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled) || (0, _lodash.isBoolean)(column === null || column === void 0 ? void 0 : column.disabled) || (0, _lodash.isBoolean)(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled)) {
+      return false;
+    }
+    // 判断FieldProps是否有disabled属性
+    if ((0, _lodash.isFunction)(columnFieldProps)) {
+      var _columnFieldProps = columnFieldProps.apply(void 0, (0, _toConsumableArray2.default)(params)),
+        disabled = _columnFieldProps.disabled;
+      if ((0, _lodash.isFunction)(disabled) || (0, _lodash.isBoolean)(disabled)) {
+        return false;
+      }
+    }
+    return true;
+  };
+  if (globalControl) {
+    return convertToBoolean(formDisabled) || convertToBoolean(tabledDisabled);
+  }
+  if (rowDisabled === 'empty') {
+    return false;
+  }
+  // 当表单含有diabled属性时，优先使用表单的disabled
+  if ((0, _lodash.isFunction)(rowDisabled) && noColumnDisabled()) {
+    return rowDisabled(params[1]);
+  }
+  if ((0, _lodash.isFunction)(column === null || column === void 0 ? void 0 : column.disabled)) {
+    return convertToBoolean(column === null || column === void 0 ? void 0 : column.disabled.apply(column, (0, _toConsumableArray2.default)(params)));
+  }
+  // 表单FieldProps为函数时
+  if ((0, _lodash.isFunction)(columnFieldProps)) {
+    var _columnFieldProps2 = columnFieldProps.apply(void 0, (0, _toConsumableArray2.default)(params)),
+      disabled = _columnFieldProps2.disabled;
+    if ((0, _lodash.isFunction)(disabled)) {
+      return convertToBoolean(disabled.apply(void 0, (0, _toConsumableArray2.default)(params)));
+    }
+    if ((0, _lodash.isBoolean)(disabled)) {
+      return convertToBoolean(disabled);
+    }
+  }
+  if ((0, _lodash.isFunction)(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled)) {
+    return convertToBoolean(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled.apply(columnFieldProps, (0, _toConsumableArray2.default)(params)));
+  }
+  return convertToBoolean(column === null || column === void 0 ? void 0 : column.disabled) || convertToBoolean(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled) || convertToBoolean(tabledDisabled);
 };

package/lib/ProForm/components/base/RangePicker/index.js

@@ -29,9 +29,16 @@ var RangePicker = function RangePicker(props) {
     viewEmpty = _ref.viewEmpty,
     valueType = _ref.valueType;
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
+  var _res = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
+    showTime: !rest.showTime && valueType === 'dateTime' || rest.showTime
+  });
+  // 字符串时间格式兼容
+  if (Array.isArray(_res.value) && (0, _lodash.isString)(_res.value[0]) && (0, _lodash.isString)(_res.value[1])) {
+    _res.value = [(0, _moment.default)(_res.value[0]), (0, _moment.default)(_res.value[1])];
+  }
   if (isView) {
-    var _props$value = props.value,
-      value = _props$value === void 0 ? [] : _props$value;
+    var _res$value = _res.value,
+      value = _res$value === void 0 ? [] : _res$value;
     var viewChildren = null;
     if (!value || !value[0] || !value[1]) {
       viewChildren = null;
@@ -53,13 +60,6 @@ var RangePicker = function RangePicker(props) {
       children: viewChildren
     });
   }
-  var _res = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
-    showTime: !rest.showTime && valueType === 'dateTime' || rest.showTime
-  });
-  // 字符串时间格式兼容
-  if (Array.isArray(_res.value) && (0, _lodash.isString)(_res.value[0]) && (0, _lodash.isString)(_res.value[1])) {
-    _res.value = [(0, _moment.default)(_res.value[0]), (0, _moment.default)(_res.value[1])];
-  }
   return (0, _jsxRuntime.jsx)(AntRangePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, initialConfig), (0, _lodash.omit)(_res, ['separator'])));
 };
 var _default = exports.default = RangePicker;

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

@@ -28,10 +28,11 @@ var Container = function Container(props) {
     disabled = _ref.disabled;
   var _className = (0, _classnames2.default)((0, _defineProperty2.default)({
     'pro-container': true,
-    'pro-container-diy': type === 'Container'
+    'pro-container-diy': type === 'Container',
+    'pro-container-empty': !(children === null || children === void 0 ? void 0 : children.length)
   }, "".concat(className), className));
   var _children = (0, _react.useMemo)(function () {
-    var result = children.map(function (item) {
+    var result = children === null || children === void 0 ? void 0 : children.map(function (item) {
       return (0, _objectSpread2.default)({
         clearNotShow: clearNotShow,
         show: show,

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

@@ -2,7 +2,11 @@
 @import (reference) '~antd/es/style/themes/index.less';
 
 .pro-container {
-
+  &.pro-container-empty{
+    .@{ant-prefix}-collapse-content{
+      display: none;
+    }
+  }
   &.pro-container-diy {
     .pro-container-content {
       display      : flex;

package/lib/ProForm/components/combination/{ProAddressBar → ProCascader}/index.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
-import { AddressProps } from './propsType';
-declare const _default: import("react").MemoExoticComponent<(props: AddressProps) => JSX.Element>;
+import { ProCascaderProps } from './propsType';
+declare const _default: import("react").MemoExoticComponent<(props: ProCascaderProps) => JSX.Element>;
 export default _default;

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

@@ -0,0 +1,256 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+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 _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _jsxRuntime = require("react/jsx-runtime");
+var _react = require("react");
+var _antd = require("antd");
+var _lodash = require("lodash");
+var _index = require("./utils/index");
+var _ProConfigProvider = require("../../../../ProConfigProvider");
+var _useEnum = _interopRequireDefault(require("../../../../ProEnum/hooks/useEnum"));
+var _locale = _interopRequireDefault(require("../../../../locale"));
+var _ = _interopRequireDefault(require("../../.."));
+var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator"];
+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), {}, {
+      children: level === 1 ? [] : filterDataSource(item === null || item === void 0 ? void 0 : item.children, level - 1)
+    });
+  });
+};
+var getViewLabel = function getViewLabel(_ref) {
+  var dataSource = _ref.dataSource,
+    value = _ref.value;
+  var viewLabel = [];
+  // 根据dataSource得到label数组，查看模式展示需要
+  value === null || value === void 0 ? void 0 : value.forEach(function (value, index) {
+    var _dataSource;
+    var temp = (_dataSource = dataSource) === null || _dataSource === void 0 ? void 0 : _dataSource.find(function (item) {
+      return (item === null || item === void 0 ? void 0 : item.value) === value;
+    });
+    dataSource = (temp === null || temp === void 0 ? void 0 : temp.children) || [];
+    viewLabel[index] = temp === null || temp === void 0 ? void 0 : temp.label;
+  });
+  return viewLabel;
+};
+var defaultFieldNames = {
+  label: 'name',
+  value: 'code',
+  children: 'children'
+};
+var ProCascader = function ProCascader(props) {
+  var _value$slice, _ref7, _ref7$filter, _defaultLabel$filter, _locale$ProAddressBar, _locale$ProAddressBar2;
+  var _ref2 = (0, _ProConfigProvider.useProConfig)('ProAddressBar') || {},
+    configDetailMaxLength = _ref2.detailMaxLength,
+    configEnumCode = _ref2.enumCode,
+    configCode = _ref2.code;
+  var isAddressMode = (props === null || props === void 0 ? void 0 : props.mode) === 'address';
+  var _props$className = props.className,
+    className = _props$className === void 0 ? '' : _props$className,
+    _props$hasDetail = props.hasDetail,
+    hasDetail = _props$hasDetail === void 0 ? isAddressMode ? true : undefined : _props$hasDetail,
+    _props$detailMaxLengt = props.detailMaxLength,
+    detailMaxLength = _props$detailMaxLengt === void 0 ? isAddressMode ? configDetailMaxLength || 100 : 100 : _props$detailMaxLengt,
+    _props$fieldNames = props.fieldNames,
+    fieldNames = _props$fieldNames === void 0 ? defaultFieldNames : _props$fieldNames,
+    value = props.value,
+    disabled = props.disabled,
+    dataSource = props.dataSource,
+    onChange = props.onChange,
+    useRequest = props.useRequest,
+    transformResponse = props.transformResponse,
+    _props$level = props.level,
+    level = _props$level === void 0 ? isAddressMode ? 3 : undefined : _props$level,
+    isView = props.isView,
+    _props$enumCode = props.enumCode,
+    enumCode = _props$enumCode === void 0 ? configEnumCode : _props$enumCode,
+    _props$code = props.code,
+    code = _props$code === void 0 ? configCode : _props$code,
+    tooltip = props.tooltip,
+    _props$separator = props.separator,
+    separator = _props$separator === void 0 ? '' : _props$separator,
+    otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
+  var _ref3 = _.default.useFieldProps() || {},
+    isViewCon = _ref3.isView;
+  var addressCode = code || enumCode;
+  var realIsView = typeof isView === 'boolean' ? isView : isViewCon;
+  var realLevel = Math.max(2, level);
+  var detail = value === null || value === void 0 ? void 0 : value[realLevel];
+  var enumData = (0, _useEnum.default)(addressCode);
+  var _ref4 = Array.isArray(enumData) ? enumData : [],
+    _ref5 = (0, _slicedToArray2.default)(_ref4, 1),
+    _ref5$ = _ref5[0],
+    enumDataSource = _ref5$ === void 0 ? [] : _ref5$;
+  var realDataSource = (0, _react.useMemo)(function () {
+    var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
+    var result = isAddressMode && realLevel === 2 ? filterDataSource(innerDataSource, level) : innerDataSource;
+    return (0, _lodash.isEqual)(fieldNames, defaultFieldNames) ? result : (0, _index.transformDataName)(result, fieldNames);
+  }, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
+  var _useRequest = (0, _objectSpread2.default)({}, useRequest),
+    service = _useRequest.service,
+    _useRequest$defaultPa = _useRequest.defaultParams,
+    defaultParams = _useRequest$defaultPa === void 0 ? {} : _useRequest$defaultPa;
+  var _useState = (0, _react.useState)([]),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    serviceData = _useState2[0],
+    setServiceData = _useState2[1];
+  var _useState3 = (0, _react.useState)([]),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    defaultLabel = _useState4[0],
+    setDefaultLabel = _useState4[1];
+  var getFirstLevelOptions = /*#__PURE__*/function () {
+    var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+      var _yield$service, data, newData, transFormData, serviceData;
+      return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return service(defaultParams);
+          case 2:
+            _yield$service = _context.sent;
+            data = _yield$service.data;
+            newData = data;
+            if (transformResponse) {
+              newData = transformResponse(data);
+            }
+            transFormData = (0, _index.transformDataName)(newData, {
+              label: fieldNames.label,
+              value: fieldNames.value,
+              children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
+            });
+            serviceData = isAddressMode && realLevel === 2 ? filterDataSource(transFormData, level) : transFormData;
+            setServiceData(serviceData);
+          case 9:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function getFirstLevelOptions() {
+      return _ref6.apply(this, arguments);
+    };
+  }();
+  (0, _react.useEffect)(function () {
+    if (service) {
+      // 传入useRequest时，初次加载级联第一级数据源
+      getFirstLevelOptions();
+    }
+  }, [service]);
+  (0, _react.useEffect)(function () {
+    if (realIsView && value) {
+      // 传入dataSource + 查看时初始化展示
+      if (service) {
+        setDefaultLabel(getViewLabel({
+          dataSource: serviceData,
+          value: isAddressMode && hasDetail ? value === null || value === void 0 ? void 0 : value.slice(0, realLevel) : value
+        }));
+      } else if ((realDataSource === null || realDataSource === void 0 ? void 0 : realDataSource.length) > 0) {
+        setDefaultLabel(getViewLabel({
+          dataSource: realDataSource,
+          value: isAddressMode && hasDetail ? value === null || value === void 0 ? void 0 : value.slice(0, realLevel) : value
+        }));
+      }
+    }
+  }, [realIsView, value, realDataSource, serviceData]);
+  var handleChange = function handleChange(changeValue, selectedOptions) {
+    if (onChange) {
+      if (isAddressMode && hasDetail && detail) {
+        // 有详情地址
+        var realValue = changeValue || [];
+        realValue[realLevel] = detail;
+        onChange(realValue, selectedOptions);
+      } else {
+        onChange(changeValue, selectedOptions);
+      }
+    }
+  };
+  // showSearch中的筛选函数
+  var handlefilter = function handlefilter(inputValue, path) {
+    return path.some(function (option) {
+      return option.label.toLowerCase().indexOf(inputValue.toLowerCase()) > -1;
+    });
+  };
+  var handleAddressChange = function handleAddressChange(e) {
+    var cascaderValue = value === null || value === void 0 ? void 0 : value.slice(0, realLevel);
+    if (onChange) {
+      if (!e.target.value && (cascaderValue === null || cascaderValue === void 0 ? void 0 : cascaderValue.every(function (item) {
+        return !item;
+      }))) {
+        onChange(undefined);
+      } else {
+        var realValue = value ? (0, _toConsumableArray2.default)(value) : [];
+        realValue[realLevel] = e.target.value;
+        onChange(realValue);
+      }
+    }
+  };
+  var displayRender = function displayRender(label) {
+    return label === null || label === void 0 ? void 0 : label.filter(function (item) {
+      return !!item;
+    }).join('/');
+  };
+  var addressValue = isAddressMode ? value && ((_value$slice = value.slice(0, realLevel)) === null || _value$slice === void 0 ? void 0 : _value$slice.some(function (item) {
+    return !!item;
+  })) ? value.slice(0, realLevel) : undefined : value;
+  var viewValue = isAddressMode ? ((_ref7 = [].concat((0, _toConsumableArray2.default)(defaultLabel), [value === null || value === void 0 ? void 0 : value[realLevel]])) === null || _ref7 === void 0 ? void 0 : (_ref7$filter = _ref7.filter(function (item) {
+    return !!item;
+  })) === null || _ref7$filter === void 0 ? void 0 : _ref7$filter.join(separator)) || '-' : (defaultLabel === null || defaultLabel === void 0 ? void 0 : (_defaultLabel$filter = defaultLabel.filter(function (item) {
+    return !!item;
+  })) === null || _defaultLabel$filter === void 0 ? void 0 : _defaultLabel$filter.join(separator)) || '-';
+  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: [(0, _jsxRuntime.jsx)(_antd.Cascader, (0, _objectSpread2.default)({
+      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: service ? serviceData : realDataSource,
+      disabled: disabled,
+      displayRender: displayRender,
+      showSearch: {
+        filter: handlefilter
+      },
+      onChange: handleChange
+    }, (0, _lodash.omit)(otherProps, 'otherProps'))), hasDetail && (tooltip && disabled && detail ? (0, _jsxRuntime.jsx)(_antd.Tooltip, {
+      title: detail,
+      children: (0, _jsxRuntime.jsx)("span", {
+        className: "pro-address-detail",
+        children: (0, _jsxRuntime.jsx)(_antd.Input, {
+          disabled: disabled,
+          value: detail
+        })
+      })
+    }) : (0, _jsxRuntime.jsx)(_antd.Input, {
+      allowClear: true,
+      autoComplete: "off",
+      disabled: disabled,
+      value: detail,
+      maxLength: detailMaxLength,
+      placeholder: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProAddressBar2 = _locale.default.ProAddressBar) === null || _locale$ProAddressBar2 === void 0 ? void 0 : _locale$ProAddressBar2.detailPlaceholder,
+      onChange: handleAddressChange
+    }))]
+  });
+};
+var _default = exports.default = /*#__PURE__*/(0, _react.memo)(ProCascader);

package/lib/ProForm/components/combination/{ProAddressBar → ProCascader}/propsType.d.ts

@@ -1,19 +1,22 @@
 import { ReactNode } from 'react';
 import { DefaultOptionType } from 'rc-select/lib/Select';
 import { Service } from 'ahooks/lib/useRequest/src/types';
-export interface AddressProps {
-    getPopupContainer?: () => ReactNode;
+export interface fieldNamesProps {
+    label: string;
+    value: string;
+    children?: string;
+    [key: string]: string;
+}
+export interface ProCascaderProps {
     className?: string;
+    mode?: 'address' | 'default';
     isView?: boolean;
     value?: string[];
     disabled?: boolean;
     hasDetail?: boolean;
     tooltip?: boolean | ReactNode;
     detailMaxLength?: number;
-    fieldNames?: {
-        label: string;
-        value: string;
-    };
+    fieldNames?: fieldNamesProps;
     dataSource?: DefaultOptionType[];
     useRequest?: {
         loadData?: boolean;

package/lib/ProForm/components/combination/ProCascader/utils/index.d.ts

@@ -0,0 +1,14 @@
+interface DataNode {
+    label: string;
+    value: string;
+    children?: DataNode[];
+    [key: string]: any;
+}
+interface FieldNames {
+    label: string;
+    value: string;
+    children?: string;
+    [key: string]: string;
+}
+export declare const transformDataName: (dataSource: any[], fieldNames: FieldNames) => DataNode[];
+export {};

package/lib/ProForm/components/combination/ProCascader/utils/index.js

@@ -0,0 +1,33 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.transformDataName = void 0;
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _excluded = ["label", "value", "children"];
+var transformDataName = exports.transformDataName = function transformDataName(dataSource, fieldNames) {
+  var label = fieldNames.label,
+    value = fieldNames.value,
+    children = fieldNames.children,
+    extraFields = (0, _objectWithoutProperties2.default)(fieldNames, _excluded);
+  function transformNode(node) {
+    var newNode = {
+      label: node[label],
+      value: node[value]
+    };
+    // 处理额外的字段
+    Object.keys(extraFields).forEach(function (key) {
+      newNode[key] = node[extraFields[key]];
+    });
+    if (children && Array.isArray(node[children])) {
+      newNode.children = node[children].map(transformNode);
+    }
+    return newNode;
+  }
+  function transformData(data) {
+    return data.map(transformNode);
+  }
+  return transformData(dataSource);
+};

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

@@ -338,7 +338,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           case 16:
             _context2.prev = 16;
             _context2.t0 = _context2["catch"](0);
-            console.log('error', _context2.t0);
+            console.warn('error', _context2.t0);
           case 19:
           case "end":
             return _context2.stop();
@@ -593,6 +593,9 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           });
           nextState.selectedRows = value;
         }
+      } else if (value) {
+        nextState.selectedRowKeys = [value];
+        nextState.selectedRows = [(0, _defineProperty2.default)({}, valueKey, value[valueKey])];
       }
       setState(nextState);
     }
@@ -667,9 +670,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       labelInValue: labelInValue,
       dataSource: options,
       scrollFollowParent: false,
-      onClick: function onClick() {
-        // 没有值的时候，初始化点击默认查询前五十条
-        if (!value && isInit || !(options === null || options === void 0 ? void 0 : options.length)) {
+      onFocus: function onFocus() {
+        if (useRequest) {
           var _useRequest$options9;
           var queryBean = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options9 = useRequest.options) === null || _useRequest$options9 === void 0 ? void 0 : _useRequest$options9.defaultParams) || {};
           var params = withPagination ? {
@@ -752,6 +754,11 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       };
     }
   }, [value, isTooltip]);
+  (0, _ahooks.useDeepCompareEffect)(function () {
+    setState({
+      options: tableProps === null || tableProps === void 0 ? void 0 : tableProps.dataSource
+    });
+  }, [tableProps === null || tableProps === void 0 ? void 0 : tableProps.dataSource]);
   // 当搜索条件只有一个时，且为输入框，默认设置suffix
   if ((formColumns === null || formColumns === void 0 ? void 0 : formColumns.length) === 1 && (formColumns === null || formColumns === void 0 ? void 0 : (_formColumns$ = formColumns[0]) === null || _formColumns$ === void 0 ? void 0 : _formColumns$.type) === 'Input') {
     var _formColumns$2, _formColumns$3, _formColumns$3$fieldP;
@@ -797,6 +804,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         form: form,
         columns: formColumns,
         onFinish: handleSearch,
+        confirmLoading: loading,
         footer: (formColumns === null || formColumns === void 0 ? void 0 : formColumns.length) > 1
       }), (0, _jsxRuntime.jsx)(_index.ProTable, (0, _objectSpread3.default)({
         onRow: function onRow(record) {

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

@@ -53,6 +53,20 @@
     }
   }
 
+  // 新加适用于 readonly false
+  .@{ant-prefix}-input-affix-wrapper {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+    &.ant-input-affix-wrapper-status-error{
+       & + .@{ant-prefix}-btn{
+        border: 1px solid var(--ant-error-color);
+        >.viewSvg{
+          color: var(--ant-error-color);
+        }
+      }
+    }
+  }
+
   .pro-tree-modal-input-appoint {
     .@{ant-prefix}-input {
       border-top-left-radius: 0;
@@ -93,6 +107,15 @@
     fill: #c5c7cd;
   }
 
+  .@{ant-prefix}-select-status-error {
+    & + .@{ant-prefix}-btn{
+      border: 1px solid var(--ant-error-color);
+      >.viewSvg{
+        color: var(--ant-error-color);
+      }
+    }
+  }
+
   .@{ant-prefix}-input-group-addon {
     padding: 0px var(--zaui-space-size-sm, 8px);
     background-color: var(--zaui-base-bg, #ffffff);

package/lib/ProForm/components/combination/ProRangeLimit/index.d.ts

@@ -12,8 +12,8 @@ export type Props = Omit<RangePickerProps, 'value' | 'onChange' | 'format' | 'se
     separator?: any;
     isView?: boolean;
 };
-type Value = [Moment?, Moment?, boolean?];
-type ValueStr = [string?, string?, string?];
+type Value = [Moment?, Moment?, boolean?] | null;
+type ValueStr = [string?, string?, string?] | null;
 type HandleChange = (value: ValueStr | null, valueStr: Value | null) => void;
 declare const ProRangeLimit: React.FC<Props>;
 export default ProRangeLimit;