@zat-design/sisyphus-react 3.0.16-beta.2 → 3.1.4

package/lib/ProEnum/utils/getEnumLabel.js

@@ -0,0 +1,88 @@
+"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 _jsxRuntime = require("react/jsx-runtime");
+var _react = require("react");
+var _lodash = require("lodash");
+var _ProConfigProvider = require("../../ProConfigProvider");
+var EnumLabel = function EnumLabel(props) {
+  var fieldNameLabel = '';
+  var fieldNameValue = '';
+  var _ref = (0, _ProConfigProvider.useProConfig)('ProEnum') || {},
+    fieldNames = _ref.fieldNames,
+    _ref$clear = _ref.clear,
+    clear = _ref$clear === void 0 ? true : _ref$clear;
+  if (fieldNames && Object.keys(fieldNames).length) {
+    fieldNameLabel = fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.label;
+    fieldNameValue = fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value;
+  }
+  if (props.fieldNameLabel) fieldNameLabel = props.fieldNameLabel;
+  if (props.fieldNameValue) fieldNameValue = props.fieldNameValue;
+  if (clear) {
+    fieldNameLabel = 'label';
+    fieldNameValue = 'value';
+  }
+  var code = props.code,
+    value = props.value,
+    compose = props.compose;
+  var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProEnum'),
+    _useProConfig$dics = _useProConfig.dics,
+    dics = _useProConfig$dics === void 0 ? {} : _useProConfig$dics;
+  var enumLists = (0, _react.useMemo)(function () {
+    var lists = [];
+    if ((0, _lodash.isString)(code)) {
+      lists = (dics === null || dics === void 0 ? void 0 : dics[code]) || [];
+    }
+    if ((0, _lodash.isArray)(code)) {
+      code.forEach(function (enumCode) {
+        var _lists;
+        (0, _lodash.isArray)(dics === null || dics === void 0 ? void 0 : dics[enumCode]) && (_lists = lists).push.apply(_lists, (0, _toConsumableArray2.default)(dics === null || dics === void 0 ? void 0 : dics[enumCode]));
+      });
+    }
+    return lists;
+  }, [dics, code]);
+  var transToLabel = function transToLabel(value) {
+    var labelList = value.map(function (v) {
+      var option = enumLists.find(function (option) {
+        return option[fieldNameValue] === v;
+      });
+      if (option && option[fieldNameLabel]) {
+        return compose ? "".concat(value, "-").concat(option[fieldNameLabel]) : option[fieldNameLabel];
+      }
+      return '';
+    });
+    return (0, _jsxRuntime.jsx)("span", {
+      children: labelList.join('，') || '-'
+    });
+  };
+  if (Array.isArray(enumLists)) {
+    if (Array.isArray(value)) {
+      return transToLabel(value);
+    }
+    return transToLabel([value]);
+  }
+  return (0, _jsxRuntime.jsx)("span", {
+    children: "-"
+  });
+};
+var getEnumLabel = function getEnumLabel(code, value) {
+  var compose = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  var fieldNameLabel = arguments.length > 3 ? arguments[3] : undefined;
+  var fieldNameValue = arguments.length > 4 ? arguments[4] : undefined;
+  if (!code) {
+    return null;
+  }
+  return (0, _jsxRuntime.jsx)(EnumLabel, {
+    code: code,
+    value: value,
+    compose: compose,
+    fieldNameLabel: fieldNameValue,
+    fieldNameValue: fieldNameLabel
+  });
+};
+var _default = exports.default = getEnumLabel;

package/{es/ProEnum/utils.d.ts → lib/ProEnum/utils/index.d.ts}

@@ -1,4 +1,4 @@
-import { DataOption } from './propsType';
+import { DataOption } from '../propsType';
 type StorageType = 'localStorage' | 'sessionStorage';
 interface EnumRes {
     data: Record<string, DataOption[]>;

package/lib/ProForm/components/Container.js

@@ -5,30 +5,33 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _react = _interopRequireDefault(require("react"));
+var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
+var _utils = require("../utils");
 var Container = function Container(props) {
   var children = props.children,
     tooltip = props.tooltip,
     nowrap = props.nowrap,
     viewEmpty = props.viewEmpty;
-  var emptyChildren = [undefined, null, ''].includes(children);
+  var emptyChildren = (0, _utils.isNullArray)(children);
   var _className = (0, _classnames.default)({
     'pro-form-view-container': true,
     'pro-form-view-container_nowrap': nowrap !== null && nowrap !== void 0 ? nowrap : tooltip
   });
   if (tooltip && !emptyChildren) {
-    return /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
+    return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
       placement: "topLeft",
-      title: children
-    }, /*#__PURE__*/_react.default.createElement("div", {
-      className: _className
-    }, children));
+      title: children,
+      children: (0, _jsxRuntime.jsx)("div", {
+        className: _className,
+        children: children
+      })
+    });
   }
