@zat-design/sisyphus-react 3.3.0-beta.6 → 3.3.0-beta.7

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/render/Render.js

@@ -363,9 +363,7 @@ var Render = function Render(props) {
       };
     }
     // 需要过滤掉的form_item的key
-    var filterFormItemKey = ['onFieldChange',
-    // 'shouldUpdate',
-    'namePath', 'isView', 'parentNames', 'space', 'before', 'after'];
+    var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after'];
     if (type === 'FormList') {
       lastComponentProps.disabled = lastDisabled;
       var lessMode = lastComponentProps.mode === 'less';
@@ -389,31 +387,24 @@ var Render = function Render(props) {
         span: 24 // 默认占一行
       });
     }
-    // 当存在shouldUpdate时补货所有form变更（防止表单onchange设置form值时无法更新的问题）
-    // if (_otherFormItemProps.shouldUpdate) {
-    //   return (
-    //     <Form.Item shouldUpdate={_otherFormItemProps.shouldUpdate} noStyle>
-    //       {() => {
-    //         return (
-    //           <Form.Item
-    //             {...omit(_otherFormItemProps, filterFormItemKey)}
-    //             // @ts-ignore
-    //             _internalItemRender={internalItemRender}
-    //             className={_className}
-    //           >
-    //             {child}
-    //           </Form.Item>
-    //         );
-    //       }}
-    //     </Form.Item>
-    //   );
-    // }
-    var formItem = _jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
+
+    var orgFormItem = _jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
       // @ts-ignore
       _internalItemRender: internalItemRender,
       className: _className,
       children: child
     }));
+    var formItem = orgFormItem;
+    // 当存在shouldUpdate时捕获所有form变更（防止表单onchange设置form值时无法更新的问题）
+    if (_otherFormItemProps.shouldUpdate) {
+      formItem = _jsx(_Form.Item, {
+        shouldUpdate: _otherFormItemProps.shouldUpdate,
+        noStyle: true,
+        children: function children() {
+          return orgFormItem;
+        }
+      });
+    }
     // 不渲染tooltip
     if (!originalTip || ['FormList', 'ProEditTable'].includes(type)) {
       return formItem;

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/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 _dayjs = _interopRequireDefault(require("dayjs"));
 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;
@@ -361,9 +360,7 @@ var Render = function Render(props) {
       };
     }
     // 需要过滤掉的form_item的key
-    var filterFormItemKey = ['onFieldChange',
-    // 'shouldUpdate',
-    'namePath', 'isView', 'parentNames', 'space', 'before', 'after'];
+    var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after'];
     if (type === 'FormList') {
       lastComponentProps.disabled = lastDisabled;
       var lessMode = lastComponentProps.mode === 'less';
@@ -387,31 +384,24 @@ var Render = function Render(props) {
         span: 24 // 默认占一行
       });
     }
-    // 当存在shouldUpdate时补货所有form变更（防止表单onchange设置form值时无法更新的问题）
-    // if (_otherFormItemProps.shouldUpdate) {
-    //   return (
-    //     <Form.Item shouldUpdate={_otherFormItemProps.shouldUpdate} noStyle>
-    //       {() => {
-    //         return (
-    //           <Form.Item
-    //             {...omit(_otherFormItemProps, filterFormItemKey)}
-    //             // @ts-ignore
-    //             _internalItemRender={internalItemRender}
-    //             className={_className}
-    //           >
-    //             {child}
-    //           </Form.Item>
-    //         );
-    //       }}
-    //     </Form.Item>
-    //   );
-    // }
-    var formItem = (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
+
+    var orgFormItem = (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
       // @ts-ignore
       _internalItemRender: internalItemRender,
       className: _className,
       children: child
     }));
+    var formItem = orgFormItem;
+    // 当存在shouldUpdate时捕获所有form变更（防止表单onchange设置form值时无法更新的问题）
+    if (_otherFormItemProps.shouldUpdate) {
+      formItem = (0, _jsxRuntime.jsx)(_antd.Form.Item, {
+        shouldUpdate: _otherFormItemProps.shouldUpdate,
+        noStyle: true,
+        children: function children() {
+          return orgFormItem;
+        }
+      });
+    }
     // 不渲染tooltip
     if (!originalTip || ['FormList', 'ProEditTable'].includes(type)) {
       return formItem;

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/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 _dayjs = _interopRequireDefault(require("dayjs"));
 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.6",
+  "version": "3.3.0-beta.7",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",