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

app_Web/public/assets/json/view-message-group.json

@@ -158,6 +158,9 @@
 "VMGroup41":[
 {"tag":"ViewMsg40","position":"TOP","type":"ERROR"}
 ],
+"VMGroup57":[
+{"tag":"ViewMsg56","position":"TOP","type":"ERROR"}
+],
 "VMGroup20":[
 {"tag":"ViewMsg19","position":"TOP","type":"ERROR"}
 ],

app_Web/src/locale/lang/en-US.ts

@@ -228,7 +228,6 @@ export default {
                 menuitem61: "动态节点（代码表）",
                 menuitem62: "动态节点（实体）",
                 menuitem63: "右键操作",
-                menuitem64: "动态参数过滤",
                 menuitem110: "树表格",
                 menuitem37: "图表",
                 menuitem38: "柱状图",

app_Web/src/locale/lang/zh-CN.ts

@@ -228,7 +228,6 @@ export default {
                 menuitem61: "动态节点（代码表）",
                 menuitem62: "动态节点（实体）",
                 menuitem63: "右键操作",
-                menuitem64: "动态参数过滤",
                 menuitem110: "树表格",
                 menuitem37: "图表",
                 menuitem38: "柱状图",

app_Web/src/locale/lanres/entities/ibizsample0003/ibizsample0003_en_US.ts

@@ -325,8 +325,7 @@ export default {
 			root: "root",
 		},
 		uiactions: {
-        edit: "Edit",
-        refresh: "刷新",
+        refreshall: "刷新",
 		},
 	},
 	tree02_treeview: {

app_Web/src/locale/lanres/entities/ibizsample0003/ibizsample0003_zh_CN.ts

@@ -324,8 +324,7 @@ export default {
 			root: "root",
 		},
 		uiactions: {
-			edit: "编辑",
-			refresh: "刷新",
+			refreshall: "刷新",
 		},
 	},
 	tree02_treeview: {

app_Web/src/message/message-service-register.ts

@@ -71,9 +71,10 @@ export class MessageServiceRegister {
         this.allMessageService.set('ViewMsg46', () => import('@/message/view-msg46/view-msg46-message'));
         this.allMessageService.set('ViewMsg42', () => import('@/message/view-msg42/view-msg42-message'));
         this.allMessageService.set('ViewMsg39', () => import('@/message/view-msg39/view-msg39-message'));
-        this.allMessageService.set('ViewMsg13', () => import('@/message/view-msg13/view-msg13-message'));
         this.allMessageService.set('ViewMsg44', () => import('@/message/view-msg44/view-msg44-message'));
+        this.allMessageService.set('ViewMsg13', () => import('@/message/view-msg13/view-msg13-message'));
         this.allMessageService.set('ViewMsg45', () => import('@/message/view-msg45/view-msg45-message'));
+        this.allMessageService.set('ViewMsg56', () => import('@/message/view-msg56/view-msg56-message'));
         this.allMessageService.set('ViewMsg50', () => import('@/message/view-msg50/view-msg50-message'));
         this.allMessageService.set('ViewMsg55', () => import('@/message/view-msg55/view-msg55-message'));
         this.allMessageService.set('ViewMsg29', () => import('@/message/view-msg29/view-msg29-message'));

app_Web/src/message/view-msg56/view-msg56-message-base.ts

+import ViewMessageService from '../view-message-service';
+/**
+ * 树视图---右键菜单和动态参数视图消息服务对象基类
+ *
+ * @export
+ * @class ViewMsg56MessageServiceBase
+ */
+export default class ViewMsg56MessageServiceBase extends ViewMessageService {
+
+
+    /**
+     * Creates an instance of  ViewMsg56MessageServiceBase.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  ViewMsg56MessageServiceBase
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+    /**
+     * 初始化基础参数
+     * 
+     * @memberof ViewMsg56MessageServiceBase
+     */
+    public initBasicParam(){
+        this.id = "1117BA0F-EDB5-4B19-92DD-274E1CC66AAF";
+        this.name = "树视图---右键菜单和动态参数";
+        this.codename = "ViewMsg56";
+        this.title = "";
+        this.content = "本示例展示树视图右键操作功能和动态参数过滤功能；其中在一级节点上配置了刷新全部数据，动态参数过滤见一级节点导航参数配置。";
+        this.closeMode = 0;
+        this.position = "TOP";
+        this.type = "error";
+        this.isEnableRemove = false;
+        this.order = 1;
+        this.dynamicMode = "STATIC";
+        this.hasMessageTemp = false;
+        this.messageType = "TEXT";
+    }
+
+    /**
+     * 转化消息模板标题和内容
+     *      
+     * @target {*} target 返回目标数据
+     * @param {*} context 应用上下文
+     * @param {*} viewparam 视图参数
+     * @param {*} item 源数据
+     * 
+     * @memberof ViewMsg56MessageServiceBase
+     */
+    public translateMessageTemp(target:any,context:any,viewparam:any,item?:any){
+        if(this.hasMessageTemp && Object.is(this.messageType,"HTML")){
+            Object.assign(target,{title:``});
+            Object.assign(target,{content:``});
+        }
+        if(this.hasMessageTemp && Object.is(this.messageType,"TEXT")){
+            Object.assign(target,{title:""});
+            Object.assign(target,{content:""});
+        }
+    }
+
+}
\ No newline at end of file

app_Web/src/message/view-msg56/view-msg56-message.ts

+import ViewMsg56MessageServiceBase from './view-msg56-message-base';
+
+/**
+ * 树视图---右键菜单和动态参数视图消息服务对象
+ *
+ * @export
+ * @class ViewMsg56MessageService
+ */
+export default class ViewMsg56MessageService extends ViewMsg56MessageServiceBase {
+
+    /**
+     * Creates an instance of  ViewMsg56MessageService.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  ViewMsg56MessageService
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+}
\ No newline at end of file

app_Web/src/mock/app/main-menu-appmenu/main-menu-appmenu.ts

@@ -1065,24 +1065,6 @@ mock.onGet('v7/main-menuappmenu').reply((config: any) => {
 	textcls: '',
 	appfunctag: 'Auto235',
 	resourcetag: '',
-},
-		{
-	id: '6814079cc4bbcd8f9662a5cf90c9c2b9',
-	name: 'menuitem64',
-	text: '动态参数过滤',
-	type: 'MENUITEM',
-	counterid: '',
-	tooltip: '动态参数过滤',
-	expanded: false,
-	separator: false,
-	hidden: false,
-	hidesidebar: false,
-	opendefault: false,
-	iconcls: '',
-	icon: '',
-	textcls: '',
-	appfunctag: '',
-	resourcetag: '',
 },
 		{
 	id: 'B0EAF288-157D-415C-A390-3DE9D19C9B05',

app_Web/src/mock/viewconfig/viewconfig.ts

@@ -1901,6 +1901,9 @@ mock.onGet('./assets/json/view-message-group.json').reply((config: any) => {
         "VMGroup41":[
         {"tag":"ViewMsg40","position":"TOP","type":"ERROR"}
         ],
+        "VMGroup57":[
+        {"tag":"ViewMsg56","position":"TOP","type":"ERROR"}
+        ],
         "VMGroup20":[
         {"tag":"ViewMsg19","position":"TOP","type":"ERROR"}
         ],

app_Web/src/pages/sample/ibizsample0003-f4-tree-exp-view/ibizsample0003-f4-tree-exp-view-base.vue

 <template>
 <div class='view-container detreeexpview ibizsample0003-f4-tree-exp-view'>
     <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="ibizsample0003f4treeexpview"></app-studioaction>
-    <card class='view-card   view-no-toolbar'  :dis-hover="true" :bordered="false">
-        <div slot='title' class="header-container">
-        <span class='caption-info'>{{$t(model.srfCaption)}}</span>
-        </div>
+    <card class='view-card  view-no-caption  view-no-toolbar'  :dis-hover="true" :bordered="false">
 
             <div class='view-top-messages'>
-            </div>
+            <app-alert-group position='TOP' :context="context" :viewparam="viewparams" infoGroup='VMGroup57' viewname='ibizsample0003f4treeexpview'></app-alert-group>            </div>
         <div class='content-container'>
         <div class='view-body-messages'>
-        </div>
+        <app-alert-group position='BODY' :context="context" :viewparam="viewparams" infoGroup='VMGroup57' viewname='ibizsample0003f4treeexpview'></app-alert-group>        </div>
             <view_treeexpbar 
                 :viewState="viewState"  
                 :viewparams="viewparams" 
@@ -27,7 +24,7 @@
             </view_treeexpbar>
         </div>
             <div class='view-bottom-messages'>
-            </div>
+            <app-alert-group position='BOTTOM' :context="context" :viewparam="viewparams" infoGroup='VMGroup57' viewname='ibizsample0003f4treeexpview'></app-alert-group>            </div>
     </card>
 </div>
 </template>

app_Web/src/widgets/app/main-menu-appmenu/main-menu-appmenu-model.ts

@@ -1127,25 +1127,6 @@ export default class MainMenuModel {
 	appfunctag: 'Auto235',
 	resourcetag: '',
 	authtag:'Web-MainMenu-menuitem63',
-},
-		{
-	id: '6814079cc4bbcd8f9662a5cf90c9c2b9',
-	name: 'menuitem64',
-	text: '动态参数过滤',
-	type: 'MENUITEM',
-	counterid: '',
-	tooltip: '动态参数过滤',
-	expanded: false,
-	separator: false,
-	hidden: false,
-	hidesidebar: false,
-	opendefault: false,
-	iconcls: '',
-	icon: '',
-	textcls: '',
-	appfunctag: '',
-	resourcetag: '',
-	authtag:'Web-MainMenu-menuitem64',
 },
 		{
 	id: 'B0EAF288-157D-415C-A390-3DE9D19C9B05',

app_Web/src/widgets/ibizbook/tree-table-treegridex/tree-table-treegridex-base.vue

@@ -15,11 +15,6 @@
         <template slot="empty">
             {{$t('entities.ibizbook.treetable_treegridex.nodata')}}
         </template>
-        <el-table-column show-overflow-tooltip prop="author" label="作者" :width="50"  :align="''">
-        <template v-slot="{ row }">
-            <span>{{ getColumnValue(row, 'author') }}</span>
-        </template>
-        </el-table-column>
         <el-table-column show-overflow-tooltip prop="subtext" label="图书描述" :width="50"  :align="''">
         <template v-slot="{ row }">
             <span>{{ getColumnValue(row, 'subtext') }}</span>
@@ -30,6 +25,11 @@
             <span>{{ getColumnValue(row, 'ibizbookname') }}</span>
         </template>
         </el-table-column>
+        <el-table-column show-overflow-tooltip prop="author" label="作者" :width="50"  :align="''">
+        <template v-slot="{ row }">
+            <span>{{ getColumnValue(row, 'author') }}</span>
+        </template>
+        </el-table-column>
     </el-table>
 </template>
 

app_Web/src/widgets/ibizsample0003/tree03-treeview/tree03-treeview-service.ts

@@ -431,6 +431,7 @@ export default class Tree03Service extends ControlService {
                         strNodeId += this.TREENODE_SEPARATOR;
                         strNodeId += strId;
                         Object.assign(treeNode, { id: strNodeId });
+                        Object.assign(treeNode, { iconcls: 'fa fa-list-ul' });
                         Object.assign(treeNode, { expanded: filter.isautoexpand });
                         Object.assign(treeNode, { leaf: false });
                         Object.assign(treeNode, { curData: entity });

app_Web/src/widgets/ibizsample0003/tree04-treeview/tree04-treeview-base.vue

@@ -158,9 +158,6 @@ export default class Tree04Base extends Vue implements ControlInterface {
         if (Object.is($event.tag, 'deuiaction1')) {
             this.topdata_cm_deuiaction1_click(null, 'topdata_cm', $event2);
         }
-        if (Object.is($event.tag, 'deuiaction2')) {
-            this.topdata_cm_deuiaction2_click(null, 'topdata_cm', $event2);
-        }
     }
     
 
@@ -189,39 +186,11 @@ export default class Tree04Base extends Vue implements ControlInterface {
           datas = [params];
         }
         // 界面行为
-        this.Edit(datas, contextJO,paramJO,  $event, xData,this,"IBIZSample0003");
-    }
-
-    /**
-     * 逻辑事件
-     *
-     * @param {*} [params={}]
-     * @param {*} [tag]
-     * @param {*} [$event]
-     * @memberof 
-     */
-    public topdata_cm_deuiaction2_click(params: any = {}, tag?: any, $event?: any) {
-        // 参数
-        // 取数
-        let datas: any[] = [];
-        let xData: any = null;
-        // _this 指向容器对象
-        const _this: any = this;
-        let paramJO:any = {};
-        let contextJO:any = {};
-        xData = this;
-        if (_this.getDatas && _this.getDatas instanceof Function) {
-            datas = [..._this.getDatas()];
-        }
-        if(params){
-          datas = [params];
-        }
-        // 界面行为
-        this.Refresh(datas, contextJO,paramJO,  $event, xData,this,"IBIZSample0003");
+        this.RefreshAll(datas, contextJO,paramJO,  $event, xData,this,"IBIZSample0003");
     }
 
     /**
-     * 编辑
+     * 刷新
      *
      * @param {any[]} args 当前数据
      * @param {any} contextJO 行为附加上下文
@@ -231,38 +200,18 @@ export default class Tree04Base extends Vue implements ControlInterface {
      * @param {*} [actionContext]  执行行为上下文
      * @memberof IBIZSample0003F4TreeExpViewBase
      */
-    public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        if (args.length === 0) {
+    public RefreshAll(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        if (xData && xData.refresh_all && xData.refresh_all instanceof Function) {
+            xData.refresh_all();
             return;
         }
         const _this: any = this;
-        if (_this.opendata && _this.opendata instanceof Function) {
-            const data: any = { };
-            if (args.length > 0) {
-                Object.assign(data, { ibizsample0003: args[0].ibizsample0003 })
-            }
-            _this.opendata([{ ...data }], params, $event, xData);
-        } else {
-            _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
+        if (_this.refresh_all && _this.refresh_all instanceof Function) {
+            _this.refresh_all();
+            return;
         }
-    }
-    /**
-     * 刷新
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZSample0003F4TreeExpViewBase
-     */
-    public Refresh(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        const _this: any = this;
-        if (xData && xData.refresh && xData.refresh instanceof Function) {
-            xData.refresh(args);
-        } else if (_this.refresh && _this.refresh instanceof Function) {
-            _this.refresh(args);
+        if (_this.engine) {
+            _this.engine.load();
         }
     }
 
@@ -506,8 +455,7 @@ export default class Tree04Base extends Vue implements ControlInterface {
      * @memberof Tree04Base
      */
      public actionModel: any = {
-        topdata_deuiaction1: {name:'deuiaction1',nodeOwner:'topdata',type: 'DEUIACTION', tag: 'Edit', actiontarget: 'SINGLEKEY', noprivdisplaymode:2, visabled: true, disabled: false},
-        topdata_deuiaction2: {name:'deuiaction2',nodeOwner:'topdata',type: 'DEUIACTION', tag: 'Refresh', noprivdisplaymode:2, visabled: true, disabled: false},
+        topdata_deuiaction1: {name:'deuiaction1',nodeOwner:'topdata',type: 'DEUIACTION', tag: 'RefreshAll', noprivdisplaymode:2, visabled: true, disabled: false},
     }
 
     /**
@@ -948,12 +896,8 @@ export default class Tree04Base extends Vue implements ControlInterface {
             <dropdown class="tree-right-menu" trigger="custom" visible={true} on-on-click={($event: any) => this.topdata_cm_click({tag: $event})}>
                 <dropdown-menu slot="list">
                             <dropdown-item name='deuiaction1' v-show={this.copyActionModel['deuiaction1'].visabled} disabled={this.copyActionModel['deuiaction1'].disabled}>
-                        <i class='fa fa-edit'></i>
-                        编辑
-                    </dropdown-item>
-                            <dropdown-item name='deuiaction2' v-show={this.copyActionModel['deuiaction2'].visabled} disabled={this.copyActionModel['deuiaction2'].disabled}>
                         <i class='fa fa-refresh'></i>
-                        刷新
+                        刷新全部
                     </dropdown-item>
                 </dropdown-menu>
             </dropdown>

app_Web/src/widgets/ibizsample0003/tree04-treeview/tree04-treeview-service.ts

@@ -219,6 +219,7 @@ export default class Tree04Service extends ControlService {
                         strNodeId += this.TREENODE_SEPARATOR;
                         strNodeId += strId;
                         Object.assign(treeNode, { id: strNodeId });
+                        Object.assign(treeNode, { iconcls: 'fa fa-list-ul' });
                         Object.assign(treeNode, { expanded: filter.isautoexpand });
                         Object.assign(treeNode, { leaf: false });
                         Object.assign(treeNode, { curData: entity });
@@ -363,6 +364,7 @@ export default class Tree04Service extends ControlService {
                         strNodeId += this.TREENODE_SEPARATOR;
                         strNodeId += strId;
                         Object.assign(treeNode, { id: strNodeId });
+                        Object.assign(treeNode, { iconcls: 'fa fa-toggle-up' });
                         Object.assign(treeNode, { expanded: filter.isautoexpand });
                         Object.assign(treeNode, { leaf: false });
                         Object.assign(treeNode, { curData: entity });

demo-core/src/main/java/cn/ibizlab/core/sample/mapping/IBIZBOOKDataImport.java

@@ -8,16 +8,16 @@ import java.util.List;
 public interface IBIZBOOKDataImport {
     @Mappings({
         @Mapping(target = "ibizbookid", source = "ibizbookid"),
+        @Mapping(target = "createdate", source = "createdate"),
+        @Mapping(target = "ibizbookname", source = "ibizbookname"),
+        @Mapping(target = "updateman", source = "updateman"),
+        @Mapping(target = "updatedate", source = "updatedate"),
+        @Mapping(target = "type", source = "type"),
         @Mapping(target = "press", source = "press"),
         @Mapping(target = "author", source = "author"),
-        @Mapping(target = "type", source = "type"),
         @Mapping(target = "price", source = "price"),
         @Mapping(target = "booknumber", source = "booknumber"),
         @Mapping(target = "createman", source = "createman"),
-        @Mapping(target = "createdate", source = "createdate"),
-        @Mapping(target = "ibizbookname", source = "ibizbookname"),
-        @Mapping(target = "updateman", source = "updateman"),
-        @Mapping(target = "updatedate", source = "updatedate"),
     })
     @BeanMapping(ignoreByDefault = true)
     IBIZBOOK toDomain(IBIZBOOK entity);

demo-core/src/main/java/cn/ibizlab/core/sample/mapping/IBIZOrderImport.java

@@ -8,9 +8,9 @@ import java.util.List;
 public interface IBIZOrderImport {
     @Mappings({
         @Mapping(target = "ibizorderid", source = "ibizorderid"),
-        @Mapping(target = "orderuid", source = "orderuid"),
         @Mapping(target = "ordertype", source = "ordertype"),
         @Mapping(target = "ordertime", source = "ordertime"),
+        @Mapping(target = "orderuid", source = "orderuid"),
         @Mapping(target = "ibizordername", source = "ibizordername"),
     })
     @BeanMapping(ignoreByDefault = true)

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

@@ -32,7 +32,7 @@
 
 
     <!--输出实体[IBIZAPPEDITOR]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizappeditor-29-2">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizappeditor-31-2">
         <createTable tableName="T_IBIZAPPEDITOR">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -118,7 +118,7 @@
 
 
     <!--输出实体[IBIZBOOK]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-811-5">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-816-5">
         <createTable tableName="T_IBIZBOOK">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -590,7 +590,7 @@
 
 
     <!--输出实体[IBIZSAMPLE0003]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizsample0003-19-19">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizsample0003-28-19">
         <createTable tableName="T_IBIZSAMPLE0003">
                 <column name="IBIZSAMPLE0003NAME" remarks="" type="VARCHAR(200)">
                 </column>

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

@@ -79,7 +79,7 @@
          </createView>
      </changeSet>
         <!--输出实体[IBIZSAMPLE0003]视图结构信息 runOnChange="true"  当视图发生变更时，通过liquibase强刷prod的视图，实现视图的同步-->
-     <changeSet author="a_LAB01_df847bdfd" id="view-ibizsample0003-19-15" runOnChange="true">
+     <changeSet author="a_LAB01_df847bdfd" id="view-ibizsample0003-28-15" runOnChange="true">
          <createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZSAMPLE0003">
                <![CDATA[ SELECT t1.[CREATEDATE], t1.[CREATEMAN], t1.[FIELD01], t1.[IBIZSAMPLE0003ID], t1.[IBIZSAMPLE0003NAME], t1.[MEMO], t1.[PIBIZSAMPLE0003ID], t11.[IBIZSAMPLE0003NAME] AS [PIBIZSAMPLE0003NAME], t1.[UPDATEDATE], t1.[UPDATEMAN] FROM [T_IBIZSAMPLE0003] t1  LEFT JOIN T_IBIZSAMPLE0003 t11 ON t1.PIBIZSAMPLE0003ID = t11.IBIZSAMPLE0003ID  ]]>
          </createView>