-  return /*#__PURE__*/_react.default.createElement("div", {
-    className: _className
-  }, emptyChildren ? viewEmpty : children);
+  return (0, _jsxRuntime.jsx)("div", {
+    className: _className,
+    children: emptyChildren ? viewEmpty : children
+  });
 };
-var _default = Container;
-exports.default = _default;
+var _default = exports.default = Container;

package/lib/ProForm/components/FormFooter/index.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
 import { FooterRenderProps } from './propsType';
+export declare const PRO_FORM_CACHE = "PRO_FORM_CACHE";
 declare const FormFooter: React.FC<FooterRenderProps>;
 export default FormFooter;

package/lib/ProForm/components/FormFooter/index.js

@@ -4,13 +4,15 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = exports.PRO_FORM_CACHE = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
-var _react = _interopRequireDefault(require("react"));
-var _zatDesignProComponent = require("zat-design-pro-component");
+var _react = require("react");
+var _ProConfigProvider = require("../../../ProConfigProvider");
+var PRO_FORM_CACHE = exports.PRO_FORM_CACHE = 'PRO_FORM_CACHE';
 var FormFooter = function FormFooter(props) {
-  var initialConfig = (0, _zatDesignProComponent.useProConfig)('FormFooter');
+  var initialConfig = (0, _ProConfigProvider.useProConfig)('FormFooter');
   var _initialConfig$props = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, initialConfig), props),
     okText = _initialConfig$props.okText,
     cancelText = _initialConfig$props.cancelText,
@@ -19,24 +21,56 @@ var FormFooter = function FormFooter(props) {
     _initialConfig$props$ = _initialConfig$props.footer,
     footer = _initialConfig$props$ === void 0 ? {} : _initialConfig$props$,
     children = _initialConfig$props.children,
-    confirmLoading = _initialConfig$props.confirmLoading;
+    confirmLoading = _initialConfig$props.confirmLoading,
+    formId = _initialConfig$props.formId,
+    form = _initialConfig$props.form;
   var _footer$okButtonProps = footer.okButtonProps,
     okButtonProps = _footer$okButtonProps === void 0 ? {} : _footer$okButtonProps,
     _footer$cancelButtonP = footer.cancelButtonProps,
     cancelButtonProps = _footer$cancelButtonP === void 0 ? {} : _footer$cancelButtonP;
   var okChildren = okButtonProps.children;
   var cancelChildren = cancelButtonProps.children;
-  return /*#__PURE__*/_react.default.createElement("div", {
-    className: "ant-form-item"
-  }, /*#__PURE__*/_react.default.createElement(_antd.Space, null, /*#__PURE__*/_react.default.createElement(_antd.Button, (0, _objectSpread2.default)({
-    type: "primary",
-    htmlType: onOk ? 'button' : 'submit',
-    onClick: onOk,
-    disabled: confirmLoading,
-    loading: confirmLoading
-  }, okButtonProps), okChildren || okText || '查询'), /*#__PURE__*/_react.default.createElement(_antd.Button, (0, _objectSpread2.default)({
-    onClick: onCancel
-  }, cancelButtonProps), cancelChildren || cancelText || '重置'), children));
+  var searchCache = (0, _react.useMemo)(function () {
+    var cacheStr = window.sessionStorage.getItem(PRO_FORM_CACHE);
+    var cache = JSON.parse(cacheStr || '{}');
+    if (formId && cache[formId]) {
+      form.setFieldsValue(cache[formId]);
+    }
+    return cache;
+  }, []);
+  var _onOk = function _onOk() {
+    if (formId) {
+      var values = form.getFieldsValue();
+      searchCache[formId] = values;
+      window.sessionStorage.setItem(PRO_FORM_CACHE, JSON.stringify(searchCache));
+    }
+    onOk();
+  };
+  var _onCancel = function _onCancel() {
+    if (formId && searchCache[formId]) {
+      delete searchCache[formId];
+      window.sessionStorage.setItem(PRO_FORM_CACHE, JSON.stringify(searchCache));
+    }
+    onCancel();
+  };
+  return (
+    // <div className="ant-form-item">
+    (0, _jsxRuntime.jsxs)(_antd.Space, {
+      children: [(0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        type: "primary",
+        htmlType: onOk ? 'button' : 'submit',
+        onClick: _onOk,
+        disabled: confirmLoading,
+        loading: confirmLoading
+      }, okButtonProps), {}, {
+        children: okChildren || okText || '查询'
+      })), (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        onClick: _onCancel
+      }, cancelButtonProps), {}, {
+        children: cancelChildren || cancelText || '重置'
+      })), children]
+    })
+    // </div>
+  );
 };
