@teamix/pro 1.3.10 → 1.3.11

package/es/actions/dialog-form.js

@@ -232,6 +232,6 @@ export function useDialogFormAction(action, context) {
 
       _onFinish && _onFinish((_innerFormRef$current2 = innerFormRef.current) === null || _innerFormRef$current2 === void 0 ? void 0 : _innerFormRef$current2.values);
     }
-  }, others), context);
+  }, others), context, true);
 }
 export default useDialogFormAction;

package/es/actions/dialog.d.ts

@@ -26,7 +26,7 @@ export interface DialogAction extends Omit<RequestAction, 'url'>, Omit<QuickShow
     /** 弹窗内容区的组件 */
     component?: any;
 }
-export declare function useDialogAction(action: DialogAction, actionContext?: any): {
+export declare function useDialogAction(action: DialogAction, actionContext?: any, hasForm?: boolean): {
     [x: string]: (e: React.MouseEvent<HTMLElement, MouseEvent>) => Promise<void>;
 };
 export default useDialogAction;

package/es/actions/dialog.js

@@ -69,7 +69,7 @@ function getFooterAlignClass(isDrawer, align) {
 } // 弹窗 -> 请求（点击确认，发送数据请求）
 
 
-export function useDialogAction(action, actionContext) {
+export function useDialogAction(action, actionContext, hasForm) {
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),
       loading = _useState2[0],
@@ -174,22 +174,27 @@ export function useDialogAction(action, actionContext) {
                 case 6:
                   onFinish && onFinish();
                   resolve(true);
-                  _context.next = 16;
+                  _context.next = 18;
                   break;
 
                 case 10:
                   _context.prev = 10;
                   _context.t0 = _context["catch"](2);
-                  setLoading(false); // 如果 beforeRequest 中返回了 false，则直接关闭弹窗
+                  setLoading(false); // 如果 beforeRequest 中返回了 false 并且不是 dialog-form，则直接关闭弹窗
 
-                  if (beforeRequest) {
-                    resolve(true);
+                  if (!(beforeRequest && !hasForm)) {
+                    _context.next = 16;
+                    break;
                   }
 
-                  resolve(false);
+                  resolve(true);
                   return _context.abrupt("return");
 
                 case 16:
+                  resolve(false);
+                  return _context.abrupt("return");
+
+                case 18:
                 case "end":
                   return _context.stop();
               }

package/es/index.d.ts

@@ -26,5 +26,5 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-declare const version = "1.3.10";
+declare const version = "1.3.11";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, hooks, nocode, templates, utils, };

package/es/index.js

@@ -31,6 +31,6 @@ export * from './sidebar';
 export * from './utils'; // export * from './sidebar';
 
 export * from './timeline';
-var version = '1.3.10';
+var version = '1.3.11';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, hooks, nocode, templates, utils };

package/lib/actions/dialog-form.js

@@ -253,7 +253,7 @@ function useDialogFormAction(action, context) {
 
       _onFinish && _onFinish((_innerFormRef$current2 = innerFormRef.current) === null || _innerFormRef$current2 === void 0 ? void 0 : _innerFormRef$current2.values);
     }
-  }, others), context);
+  }, others), context, true);
 }
 
 var _default = useDialogFormAction;

package/lib/actions/dialog.d.ts

@@ -26,7 +26,7 @@ export interface DialogAction extends Omit<RequestAction, 'url'>, Omit<QuickShow
     /** 弹窗内容区的组件 */
     component?: any;
 }
-export declare function useDialogAction(action: DialogAction, actionContext?: any): {
+export declare function useDialogAction(action: DialogAction, actionContext?: any, hasForm?: boolean): {
     [x: string]: (e: React.MouseEvent<HTMLElement, MouseEvent>) => Promise<void>;
 };
 export default useDialogAction;

package/lib/actions/dialog.js

@@ -95,7 +95,7 @@ function getFooterAlignClass(isDrawer, align) {
 } // 弹窗 -> 请求（点击确认，发送数据请求）
 
 
-function useDialogAction(action, actionContext) {
+function useDialogAction(action, actionContext, hasForm) {
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
       loading = _useState2[0],
@@ -200,22 +200,27 @@ function useDialogAction(action, actionContext) {
                 case 6:
                   onFinish && onFinish();
                   resolve(true);
-                  _context.next = 16;
+                  _context.next = 18;
                   break;
 
                 case 10:
                   _context.prev = 10;
                   _context.t0 = _context["catch"](2);
-                  setLoading(false); // 如果 beforeRequest 中返回了 false，则直接关闭弹窗
+                  setLoading(false); // 如果 beforeRequest 中返回了 false 并且不是 dialog-form，则直接关闭弹窗
 
-                  if (beforeRequest) {
-                    resolve(true);
+                  if (!(beforeRequest && !hasForm)) {
+                    _context.next = 16;
+                    break;
                   }
 
-                  resolve(false);
+                  resolve(true);
                   return _context.abrupt("return");
 
                 case 16:
+                  resolve(false);
+                  return _context.abrupt("return");
+
+                case 18:
                 case "end":
                   return _context.stop();
               }

package/lib/index.d.ts

@@ -26,5 +26,5 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-declare const version = "1.3.10";
+declare const version = "1.3.11";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -305,5 +305,5 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 // 设置图标源
 _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 
-var version = '1.3.10';
+var version = '1.3.11';
 exports.version = version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.3.10",
+  "version": "1.3.11",
   "description": "TeamixPro大包",
   "keywords": [
     "aliyun",