@zat-design/sisyphus-react 3.11.5-beta.7 → 3.11.5-beta.8

package/.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "kisstkondoros.vscode-codemetrics"
+    ]
+}

package/es/ProDrawerForm/components/ProDrawer/index.js

@@ -64,19 +64,20 @@ var ProDrawer = function ProDrawer(_ref) {
         return clearTimeout(timeoutId);
       }; // 清理定时器
     }
+    setInitialSnapshot('');
   }, [visible]); // 当 visible 变化时执行
   // 快照对比
   var compareSnapshots = function compareSnapshots() {
     if (!ref.current) return false;
-    return ref.current.innerHTML !== initialSnapshot;
+    return ref.current.innerHTML === initialSnapshot;
   };
   var onConfirm = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     var _locale$ProDrawerForm, _locale$ProDrawerForm2, _locale$ProDrawerForm3, _locale$ProDrawerForm4;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          // 如果当前是查看状态，或者不需要确认关闭，或者快照对比不一致，则直接关闭
-          if (isView || !isConfirmClose || !compareSnapshots()) {
+          // 如果当前是查看状态，或者不需要确认关闭，或者快照对比一致，则直接关闭
+          if (isView || !isConfirmClose || compareSnapshots()) {
             onCancel && onCancel();
           } else if (!modalRef.current) {
             modalRef.current = _Modal.confirm(_objectSpread({

package/es/ProEditTable/index.js

@@ -439,7 +439,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
             columns: columns,
             page: page,
             pagination: pagination,
-            setState: setState
+            setState: setState,
+            isView: isView
           });
         }
       }) : null]

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

@@ -35,7 +35,7 @@ export declare const handleScrollToError: () => void;
  * @returns 深拷贝后的对象，其中的React节点会被保留
  */
 export declare function cloneDeepFilterNode(value: any): any;
-export declare const onPageCheck: ({ form, name, value, columns, page, pagination, setState }: {
+export declare const onPageCheck: ({ form, name, value, columns, page, pagination, setState, isView }: {
     form: any;
     name: any;
     value: any;
@@ -43,4 +43,5 @@ export declare const onPageCheck: ({ form, name, value, columns, page, paginatio
     page: any;
     pagination: any;
     setState: any;
+    isView: any;
 }) => Promise<void>;

package/es/ProEditTable/utils/tools.js

@@ -336,12 +336,12 @@ var handleCheckCellValue = /*#__PURE__*/function () {
 }();
 export var onPageCheck = /*#__PURE__*/function () {
   var _ref8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref7) {
-    var form, name, value, columns, page, pagination, setState, pageNum, pageSize, pageArr, flag, errorNum, errorPageNum, _i, _pageArr, item, start, end, nextValues, _iterator2, _step2, record, _iterator3, _step3, column, result, nextState;
+    var form, name, value, columns, page, pagination, setState, isView, pageNum, pageSize, pageArr, flag, errorNum, errorPageNum, _i, _pageArr, item, start, end, nextValues, _iterator2, _step2, record, _iterator3, _step3, column, result, nextState;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          form = _ref7.form, name = _ref7.name, value = _ref7.value, columns = _ref7.columns, page = _ref7.page, pagination = _ref7.pagination, setState = _ref7.setState;
-          if (!pagination) {
+          form = _ref7.form, name = _ref7.name, value = _ref7.value, columns = _ref7.columns, page = _ref7.page, pagination = _ref7.pagination, setState = _ref7.setState, isView = _ref7.isView;
+          if (!(pagination && !isView)) {
             _context2.next = 75;
             break;
           }

package/lib/ProDrawerForm/components/ProDrawer/index.js

@@ -67,19 +67,20 @@ var ProDrawer = function ProDrawer(_ref) {
         return clearTimeout(timeoutId);
       }; // 清理定时器
     }
+    setInitialSnapshot('');
   }, [visible]); // 当 visible 变化时执行
   // 快照对比
   var compareSnapshots = function compareSnapshots() {
     if (!ref.current) return false;
-    return ref.current.innerHTML !== initialSnapshot;
+    return ref.current.innerHTML === initialSnapshot;
   };
   var onConfirm = (0, _react.useCallback)(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
     var _locale$ProDrawerForm, _locale$ProDrawerForm2, _locale$ProDrawerForm3, _locale$ProDrawerForm4;
     return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          // 如果当前是查看状态，或者不需要确认关闭，或者快照对比不一致，则直接关闭
-          if (isView || !isConfirmClose || !compareSnapshots()) {
+          // 如果当前是查看状态，或者不需要确认关闭，或者快照对比一致，则直接关闭
+          if (isView || !isConfirmClose || compareSnapshots()) {
             onCancel && onCancel();
           } else if (!modalRef.current) {
             modalRef.current = _antd.Modal.confirm((0, _objectSpread2.default)({

package/lib/ProEditTable/index.js

@@ -442,7 +442,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
             columns: columns,
             page: page,
             pagination: pagination,
-            setState: setState
+            setState: setState,
+            isView: isView
           });
         }
       }) : null]

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

@@ -35,7 +35,7 @@ export declare const handleScrollToError: () => void;
  * @returns 深拷贝后的对象，其中的React节点会被保留
  */
 export declare function cloneDeepFilterNode(value: any): any;
-export declare const onPageCheck: ({ form, name, value, columns, page, pagination, setState }: {
+export declare const onPageCheck: ({ form, name, value, columns, page, pagination, setState, isView }: {
     form: any;
     name: any;
     value: any;
@@ -43,4 +43,5 @@ export declare const onPageCheck: ({ form, name, value, columns, page, paginatio
     page: any;
     pagination: any;
     setState: any;
+    isView: any;
 }) => Promise<void>;

package/lib/ProEditTable/utils/tools.js

@@ -345,12 +345,12 @@ var handleCheckCellValue = /*#__PURE__*/function () {
 }();
 var onPageCheck = exports.onPageCheck = /*#__PURE__*/function () {
   var _ref8 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(_ref7) {
-    var form, name, value, columns, page, pagination, setState, pageNum, pageSize, pageArr, flag, errorNum, errorPageNum, _i, _pageArr, item, start, end, nextValues, _iterator2, _step2, record, _iterator3, _step3, column, result, nextState;
+    var form, name, value, columns, page, pagination, setState, isView, pageNum, pageSize, pageArr, flag, errorNum, errorPageNum, _i, _pageArr, item, start, end, nextValues, _iterator2, _step2, record, _iterator3, _step3, column, result, nextState;
     return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          form = _ref7.form, name = _ref7.name, value = _ref7.value, columns = _ref7.columns, page = _ref7.page, pagination = _ref7.pagination, setState = _ref7.setState;
-          if (!pagination) {
+          form = _ref7.form, name = _ref7.name, value = _ref7.value, columns = _ref7.columns, page = _ref7.page, pagination = _ref7.pagination, setState = _ref7.setState, isView = _ref7.isView;
+          if (!(pagination && !isView)) {
             _context2.next = 75;
             break;
           }

package/package.json

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