tony001 发布系统代码 [后台服务，演示应用]

app_Web/src/model/panel-detail/panel-detail.ts

@@ -450,10 +450,16 @@ export class PanelDetailModel {
                 Object.assign(boxStyle, { 'flex-grow': 1, 'min-width': `${(100 / 12)}%`, 'height': '100%' });
             }
         }
+        if (this.parentName && this.panel) {
+            const parentItem = this.panel.layoutModelDetails[this.parentName];
+            // 当前项兄弟项个数大于1且本身设置宽或者高默认不占满
+            if (parentItem && parentItem.details && parentItem.details.length > 1) {
                 const boxSizeStyle: any = this.getBoxSizeStyle();
                 if (boxSizeStyle && Object.keys(boxSizeStyle).length > 0) {
                     Object.assign(boxStyle, { 'flex-grow': 0 });
                 }
+            }
+        }
         return boxStyle;
     }
 

app_Web/src/pages/sample/ibizcustomer-media-test-edit-view/ibizcustomer-media-test-edit-view-base.vue

@@ -82,7 +82,7 @@
         <template #container6>
     <app-simpleflex-container name="container6" :layoutModelDetails="layoutModelDetails">
         <template #static_carousel1>
-        <app-rawitem-carousel name="static_carousel1" type="STATIC_CAROUSEL" :value="[ { key:'img1', iconClass:'fa fa-bank', type:'icon' }, { key:'img2', imgPath:'assets/img/logo2.png', type:'img' }, { key:'img3', iconClass:'fa fa-steam-square', type:'icon' }, { key:'img4', imgPath:'/assets/img/login_bg.png', type:'img' }, { key:'autoplay', value:'1', }, { key:'timespan', value:'2000', } ]" :layoutModelDetails="layoutModelDetails" :data="layoutData"/>
+        <app-rawitem-carousel name="static_carousel1" type="STATIC_CAROUSEL" :value="[ { key:'img1', value:'fa fa-bank', type:'icon' }, { key:'img2', value:'assets/img/logo2.png', type:'img' }, { key:'img3', value:'fa fa-steam-square', type:'icon' }, { key:'img4', value:'/assets/img/login_bg.png', type:'img' }, { key:'autoplay', value:'1', }, { key:'timespan', value:'2000', } ]" :layoutModelDetails="layoutModelDetails" :data="layoutData"/>
         </template>
     </app-simpleflex-container>
         </template>

app_Web/src/service/ibizcustomer/ibizcustomer-service-base.ts

