update：调整表格加载逻辑

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/view/common/controlAction.hbs

@@ -6,7 +6,8 @@
       removeAction: '{{ctrl.removePSControlAction.psAppDEMethod.codeName}}',
       updateAction: '{{ctrl.updatePSControlAction.psAppDEMethod.codeName}}',
       loadDraftAction: '{{ctrl.getDraftPSControlAction.psAppDEMethod.codeName}}',
-      createAction: '{{ctrl.getDraftPSControlAction.psAppDEMethod.codeName}}',
+      createAction: '{{ctrl.createPSControlAction.psAppDEMethod.codeName}}',
+      fetchAction:'{{ctrl.fetchPSControlAction.psAppDEMethod.codeName}}'
     },
 {{/neq}}
 {{/page.ctrls}}

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/core/modules/widgets/grid-control/grid-control.ts

@@ -352,15 +352,15 @@ export class GridControl extends MainControl {
      * @return {*}
      * @memberof GridControl
      */
-    public useLoad(props: GridControlProps){
+    public useLoad(props: GridControlProps) {
         const { viewSubject, controlName } = this.controlState;
-        const load = async (opt: any = {})=>{
+        const load = async (opt: any = {}) => {
             try {
                 const {
                     controlService, context, viewParams, showBusyIndicator, controlAction, gridSort
                 } = this.controlState;
                 const { gridPaging, data } = toRefs(this.controlState);
-                if (!controlAction.loadAction) {
+                if (!controlAction.fetchAction) {
                     return;
                 }
                 const { noSort, minorSortDir, minorSortPSDEF } = gridSort;
@@ -369,16 +369,16 @@ export class GridControl extends MainControl {
                 let _context = deepCopy(context ? context : {});
                 let _viewParams = deepCopy(viewParams ? viewParams : {});
                 if (noSort && minorSortDir && minorSortPSDEF) {
-                    Object.assign(_viewParams, { sort: `${minorSortPSDEF},${minorSortDir}`});
+                    Object.assign(_viewParams, { sort: `${minorSortPSDEF},${minorSortDir}` });
                 }
                 if (enablePagingBar) {
-                    Object.assign(_viewParams, { page: current - 1, size: pageSize});
+                    Object.assign(_viewParams, { page: current - 1, size: pageSize });
                 }
-                Object.assign(arg, { viewParams: _viewParams });
+                Object.assign(arg, _viewParams);
                 const response = await controlService.get(
                     _context,
                     arg,
-                    { action: controlAction.loadAction, isLoading: showBusyIndicator}
+                    { action: controlAction.fetchAction, isLoading: showBusyIndicator }
                 );
                 if (response.status || response.status == 200) {
                     data.value = response.data;
@@ -395,20 +395,18 @@ export class GridControl extends MainControl {
                 console.log(error);
             }
         }
-
         // 订阅viewSubject,监听load行为
-        if(viewSubject){
-            let subscription = viewSubject.subscribe(({ tag, action, data }: IActionParam)=>{
-                if(Object.is(controlName, tag) && Object.is("load", action) ){
+        if (viewSubject) {
+            let subscription = viewSubject.subscribe(({ tag, action, data }: IActionParam) => {
+                if (Object.is(controlName, tag) && Object.is("load", action)) {
                     load(data)
                 }
             })
             // 部件卸载时退订viewSubject
-            onUnmounted(()=>{
+            onUnmounted(() => {
                 subscription.unsubscribe();
             })
         }
-
         return {
             load: load
         }