@zat-design/sisyphus-react 3.3.0-beta.13 → 3.3.0-beta.15

package/es/ProDownload/utils.js

@@ -4,8 +4,6 @@ import _message from "antd/es/message";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-/* eslint-disable no-empty */
-/* eslint-disable prefer-promise-reject-errors */
 import { isFunction, get } from 'lodash';
 import locale from '../locale';
 var stringify = function stringify(data) {

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

@@ -145,13 +145,13 @@ var ActionButton = function ActionButton(props) {
     align: "start",
     className: "pro-form-list-action",
     children: actionProps === null || actionProps === void 0 ? void 0 : actionProps.map(function (item) {
-      if (item.show === false) return _jsx(_Fragment, {});
+      if (item.show === false) return _jsx("span", {}, "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index));
       if (isFunction(item.show) && !item.show(form.getFieldValue(namePath), {
         namePath: namePath,
         index: index,
         form: form
       })) {
-        return _jsx(_Fragment, {});
+        return _jsx("span", {}, "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index));
       }
       var label = item.label,
         onClick = item.onClick,

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

@@ -62,7 +62,7 @@ var FormList = function FormList(props, ref) {
   var handleDragEnd = function handleDragEnd(drag) {
     var active = drag.active,
       over = drag.over;
-    if (active.id !== over.id) {
+    if (_fields.length > 1 && active.id !== over.id) {
       var activeIndex = _fields.findIndex(function (item) {
         return item.key === active.id;
       });

package/es/ProForm/components/render/Render.js

@@ -367,7 +367,9 @@ var Render = function Render(props) {
     if (type === 'FormList') {
       lastComponentProps.disabled = lastDisabled;
       var lessMode = lastComponentProps.mode === 'less';
-      child = _jsx(_Form.List, _objectSpread(_objectSpread({}, _otherFormItemProps), {}, {
+      child = _jsx(_Form.List, _objectSpread(_objectSpread({
+        name: _otherFormItemProps.name
+      }, omit(_otherFormItemProps, ['rules'])), {}, {
         children: function children(fields, operation, meta) {
           return _jsx(AutoComponent, _objectSpread(_objectSpread({}, omit(lastComponentProps, ['onFieldChange', 'disabledStrictly'])), {}, {
             otherProps: otherProps,

package/es/ProForm/utils/useForm.js

@@ -47,23 +47,31 @@ export var useForm = function useForm(originForm) {
     };
     var _validateFields = /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(nameList) {
-        var values, _values;
+        var _len,
+          rest,
+          _key,
+          values,
+          _values,
+          _args = arguments;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              _context.next = 2;
-              return validateFields(nameList);
-            case 2:
+              for (_len = _args.length, rest = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+                rest[_key - 1] = _args[_key];
+              }
+              _context.next = 3;
+              return validateFields.apply(void 0, [nameList].concat(rest));
+            case 3:
               values = _context.sent;
               if (!nameList) {
-                _context.next = 5;
+                _context.next = 6;
                 break;
               }
               return _context.abrupt("return", values);
-            case 5:
+            case 6:
               _values = _getFieldsValue();
               return _context.abrupt("return", _values);
-            case 7:
+            case 8:
             case "end":
               return _context.stop();
           }

package/es/ProTreeModal/components/Trigger.js

@@ -79,6 +79,8 @@ function Trigger(props) {
       return _jsxs(_Space.Compact, {
         block: true,
         children: [_jsxs(_Select, {
+          disabled: disabled,
+          className: classNames(disabled ? 'trigger-no-hover' : '', appoint ? 'pro-tree-modal-input-appoint' : ''),
           defaultValue: "appoint",
           value: state.mode,
           onChange: onAppointChange,

package/es/ProTreeModal/index.js

@@ -65,9 +65,9 @@ var ProTreeModal = function ProTreeModal(props) {
       children: 'children'
     } : _props$fieldNames,
     _props$disabled = props.disabled,
-    disabled = _props$disabled === void 0 ? props.disabled || (props === null || props === void 0 ? void 0 : (_props$otherProps = props.otherProps) === null || _props$otherProps === void 0 ? void 0 : _props$otherProps.isView) || false : _props$disabled,
+    disabled = _props$disabled === void 0 ? props.disabled || props.isView || (props === null || props === void 0 ? void 0 : (_props$otherProps = props.otherProps) === null || _props$otherProps === void 0 ? void 0 : _props$otherProps.isView) || false : _props$disabled,
     _props$isView = props.isView,
-    isView = _props$isView === void 0 ? (props === null || props === void 0 ? void 0 : (_props$otherProps2 = props.otherProps) === null || _props$otherProps2 === void 0 ? void 0 : _props$otherProps2.isView) || false : _props$isView,
+    isView = _props$isView === void 0 ? props.isView || (props === null || props === void 0 ? void 0 : (_props$otherProps2 = props.otherProps) === null || _props$otherProps2 === void 0 ? void 0 : _props$otherProps2.isView) || false : _props$isView,
     transformResponse = props.transformResponse,
     optionRender = props.optionRender,
     openChange = props.openChange,
@@ -169,7 +169,7 @@ var ProTreeModal = function ProTreeModal(props) {
         allKeys = state.allKeys,
         originalTreeData = state.originalTreeData;
       var treeViewData = [];
-      if (allValue && typeof value === 'string') {
+      if (allValue && typeof value === 'string' && allValue === value) {
         if (modeType === LIST) {
           checkedValues = treeData.map(function (item) {
             return item[fieldNameValue];

package/lib/ProEditTable/components/RenderField/index.js

@@ -30,8 +30,6 @@ var _useRules = _interopRequireDefault(require("../../../ProForm/utils/useRules"
 var _utils = require("../../../ProForm/utils");
 var _locale = _interopRequireDefault(require("../../../locale"));
 var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className"];
-/* eslint-disable prefer-destructuring */
-/* eslint-disable prefer-const */
 var RenderField = function RenderField(_ref) {
   var _type, _type$replace, _fieldProps2, _fieldProps3, _fieldProps4, _names, _formItemChildProps$p, _TargetComponent4, _classNames;
   var value = _ref.text,

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

@@ -14,7 +14,7 @@ var _moment = _interopRequireDefault(require("moment"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _Container = _interopRequireDefault(require("../../Container"));
-var _excluded = ["format", "otherProps", "separator"]; // @ts-check
+var _excluded = ["format", "otherProps", "separator"];
 var AntRangePicker = _antd.DatePicker.RangePicker;
 var RangePicker = function RangePicker(props) {
   var _props$format = props.format,

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

@@ -146,13 +146,13 @@ var ActionButton = function ActionButton(props) {
     align: "start",
     className: "pro-form-list-action",
     children: actionProps === null || actionProps === void 0 ? void 0 : actionProps.map(function (item) {
-      if (item.show === false) return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
+      if (item.show === false) return (0, _jsxRuntime.jsx)("span", {}, "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index));
       if ((0, _lodash.isFunction)(item.show) && !item.show(form.getFieldValue(namePath), {
         namePath: namePath,
         index: index,
         form: form
       })) {
-        return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
+        return (0, _jsxRuntime.jsx)("span", {}, "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index));
       }
       var label = item.label,
         onClick = item.onClick,

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

@@ -68,7 +68,7 @@ var FormList = function FormList(props, ref) {
   var handleDragEnd = function handleDragEnd(drag) {
     var active = drag.active,
       over = drag.over;
-    if (active.id !== over.id) {
+    if (_fields.length > 1 && active.id !== over.id) {
       var activeIndex = _fields.findIndex(function (item) {
         return item.key === active.id;
       });

package/lib/ProForm/components/old/InputRange/index.js

@@ -13,6 +13,7 @@ var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 /* eslint-disable @typescript-eslint/no-shadow */
 /* eslint-disable no-param-reassign */
+
 var positiveInteger = {
   formatter: function formatter(value) {
     return value.replace(/[^0-9]/g, '');

package/lib/ProForm/components/old/ProCertValidity/index.js

@@ -11,7 +11,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _moment = _interopRequireDefault(require("moment"));
 var _react = require("react");
-var _excluded = ["value", "onChange", "disabled", "isRange", "getPopupContainer", "showForever", "proformmode"]; // @ts-nocheck
+var _excluded = ["value", "onChange", "disabled", "isRange", "getPopupContainer", "showForever", "proformmode"];
 var RangePicker = _antd.DatePicker.RangePicker;
 var defaultFormatDate = 'YYYY-MM-DD';
 var defaultPopupContainer = function defaultPopupContainer(triggerNode) {

package/lib/ProForm/components/render/Render.js

@@ -28,7 +28,6 @@ var _useChanged3 = require("../../utils/useChanged");
 var _tip = _interopRequireDefault(require("../../../assets/tip.svg"));
 var _useRules = _interopRequireDefault(require("../../utils/useRules"));
 var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip"];
-/* eslint-disable prefer-destructuring */
 // 这个组件只管渲染, 参数的整理在外部处理
 var Render = function Render(props) {
   var _classNames, _otherProps$names2;
@@ -365,7 +364,9 @@ var Render = function Render(props) {
     if (type === 'FormList') {
       lastComponentProps.disabled = lastDisabled;
       var lessMode = lastComponentProps.mode === 'less';
-      child = (0, _jsxRuntime.jsx)(_antd.Form.List, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _otherFormItemProps), {}, {
+      child = (0, _jsxRuntime.jsx)(_antd.Form.List, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        name: _otherFormItemProps.name
+      }, (0, _lodash.omit)(_otherFormItemProps, ['rules'])), {}, {
         children: function children(fields, operation, meta) {
           return (0, _jsxRuntime.jsx)(AutoComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(lastComponentProps, ['onFieldChange', 'disabledStrictly'])), {}, {
             otherProps: otherProps,

package/lib/ProForm/utils/useForm.js

@@ -53,23 +53,31 @@ var useForm = exports.useForm = function useForm(originForm) {
     };
     var _validateFields = /*#__PURE__*/function () {
       var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(nameList) {
-        var values, _values;
+        var _len,
+          rest,
+          _key,
+          values,
+          _values,
+          _args = arguments;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              _context.next = 2;
-              return validateFields(nameList);
-            case 2:
+              for (_len = _args.length, rest = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+                rest[_key - 1] = _args[_key];
+              }
+              _context.next = 3;
+              return validateFields.apply(void 0, [nameList].concat(rest));
+            case 3:
               values = _context.sent;
               if (!nameList) {
-                _context.next = 5;
+                _context.next = 6;
                 break;
               }
               return _context.abrupt("return", values);
-            case 5:
+            case 6:
               _values = _getFieldsValue();
               return _context.abrupt("return", _values);
-            case 7:
+            case 8:
             case "end":
               return _context.stop();
           }

package/lib/ProTable/components/TableResizable/index.js

@@ -15,14 +15,6 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _index = require("../../index");
 var _utils = require("../../utils");
 var _excluded = ["onDrag", "width", "minwidth"];
-/*
- * @Author: chongyang wanchongyang@zhongan.io
- * @Date: 2023-02-23 17:47:46
- * @LastEditors: chongyang wanchongyang@zhongan.io
- * @LastEditTime: 2023-03-07 20:18:22
- * @FilePath: /za-material-warehouse/src/ProTable/TableResizable.tsx
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
 var ResizableTitle = function ResizableTitle(props) {
   var _restProps$className;
   var onDrag = props.onDrag,

package/lib/ProTabs/index.js

@@ -17,7 +17,6 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _lodash = require("lodash");
 var _components = require("./components");
 var _excluded = ["style", "className", "dataSource", "onChange", "transformResponse", "useRequest", "tabSearch", "mode"];
-/* eslint-disable @typescript-eslint/consistent-type-assertions */
 var ProTabs = function ProTabs(props, ref) {
   var style = props.style,
     className = props.className,

package/lib/ProThemeTools/index.js

@@ -18,7 +18,6 @@ var _index = require("./utils/index");
 var _component = require("./component");
 var _locale = _interopRequireDefault(require("../locale"));
 var _excluded = ["size", "className", "cacheTime", "color", "mode", "iconFollowTheme", "prefixCls", "tableBorder", "tableStripe", "theme"];
-/* eslint-disable prefer-const */
 var defaultCacheTime = 1; // 配置保存时间为一天
 var defaultThemeConfig = {
   zauiBrand: '#006AFF',

package/lib/ProTree/components/Tree.js

@@ -18,13 +18,6 @@ var _SearchTitle = _interopRequireDefault(require("./SearchTitle"));
 var _utils = require("../utils");
 var _locale = _interopRequireDefault(require("../../locale"));
 var _excluded = ["checkedValues", "disabled", "searchStr", "originalTreeData", "showCodeName", "checkStrictly", "flatTreeData", "mode", "fieldNames", "tags", "onCheck", "optionRender", "treeData", "showLine", "switcherIcon", "checkable", "menu", "innerExpandKeys", "selectedKey", "disabledMode"];
-/*
- *@Date: 2023-07-25 13:49:35
- *@LastEditTime: 2023-07-25 13:49:35
- *@Author: liudongliang
- *@Description: 树每行节点渲染组件，复选时阻止点击事件冒泡，只有点击树节点文本会向上触发onSelect事件
-*/
-/* eslint-disable no-plusplus */
 var tagsBgColors = ['rgba(0, 106, 255,0.16)', 'rgba(0, 196, 74,0.16)', 'rgba(255, 140, 0,0.16)', 'rgba(255, 80, 80,0.16)', 'rgba(97, 97, 97, 0.16)'];
 var tagsColors = ['#006AFF', '#00C44A', '#FF8C00', '#FF5050', '#616161'];
 function List(props) {

package/lib/ProTree/index.js

@@ -16,6 +16,7 @@ var _ProTreeSelect = _interopRequireDefault(require("../ProTreeSelect"));
  *@Author: liudongliang
  *@Description: ProTree组件，集成了tree和treeSelect
 */
+
 var ProTreeHandle = function ProTreeHandle(props) {
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'tree' : _props$mode;

package/lib/ProTreeModal/components/Tree.js

@@ -16,7 +16,6 @@ var _SearchTitle = _interopRequireDefault(require("./SearchTitle"));
 var _CloseIcon = _interopRequireDefault(require("./CloseIcon"));
 var _utils = require("../utils");
 var _excluded = ["checkedValues", "disabled", "treeData", "searchStr", "originalTreeData", "showCodeName", "checkStrictly", "flatTreeData", "mode", "fieldNames", "tags", "onCheck", "handleFilterClose", "optionRender"];
-/* eslint-disable no-plusplus */
 var tagsBgColors = ['rgba(0, 106, 255,0.16)', 'rgba(0, 196, 74,0.16)', 'rgba(255, 140, 0,0.16)', 'rgba(255, 80, 80,0.16)', 'rgba(97, 97, 97, 0.16)'];
 var tagsColors = ['#006AFF', '#00C44A', '#FF8C00', '#FF5050', '#616161'];
 function List(props, ref) {

package/lib/ProTreeModal/components/Trigger.js

@@ -82,6 +82,8 @@ function Trigger(props) {
       return (0, _jsxRuntime.jsxs)(_antd.Space.Compact, {
         block: true,
         children: [(0, _jsxRuntime.jsxs)(_antd.Select, {
+          disabled: disabled,
+          className: (0, _classnames.default)(disabled ? 'trigger-no-hover' : '', appoint ? 'pro-tree-modal-input-appoint' : ''),
           defaultValue: "appoint",
           value: state.mode,
           onChange: onAppointChange,

package/lib/ProTreeModal/index.js

@@ -66,9 +66,9 @@ var ProTreeModal = function ProTreeModal(props) {
       children: 'children'
     } : _props$fieldNames,
     _props$disabled = props.disabled,
-    disabled = _props$disabled === void 0 ? props.disabled || (props === null || props === void 0 ? void 0 : (_props$otherProps = props.otherProps) === null || _props$otherProps === void 0 ? void 0 : _props$otherProps.isView) || false : _props$disabled,
+    disabled = _props$disabled === void 0 ? props.disabled || props.isView || (props === null || props === void 0 ? void 0 : (_props$otherProps = props.otherProps) === null || _props$otherProps === void 0 ? void 0 : _props$otherProps.isView) || false : _props$disabled,
     _props$isView = props.isView,
-    isView = _props$isView === void 0 ? (props === null || props === void 0 ? void 0 : (_props$otherProps2 = props.otherProps) === null || _props$otherProps2 === void 0 ? void 0 : _props$otherProps2.isView) || false : _props$isView,
+    isView = _props$isView === void 0 ? props.isView || (props === null || props === void 0 ? void 0 : (_props$otherProps2 = props.otherProps) === null || _props$otherProps2 === void 0 ? void 0 : _props$otherProps2.isView) || false : _props$isView,
     transformResponse = props.transformResponse,
     optionRender = props.optionRender,
     openChange = props.openChange,
@@ -170,7 +170,7 @@ var ProTreeModal = function ProTreeModal(props) {
         allKeys = state.allKeys,
         originalTreeData = state.originalTreeData;
       var treeViewData = [];
-      if (allValue && typeof value === 'string') {
+      if (allValue && typeof value === 'string' && allValue === value) {
         if (modeType === LIST) {
           checkedValues = treeData.map(function (item) {
             return item[fieldNameValue];

package/lib/ProUpload/index.js

@@ -22,13 +22,6 @@ var _ImageRender = _interopRequireDefault(require("./components/ImageRender"));
 var _uitls = require("./uitls");
 var _locale = _interopRequireDefault(require("../locale"));
 var _excluded = ["value", "size", "action", "maxCount", "headerRender", "footerRender", "disabled", "uploadType", "buttonProps", "accept", "extraTipText", "beforeUpload", "onChange", "onDownload", "onPreview", "onRemove", "method", "className", "dataParams", "name", "showExampleContent", "showUploadList", "otherProps", "transformResponse", "exampleTitle", "exampleContent", "exampleModalProps", "buttonText", "afterRender", "fieldNames"];
-/*
- * @Author: wangshengqiang
- * @Date: 2023-02-03 14:18:59
- * @LastEditTime: 2023-11-14 18:32:13
- * @LastEditors: wangshengqiang
- * @Description: 上传控件
- */
 var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var _locale$ProUpload;
   var _useState = (0, _react.useState)([]),

package/lib/ProViewer/index.js

@@ -16,7 +16,6 @@ var _antd = require("antd");
 var _react = _interopRequireWildcard(require("react"));
 var _locale = _interopRequireDefault(require("../locale"));
 var _locale$ProViewer;
-/* eslint-disable jsx-a11y/iframe-has-title */
 // 用于解析word | excel
 var officeApp = 'https://view.officeapps.live.com/op/view.aspx?src=';
 // 文件MIME类型

package/lib/old/ProCertValidity/index.js

@@ -11,7 +11,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _moment = _interopRequireDefault(require("moment"));
 var _react = require("react");
-var _excluded = ["value", "onChange", "disabled", "isRange", "getPopupContainer", "showForever", "proformmode"]; // @ts-nocheck
+var _excluded = ["value", "onChange", "disabled", "isRange", "getPopupContainer", "showForever", "proformmode"];
 var RangePicker = _antd.DatePicker.RangePicker;
 var defaultFormatDate = 'YYYY-MM-DD';
 var defaultPopupContainer = function defaultPopupContainer(triggerNode) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.3.0-beta.13",
+  "version": "3.3.0-beta.15",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",