-var _default = FormFooter;
-exports.default = _default;
+var _default = exports.default = FormFooter;

package/lib/ProForm/components/FormFooter/propsType.d.ts

@@ -1,4 +1,4 @@
-import { ButtonProps, ColProps } from 'antd';
+import { ButtonProps, ColProps, FormInstance } from 'antd';
 export interface ButtonItem extends ButtonProps {
     children?: any;
 }
@@ -14,4 +14,6 @@ export interface FooterRenderProps {
     footerColProps?: ColProps;
     footer?: FooterButtonProps;
     confirmLoading?: boolean;
+    formId?: string;
+    form: FormInstance;
 }

package/lib/ProForm/components/base/Checkbox/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { CheckboxGroupProps } from 'antd/lib/checkbox';
+import { CheckboxGroupProps } from 'antd/es/checkbox';
 import { ProFormOtherProps } from '../../../propsType';
 export interface Props extends Omit<CheckboxGroupProps, 'options'> {
     dataSource: any[];

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

@@ -7,7 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _react = _interopRequireDefault(require("react"));
+var _react = require("react");
+var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
@@ -37,14 +38,16 @@ var Checkbox = function Checkbox(props) {
       return labelList.join('，');
     };
     if (Array.isArray(value)) {
-      return /*#__PURE__*/_react.default.createElement(_Container.default, {
+      return (0, _jsxRuntime.jsx)(_Container.default, {
         tooltip: true,
-        viewEmpty: viewEmpty
-      }, transToLabel(value));
+        viewEmpty: viewEmpty,
+        children: transToLabel(value)
+      });
     }
-    return /*#__PURE__*/_react.default.createElement(_Container.default, {
-      viewEmpty: viewEmpty
-    }, value ? transToLabel([value]) : null);
+    return (0, _jsxRuntime.jsx)(_Container.default, {
+      viewEmpty: viewEmpty,
+      children: value ? transToLabel([value]) : null
+    });
   }
   // 假如dataSource包含code,name, fieldNames没有配置，_fieldNames默认为code, name
   if (Array.isArray(dataSource) && !fieldNames) {
@@ -59,16 +62,17 @@ var Checkbox = function Checkbox(props) {
       };
     }
   }
-  return /*#__PURE__*/_react.default.createElement(_antd.Checkbox.Group, (0, _objectSpread2.default)({
+  return (0, _jsxRuntime.jsx)(_antd.Checkbox.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({
     style: {
       width: '100%'
     }
-  }, rest), !!dataSource.length && dataSource.map(function (item) {
-    return /*#__PURE__*/_react.default.createElement(_antd.Checkbox, {
-      key: item[_fieldNames.value],
-      value: item[_fieldNames.value]
-    }, item[_fieldNames.label]);
+  }, rest), {}, {
+    children: !!dataSource.length && dataSource.map(function (item) {
+      return /*#__PURE__*/(0, _react.createElement)(_antd.Checkbox, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
+        key: item[_fieldNames.value],
+        value: item[_fieldNames.value]
+      }), item[_fieldNames.label]);
+    })
   }));
 };
-var _default = Checkbox;
-exports.default = _default;
+var _default = exports.default = Checkbox;

package/lib/ProForm/components/base/DatePicker/index.d.ts

@@ -1,12 +1,13 @@
-import { DatePickerProps } from 'antd';
+import { DatePickerProps, TimePickerProps } from 'antd';
+import { Moment } from 'moment';
 import React from 'react';
