Merge remote-tracking branch 'origin/master'

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/form-detail/form-button.hbs

+{{#eq item.psLayoutPos 'FLEX'}}
+<div style="flex-grow: {{#if item.psLayoutPos.grow}}{{item.psLayoutPos.grow}}{{else}}0{{/if}};">
+  <a-button 
+    type="primary"
+    class="ibiz-form-button{{#if item.psSysCss}}{{item.psSysCss.cssName}}{{/if}}"
+    style="{{#if item.width}}width: {{item.width}}px;{{/if}}{{#if item.height}}height: {{item.height}}px;{{/if}}">
+    {{#if item.psSysImage}}
+    <template #icon>
+      <IbizIconText {{#if item.psSysImage.cssClass}}:iconClass="{{item.psSysImage.cssClass}}"{{/if}} {{#if item.psSysImage.imagePath}}:imgPath="{{item.psSysImage.imagePath}}"{{/if}}/>
+    </template>
+    {{/if}}
+    {{#if item.showCaption}}
+    {{item.caption}}
+    {{/if}}
+  </a-button>
+</div>
+{{else}}
+<a-col
+{{> @macro/front-end/ctrl/common/layoutPos.hbs item=item.psLayoutPos}} >
+  <a-button 
+    type="primary"
+    class="ibiz-form-button{{#if item.psSysCss}}{{item.psSysCss.cssName}}{{/if}}"
+    style="{{#if item.width}}width: {{item.width}}px;{{/if}}{{#if item.height}}height: {{item.height}}px;{{/if}}">
+    {{#if item.psSysImage}}
+    <template #icon>
+      <IbizIconText {{#if item.psSysImage.cssClass}}:iconClass="{{item.psSysImage.cssClass}}"{{/if}} {{#if item.psSysImage.imagePath}}:imgPath="{{item.psSysImage.imagePath}}"{{/if}}/>
+    </template>
+    {{/if}}
+    {{#if item.showCaption}}
+    {{item.caption}}
+    {{/if}}
+  </a-button>
+</a-col>
+{{/eq}}
\ No newline at end of file

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/form-detail/form-tabpanel.hbs

+{{#eq item.psLayoutPos 'FLEX'}}
+<div style="flex-grow: {{#if item.psLayoutPos.grow}}{{item.psLayoutPos.grow}}{{else}}0{{/if}};">
+  <a-tabs class="ibiz-form-page">
+    {{#each item.psDEFormPages as | formPage | }}
+    {{>(lookup . 'formPage.detailType') item=formPage }}
+    {{/each}}
+  </a-tabs>
+</div>
+{{else}}
+<a-col
+{{> @macro/front-end/ctrl/common/layoutPos.hbs item=item.psLayoutPos}} >
+  <a-tabs class="ibiz-form-page">
+    {{#each item.psDEFormPages as | formPage | }}
+    {{>(lookup . 'formPage.detailType') item=formPage }}
+    {{/each}}
+  </a-tabs>
+</a-col>
+{{/eq}}
\ No newline at end of file

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/form-detail/include-form.hbs

 {{#*inline "FORMPAGE"}}{{>@macro/form-detail/form-page.hbs}}{{/inline}}
 {{#*inline "GROUPPANEL"}}{{>@macro/form-detail/form-group.hbs}}{{/inline}}
 {{#*inline "FORMITEM"}}{{>@macro/form-detail/form-item.hbs}}{{/inline}}
+{{#*inline "TABPANEL"}}{{>@macro/form-detail/form-tabpanel.hbs}}{{/inline}}
+{{#*inline "BUTTON"}}{{>@macro/form-detail/form-button.hbs}}{{/inline}}
 {{#*inline "FORMDETAILSMODEL"}}{{>@macro/form-detail/form-details-model.hbs}}{{/inline}}
\ No newline at end of file

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

@@ -424,7 +424,7 @@ export class GridControl extends MainControl {
 
         for (const item of items) {
           const { updateAction, createAction } = controlAction;
-          const saveAction: any = item.rowDataState == "update" ? updateAction : item.rowDataState == "create" ? createAction : "create";
+          const saveAction: any = item.rowDataState == "update" ? updateAction : item.rowDataState == "create" ? createAction : "";
           const saveFunName = item.rowDataState;
           if (!saveAction || !saveFunName) {
             return;
@@ -474,25 +474,48 @@ export class GridControl extends MainControl {
    */
   public useRemove(props: GridControlProps) {
     const { viewSubject, controlName } = this.controlState;
-    const remove = async (opt: any = {}) => {
+    const remove = async (opt: IParam[] = []) => {
       try {
-        const { controlService, context, viewParams, showBusyIndicator, controlAction } = this.controlState;
+        const { controlService, context, viewParams, showBusyIndicator, controlAction, appDeCodeName } = this.controlState;
         if (!controlAction.removeAction) {
           return;
         }
-
+        const dataRef = toRef(this.controlState, "items");
+        const data: IParam[] = [];
+        opt.forEach((item: IParam, index: number) => {
+          if (Object.is(item.srfuf, "0")) {
+            dataRef.value.some((val: any, num: number) => {
+                if (JSON.stringify(val) == JSON.stringify(item)) {
+                    dataRef.value.splice(num, 1);
+                    return true;
+                }
+            });
+          } else {
+            data.push(opt[index]);
+          }
+        });
+        if (data.length > 0) {
+          const keys: string[] = [];
+          data.forEach((item: IParam) => {
+            keys.push(item.srfkey);
+          });
+          const _removeAction = keys.length > 1 ? "removeBatch" : controlAction.removeAction;
           let _context = deepCopy(context);
+          Object.assign(_context, {[appDeCodeName]: keys});
           let _viewParams = deepCopy(viewParams);
-        const arg: any = opt[0];
+          const arg: IParam = {
+            [appDeCodeName]: keys,
+          };
           Object.assign(arg, { viewParams: _viewParams });
           const response = await controlService.remove(
             _context,
             arg,
-          { action: controlAction.removeAction, isLoading: showBusyIndicator },
+            { action: _removeAction, isLoading: showBusyIndicator },
           );
           if (response.status || response.status == 200) {
   
           }
+        }
       } catch (error) {
         // TODO 错误异常处理
         console.log(error);
@@ -585,7 +608,7 @@ export class GridControl extends MainControl {
   }
 
   /**
-   * @description 处理工具栏事件
+   * @description 处理表格操作列事件
    * @param {IActionParam} actionParam 行为参数
    * @param {IParam} [row] 表格行数据
    * @memberof GridControl

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

@@ -35,4 +35,11 @@ export interface MainControlState extends ControlStateBase {
    * @memberof MainControlState
    */
   UIService: IParam;
+
+  /**
+   * @description 应用实体codeName
+   * @type {string}
+   * @memberof MainControlState
+   */
+  appDeCodeName: string;
 }
\ No newline at end of file

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

@@ -40,7 +40,7 @@ export class GridService<T extends ControlVOBase> extends ControlServiceBase<T>
   public async get(context: IParam, data: IParam, opts: { action: string; isLoading?: boolean }): Promise<any> {
     let _entityService: any = this.entityService;
     const { context: Context, data: Data } = this.handleRequestData(context, data, opts);
-    const action = hasFunction(_entityService, opts.action) ? opts.action : 'GET';
+    const action = hasFunction(_entityService, opts.action) ? opts.action : 'FetchDefault';
     const response = await _entityService[action](Context, Data, opts.isLoading);
     //this.setCopynativeData(response.data);
     response.data?.forEach((item: IParam) =>{

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/widgets/{{appEntities}}/{{ctrls@FORM}}-form/{{ctrls@FORM}}-form.vue.hbs

@@ -42,7 +42,7 @@ const { state, handleEditorEvent } = new FormControl(CtrlConfig).moduleInstall(p
       {{/each }}
     {{/each}}
     {{else}}
-    <a-tabs class="app-form-page">
+    <a-tabs class="ibiz-form-page">
       {{#each ctrl.psDEFormPages as | ctrlPage | }}
       {{>(lookup . 'ctrlPage.detailType') item=ctrlPage }}
       {{/each}}