@@ -108,7 +108,7 @@ export default class IBIZCustomerServiceBase extends EntityService {
     }
         public async GetDynaCarousel(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
 			let tempData:any = JSON.parse(JSON.stringify(data));
-        tempData['field_carousel'] =  [ { key:'img1', iconClass:'fa fa-bank', type:'icon' }, { key:'img2', imgPath:'assets/img/logo2.png', type:'img' }, { key:'img3', iconClass:'fa fa-steam-square', type:'icon' }, { key:'img4', imgPath:'/assets/img/login_bg.png', type:'img' }, { key:'autoplay', value:'1', }, { key:'timespan', value:'2000', } ]
+        tempData['field_carousel'] =  [ { key:'img1', value:'fa fa-bank', type:'icon' }, { key:'img2', value:'assets/img/logo2.png', type:'img' }, { key:'img3', value:'fa fa-steam-square', type:'icon' }, { key:'img4', value:'/assets/img/login_bg.png', type:'img' }, { key:'autoplay', value:'1', }, { key:'timespan', value:'2000', } ]
         return {"status":200,"data":tempData};
 }
         public async GetDynaImg(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {

app_Web/src/uiservice/ibizbook/custom-edit-ui-logic-base.ts

@@ -28,27 +28,32 @@ export default class CustomEditUILogicBase {
      * @memberof CustomEditUILogicBase
      */
     protected logicParams: any[] = [
-        {
-            name: '当前视图',
-            codeName: 'view',
-            activeViewParam: true,
-        },
         {
             name: '传入变量',
             codeName: 'Default',
             default: true,
             entityParam: true,
         },
+        {
+            name: '当前激活部件',
+            codeName: 'grid',
+            activeCtrlParam: true,
+            ctrlParam: true,
+        },
         {
             name: '当前容器',
             codeName: 'currentContainer',
             activeContainerParam: true,
         },
         {
-            name: '当前激活部件',
-            codeName: 'grid',
-            activeCtrlParam: true,
-            ctrlParam: true,
+            name: '当前视图',
+            codeName: 'view',
+            activeViewParam: true,
+        },
+        {
+            name: '表格数据',
+            codeName: 'gridData',
+            entityListParam: true,
         },
     ];
 
@@ -122,6 +127,33 @@ export default class CustomEditUILogicBase {
     protected async execute_begin_node(actionContext: UIActionContext) {
         actionContext.setResult(actionContext.defaultParam.getReal());
         console.log('已完成执行 开始 节点');
+        await this.execute_bindparam1_node(actionContext);
+    }
+    
+    /**
+     * 绑定表格选中数据
+     *
+     * @param {UIActionContext} actionContext 界面逻辑上下文
+     * @memberof CustomEditUILogicBase
+     */
+    protected async execute_bindparam1_node(actionContext: UIActionContext) {
+        try {
+            //  源数据
+            const srcParam = actionContext.getParam('grid');
+            //  目标数据
+            const dstParam = actionContext.getParam('gridData');
+            //  源属性
+            const srcFieldName: string = 'selections';
+            if (srcFieldName) {
+                dstParam.bind(srcParam.get(srcFieldName));
+            } else {
+                dstParam.bind(srcParam.getReal());
+            }
+            actionContext.bindLastReturnParam(null);
+        } catch (error: any) {
+            throw new Error(`逻辑参数表格数据 ${error && error.message ? error.message : '发生未知错误!'}`);
+        }
+        console.log('已完成执行 绑定表格选中数据 节点');
         await this.execute_deuiaction1_node(actionContext);
     }
     

app_Web/src/widgets/ibizbook/default-searchform/default-searchform-base.vue

@@ -671,7 +671,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr5DataView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -707,7 +707,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public loadDraft(opt: any = {},mode?:string): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr5DataView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

app_Web/src/widgets/ibizorder/card-navigation-dataview/card-navigation-dataview-base.vue

@@ -665,7 +665,7 @@ export default class CardNavigationBase extends Vue implements ControlInterface
      */
     public load(opt: any = {}, isReset: boolean = false): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView_layout' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }      
         const arg: any = {...opt};
@@ -744,7 +744,7 @@ export default class CardNavigationBase extends Vue implements ControlInterface
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView_layout' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -853,7 +853,7 @@ export default class CardNavigationBase extends Vue implements ControlInterface
             try {
                 if(Object.is(item.rowDataState, 'create')){
                     if(!this.createAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView_layout' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView' + (this.$t('app.list.notConfig.createAction') as string) });
                     }else{
                       Object.assign(item,{viewparams:this.viewparams});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -861,7 +861,7 @@ export default class CardNavigationBase extends Vue implements ControlInterface
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView_layout' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView' + (this.$t('app.list.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizorder){

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json

@@ -2126,7 +2126,7 @@
       "getPSDEUILogicLinks" : [ {
         "getDstPSDEUILogicNode" : {
           "modelref" : true,
-          "id" : "DEUIACTION1"
+          "id" : "BINDPARAM1"
         },
         "linkMode" : 0,
         "name" : "连接名称",
@@ -2136,6 +2136,31 @@
         }
       } ],
       "parallelOutput" : true
+    }, {
+      "codeName" : "BINDPARAM1",
+      "getDstPSDEUILogicParam" : {
+        "modelref" : true,
+        "id" : "gridData"
+      },
+      "logicNodeType" : "BINDPARAM",
+      "name" : "绑定表格选中数据",
+      "getPSDEUILogicLinks" : [ {
+        "getDstPSDEUILogicNode" : {
+          "modelref" : true,
+          "id" : "DEUIACTION1"
+        },
+        "linkMode" : 0,
+        "name" : "连接名称",
+        "getSrcPSDEUILogicNode" : {
+          "modelref" : true,
+          "id" : "BINDPARAM1"
+        }
+      } ],
+      "srcFieldName" : "selections",
+      "getSrcPSDEUILogicParam" : {
+        "modelref" : true,
+        "id" : "grid"
+      }
     }, {
       "codeName" : "END1",
       "logicNodeType" : "END",
@@ -2157,7 +2182,7 @@
       },
       "getDstPSDEUILogicParam" : {
         "modelref" : true,
-        "id" : "Default"
+        "id" : "gridData"
       },
       "logicNodeType" : "DEUIACTION",
       "name" : "界面行为",
@@ -2175,27 +2200,32 @@
       } ]
     } ],
     "getPSDEUILogicParams" : [ {
-      "codeName" : "view",
-      "logicName" : "当前视图",
-      "name" : "当前视图",
-      "activeViewParam" : true
-    }, {
       "codeName" : "Default",
       "logicName" : "传入变量",
       "name" : "传入变量",
       "default" : true,
       "entityParam" : true
-    }, {
-      "codeName" : "currentContainer",
-      "logicName" : "当前容器",
-      "name" : "当前容器",
-      "activeContainerParam" : true
     }, {
       "codeName" : "grid",
       "logicName" : "当前激活部件",
       "name" : "当前激活部件",
       "activeCtrlParam" : true,
       "ctrlParam" : true
+    }, {
+      "codeName" : "currentContainer",
+      "logicName" : "当前容器",
+      "name" : "当前容器",
+      "activeContainerParam" : true
+    }, {
+      "codeName" : "view",
+      "logicName" : "当前视图",
+      "name" : "当前视图",
+      "activeViewParam" : true
+    }, {
+      "codeName" : "gridData",
+      "logicName" : "表格数据",
+      "name" : "表格数据",
+      "entityListParam" : true
     } ],
     "getStartPSDEUILogicNode" : {
       "modelref" : true,

demo-core/src/main/resources/liquibase/h2_table.xml

@@ -172,7 +172,7 @@
 
 
     <!--输出实体[IBIZBOOK]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-534-7">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-542-7">
         <createTable tableName="T_IBIZBOOK">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>