-import { ProFormOtherProps } from '../../../propsType';
-export type Props = DatePickerProps & {
+import { PickerPanelDateProps } from 'antd/lib/calendar/generateCalendar';
+export type Props = DatePickerProps & TimePickerProps & {
     isView?: boolean;
     viewEmpty?: React.ReactNode;
     format?: string;
-    otherProps?: ProFormOtherProps;
-    showTime?: boolean;
+    showTime?: PickerPanelDateProps<Moment>['showTime'];
+    showNow?: boolean;
 };
 declare const DatePicker: React.FC<Props>;
 export default DatePicker;

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

@@ -8,25 +8,25 @@ exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _lodash = require("lodash");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _moment = _interopRequireDefault(require("moment"));
-var _react = _interopRequireDefault(require("react"));
-var _zatDesignProComponent = require("zat-design-pro-component");
+var _ProConfigProvider = require("../../../../ProConfigProvider");
+var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _Container = _interopRequireDefault(require("../../Container"));
-var _excluded = ["className", "format", "otherProps"];
+var _excluded = ["className", "format"];
 var DatePicker = function DatePicker(props) {
   var className = props.className,
     _props$format = props.format,
     format = _props$format === void 0 ? 'YYYY-MM-DD' : _props$format,
-    otherProps = props.otherProps,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var _ref = otherProps || {},
+  var _ref = _ProForm.default.useFieldProps() || {},
     isView = _ref.isView,
     viewEmpty = _ref.viewEmpty,
     valueType = _ref.valueType;
-  var initialConfig = (0, _zatDesignProComponent.useProConfig)('DatePicker');
+  var initialConfig = (0, _ProConfigProvider.useProConfig)('DatePicker');
   var _className = (0, _classnames.default)((0, _defineProperty2.default)({
     'full-form-item': true
   }, className, !!className));
@@ -42,13 +42,14 @@ var DatePicker = function DatePicker(props) {
     } else if ((0, _lodash.isString)(value)) {
       viewChildren = (0, _moment.default)(value).format(format);
     }
-    return /*#__PURE__*/_react.default.createElement(_Container.default, {
-      viewEmpty: viewEmpty
-    }, viewChildren);
+    return (0, _jsxRuntime.jsx)(_Container.default, {
+      viewEmpty: viewEmpty,
+      children: viewChildren
+    });
   }
   // dateTime模式下默认开启time选择
   var _rest = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
-    showTime: !rest.showTime && valueType === 'dateTime' || rest.showTime
+    showTime: rest.showTime === undefined && valueType === 'dateTime' || rest.showTime
   });
   if (_rest === null || _rest === void 0 ? void 0 : _rest.placeholder) {
     _rest === null || _rest === void 0 ? true : delete _rest.placeholder;
@@ -57,15 +58,14 @@ var DatePicker = function DatePicker(props) {
   if ((0, _lodash.isString)(_rest.value)) {
     _rest.value = (0, _moment.default)(_rest.value);
   }
-  if (['dateStartTime', 'dateEndTime'].includes(valueType) && (isView || rest.disabled)) {
-    _rest.showTime = true;
+  if (['dateStartTime', 'dateEndTime'].includes(valueType) && rest.showTime === undefined) {
+    _rest.showTime = {
+      value: (0, _moment.default)(valueType === 'dateStartTime' ? '00:00:00' : '23:59:59', 'HH:mm:ss'),
+      disabled: true
+    };
   }
-  if (['dateStartTime', 'dateEndTime'].includes(valueType) && rest.showTime && !rest.disabled) {
-    _rest.showTime = false;
-  }
-  return /*#__PURE__*/_react.default.createElement(_antd.DatePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, initialConfig), _rest), {}, {
+  return (0, _jsxRuntime.jsx)(_antd.DatePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, initialConfig), _rest), {}, {
     className: _className
   }));
 };
-var _default = DatePicker;
-exports.default = _default;
+var _default = exports.default = DatePicker;

package/lib/ProForm/components/base/Input/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { IProps } from './propsType';
-declare const Input: (props: IProps) => React.JSX.Element;
+declare const Input: (props: IProps) => JSX.Element;
 export default Input;

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

@@ -7,9 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _react = _interopRequireDefault(require("react"));
+var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
-var _zatDesignProComponent = require("zat-design-pro-component");
+var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _excluded = ["label", "form", "placeholder", "fieldName", "otherProps"];
 // 参数优先级
@@ -24,17 +24,18 @@ var Input = function Input(props) {
   var _ref = otherProps || {},
     isView = _ref.isView,
     viewEmpty = _ref.viewEmpty;
-  var initialConfig = (0, _zatDesignProComponent.useProConfig)('Input');
+  var initialConfig = (0, _ProConfigProvider.useProConfig)('Input');
   if (isView) {
-    return /*#__PURE__*/_react.default.createElement(_Container.default, {
-      viewEmpty: viewEmpty
-    }, rest.value);
+    return (0, _jsxRuntime.jsx)(_Container.default, {
+      viewEmpty: viewEmpty,
+      children: rest.value
+    });
   }
-  return /*#__PURE__*/_react.default.createElement(_antd.Input, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+  return (0, _jsxRuntime.jsx)(_antd.Input, (0, _objectSpread2.default)((0, _objectSpread2.default)({
     allowClear: true,
     autoComplete: "off",
-    placeholder: placeholder || '请输入'
+    placeholder: placeholder || '请输入',
+    title: rest.value
   }, initialConfig), rest));
 };
-var _default = Input;
-exports.default = _default;
+var _default = exports.default = Input;

package/lib/ProForm/components/base/InputNumber/index.d.ts

@@ -4,7 +4,7 @@ import { ProFormOtherProps } from '../../../propsType';
 export interface Props extends Omit<InputNumberProps, 'onBlur'> {
     otherProps?: ProFormOtherProps;
     range?: string;
-    onBlur?: (value?: number) => void;
+    onBlur?: (value?: number, record?: any, object?: any) => void;
 }
 declare const InputNumber: React.FC<Props>;
 export default InputNumber;