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

app_Web/public/assets/json/portlet-data.json

@@ -304,6 +304,22 @@
 "groupName":"（未分类）",
 },
 {"type":"app",
+"appCodeName":"IBIZOrder",
+"appName":"订单",
+"portletCodeName": "portalComponentsOperation",
+"portletName": "操作栏",
+"groupCodeName":"Ungroup",
+"groupName":"（未分类）",
+"portletTYpe":"ACTIONBAR","componentName":"app-ibizorder-portal-components-operation-portlet"},
+{"type":"app",
+"appCodeName":"Web",
+"appName":"演示应用",
+"portletCodeName": "portalComponentsWeb",
+"portletName": "网页部件",
+"groupCodeName":"Ungroup",
+"groupName":"（未分类）",
+"portletTYpe":"HTML","componentName":"app-portal-components-web-portlet"},
+{"type":"app",
 "appCodeName":"IBIZOrderDetail",
 "appName":"订单明细",
 "portletCodeName": "portalComponentsList3",
@@ -328,22 +344,6 @@
 "groupName":"（未分类）",
 "portletTYpe":"LIST","componentName":"app-ibizorder-detail-portal-components-list4-portlet"},
 {"type":"app",
-"appCodeName":"IBIZOrder",
-"appName":"订单",
-"portletCodeName": "portalComponentsOperation",
-"portletName": "操作栏",
-"groupCodeName":"Ungroup",
-"groupName":"（未分类）",
-"portletTYpe":"ACTIONBAR","componentName":"app-ibizorder-portal-components-operation-portlet"},
-{"type":"app",
-"appCodeName":"IBIZOrder",
-"appName":"订单",
-"portletCodeName": "portalComponentsWeb",
-"portletName": "网页部件",
-"groupCodeName":"Ungroup",
-"groupName":"（未分类）",
-"portletTYpe":"HTML","componentName":"app-ibizorder-portal-components-web-portlet"},
-{"type":"app",
 "appCodeName":"IBIZAPPVIEW",
 "appName":"应用视图",
 "portletCodeName": "appViewAmount",

app_Web/src/mock/portlet/portlet.ts

@@ -314,6 +314,22 @@ mock.onGet('./assets/json/portlet-data.json').reply((config: any) => {
     "groupName":"（未分类）",
     },
     {"type":"app",
+    "appCodeName":"IBIZOrder",
+    "appName":"订单",
+    "portletCodeName": "portalComponentsOperation",
+    "portletName": "操作栏",
+    "groupCodeName":"Ungroup",
+    "groupName":"（未分类）",
+    "portletTYpe":"ACTIONBAR","componentName":"app-ibizorder-portal-components-operation-portlet"},
+    {"type":"app",
+    "appCodeName":"Web",
+    "appName":"演示应用",
+    "portletCodeName": "portalComponentsWeb",
+    "portletName": "网页部件",
+    "groupCodeName":"Ungroup",
+    "groupName":"（未分类）",
+    "portletTYpe":"HTML","componentName":"app-portal-components-web-portlet"},
+    {"type":"app",
     "appCodeName":"IBIZOrderDetail",
     "appName":"订单明细",
     "portletCodeName": "portalComponentsList3",
@@ -338,22 +354,6 @@ mock.onGet('./assets/json/portlet-data.json').reply((config: any) => {
     "groupName":"（未分类）",
     "portletTYpe":"LIST","componentName":"app-ibizorder-detail-portal-components-list4-portlet"},
     {"type":"app",
-    "appCodeName":"IBIZOrder",
-    "appName":"订单",
-    "portletCodeName": "portalComponentsOperation",
-    "portletName": "操作栏",
-    "groupCodeName":"Ungroup",
-    "groupName":"（未分类）",
-    "portletTYpe":"ACTIONBAR","componentName":"app-ibizorder-portal-components-operation-portlet"},
-    {"type":"app",
-    "appCodeName":"IBIZOrder",
-    "appName":"订单",
-    "portletCodeName": "portalComponentsWeb",
-    "portletName": "网页部件",
-    "groupCodeName":"Ungroup",
-    "groupName":"（未分类）",
-    "portletTYpe":"HTML","componentName":"app-ibizorder-portal-components-web-portlet"},
-    {"type":"app",
     "appCodeName":"IBIZAPPVIEW",
     "appName":"应用视图",
     "portletCodeName": "appViewAmount",

app_Web/src/portlet-register.ts

-import IBIZOrderPortalComponentsWeb from '@/widgets/ibizorder/portal-components-web-portlet/portal-components-web-portlet.vue';
+import PortalComponentsWeb from '@/widgets/app/portal-components-web-portlet/portal-components-web-portlet.vue';
 import IBIZBOOKPortalComponentsList from '@/widgets/ibizbook/portal-components-list-portlet/portal-components-list-portlet.vue';
 import IBIZBOOKPortalComponentsView from '@/widgets/ibizbook/portal-components-view-portlet/portal-components-view-portlet.vue';
 import IBIZOrderDetailPortalComponentsList5 from '@/widgets/ibizorder-detail/portal-components-list5-portlet/portal-components-list5-portlet.vue';
@@ -36,11 +36,11 @@ export const  PortletComponent = {
         v.component('app-ibizorder-detail-portal-components-histogram-portlet', IBIZOrderDetailPortalComponentsHistogram);
         v.component('app-ibizappctrl-app-ctrl-list-view-portlet', IBIZAPPCTRLAppCtrlListView);
         v.component('app-ibizappctrl-ctrl-chart-portlet', IBIZAPPCTRLCtrlChart);
+        v.component('app-ibizorder-portal-components-operation-portlet', IBIZOrderPortalComponentsOperation);
+        v.component('app-portal-components-web-portlet', PortalComponentsWeb);
         v.component('app-ibizorder-detail-portal-components-list3-portlet', IBIZOrderDetailPortalComponentsList3);
         v.component('app-ibizorder-detail-portal-components-list5-portlet', IBIZOrderDetailPortalComponentsList5);
         v.component('app-ibizorder-detail-portal-components-list4-portlet', IBIZOrderDetailPortalComponentsList4);
-        v.component('app-ibizorder-portal-components-operation-portlet', IBIZOrderPortalComponentsOperation);
-        v.component('app-ibizorder-portal-components-web-portlet', IBIZOrderPortalComponentsWeb);
         v.component('app-ibizappview-app-view-amount-portlet', IBIZAPPVIEWAppViewAmount);
         v.component('app-ibizappctrl-app-ctrl-amount-portlet', IBIZAPPCTRLAppCtrlAmount);
         v.component('app-ibizappeditor-app-editor-amount-portlet', IBIZAPPEDITORAppEditorAmount);

app_Web/src/store/modules/view-action/state.ts

@@ -671,6 +671,7 @@ export const viewstate: any = {
                 '0c1719540d6f515fa021b477e3990dbf',
                 '94f14d66f3261878157fb55b65df50c7',
                 'db57a81b119c5e77a63d183827c598e1',
+                '7f46cd67bcfbeac794fcc5c91d8bcceb',
             ],
         },
         {

app_Web/src/widgets/app/app-portal-view2-db-dashboard/app-portal-view2-db-dashboard-base.vue

@@ -89,6 +89,57 @@
           </span>
         </card>
       </i-col>
+      <i-col :md="{ span: 24, offset: 0 }">
+        <card class="portlet-card custom-card" :bordered="false" dis-hover :padding="10">
+          <span>
+                      <view_db_sysportlet2 
+              :viewState="viewState"  
+              :viewparams="viewparams" 
+              :context="context"
+              :pViewCtx="viewCtx"
+              :height="300"
+              :width="0"
+              name="db_sysportlet2"  
+              ref='db_sysportlet2' 
+              @closeview="closeView($event)">
+          </view_db_sysportlet2>
+          </span>
+        </card>
+      </i-col>
+      <i-col :md="{ span: 24, offset: 0 }">
+        <card class="portlet-card custom-card" :bordered="false" dis-hover :padding="10">
+          <span>
+                      <view_db_sysportlet3 
+              :viewState="viewState"  
+              :viewparams="viewparams" 
+              :context="context"
+              :pViewCtx="viewCtx"
+              :height="300"
+              :width="0"
+              name="db_sysportlet3"  
+              ref='db_sysportlet3' 
+              @closeview="closeView($event)">
+          </view_db_sysportlet3>
+          </span>
+        </card>
+      </i-col>
+      <i-col :md="{ span: 24, offset: 0 }">
+        <card class="portlet-card custom-card" :bordered="false" dis-hover :padding="10">
+          <span>
+                      <view_db_sysportlet5 
+              :viewState="viewState"  
+              :viewparams="viewparams" 
+              :context="context"
+              :pViewCtx="viewCtx"
+              :height="300"
+              :width="0"
+              name="db_sysportlet5"  
+              ref='db_sysportlet5' 
+              @closeview="closeView($event)">
+          </view_db_sysportlet5>
+          </span>
+        </card>
+      </i-col>
     </row>
     <row v-if="isHasCustomized" style="width: 100%;min-height: calc(100% - 40px);">
       <div class="portlet-container" style="position: relative;width:100%;">

app_Web/src/widgets/app/app-portal-view2-db-dashboard/app-portal-view2-db-dashboard.vue

@@ -6,6 +6,9 @@ import view_db_rawitem2 from '@widgets/app/db-rawitem2-portlet/db-rawitem2-portl
 import view_db_rawitem1 from '@widgets/app/db-rawitem1-portlet/db-rawitem1-portlet.vue';
 import view_db_appview1 from '@widgets/app/db-appview1-portlet/db-appview1-portlet.vue';
 import view_db_sysportlet1 from '@widgets/ibizappview/app-view-list-portlet/app-view-list-portlet.vue';
+import view_db_sysportlet2 from '@widgets/ibizorder/portal-components-operation-portlet/portal-components-operation-portlet.vue';
+import view_db_sysportlet3 from '@widgets/ibizorder/portal-components-list2-portlet/portal-components-list2-portlet.vue';
+import view_db_sysportlet5 from '@widgets/app/portal-components-web-portlet/portal-components-web-portlet.vue';
 
  
 // 基于 @CONTROL/数据关系栏/CONTROL.vue.ftl 生成
@@ -16,6 +19,9 @@ import view_db_sysportlet1 from '@widgets/ibizappview/app-view-list-portlet/app-
         view_db_rawitem1, 
         view_db_appview1, 
         view_db_sysportlet1, 
+        view_db_sysportlet2, 
+        view_db_sysportlet3, 
+        view_db_sysportlet5, 
          
     }
 })

app_Web/src/widgets/app/portal-components-web-portlet/portal-components-web-portlet-base.vue

+<template>
+    <div class='portlet portal-components-web ' :style="{'height': isAdaptiveSize ? 'calc(100% - 16px)' : getHeight,}">
+        <p class='portlet-title'>
+            <span>
+            
+            网页部件
+            </span>
+        </p>
+        <el-divider class="divider"></el-divider>
+        <div class="portlet-with-title">
+        <iframe src="https://cn.vuejs.org/" style="height: 300px;width: 100%;border-width: 0px;"></iframe>
+        </div>
+    </div>
+</template>
+// 基于 @CONTROL/门户部件/CONTROL-BASE.vue.ftl 生成
+<script lang='tsx'>
+import { Vue, Component, Prop, Provide, Emit, Watch, Model,Inject } from 'vue-property-decorator';
+import { CreateElement } from 'vue';
+import { Subject, Subscription } from 'rxjs';
+import { ControlInterface } from '@/interface/control';
+import { UIActionTool,Util, ViewTool } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
+import PortalComponentsWebService from './portal-components-web-portlet-service';
+
+import UIService from '@/uiservice/ui-service';
+import { Environment } from '@/environments/environment';
+
+
+@Component({
+    components: {
+      
+    }
+})
+export default class PortalComponentsWebBase extends Vue implements ControlInterface {
+
+    /**
+     * 名称
+     *
+     * @type {string}
+     * @memberof PortalComponentsWebBase
+     */
+    @Prop() public name?: string;
+
+    /**
+     * 视图通讯对象
+     *
+     * @type {Subject<ViewState>}
+     * @memberof PortalComponentsWebBase
+     */
+    @Prop() public viewState!: Subject<ViewState>;
+
+    /**
+     * 应用上下文
+     *
+     * @type {*}
+     * @memberof PortalComponentsWebBase
+     */
+    @Prop() public context!: any;
+
+    /**
+     * 视图参数
+     *
+     * @type {*}
+     * @memberof PortalComponentsWebBase
+     */
+    @Prop() public viewparams!: any;
+
+    /**
+     * 视图操作参数
+     *
+     * @type {*}
+     * @memberof PortalComponentsWebBase
+     */
+    @Prop() public viewCtx!: any;
+
+    /**
+     * 视图状态事件
+     *
+     * @public
+     * @type {(Subscription | undefined)}
+     * @memberof PortalComponentsWebBase
+     */
+    public viewStateEvent: Subscription | undefined;
+
+    /**
+     * 获取部件类型
+     *
+     * @returns {string}
+     * @memberof PortalComponentsWebBase
+     */
+    public getControlType(): string {
+        return 'PORTLET'
+    }
+
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @type {Array<*>}
+     * @memberof PortalComponentsWebBase
+     */    
+    public counterServiceArray:Array<any> = [];
+
+    /**
+     * 建构部件服务对象
+     *
+     * @type {PortalComponentsWebService}
+     * @memberof PortalComponentsWebBase
+     */
+    public service: PortalComponentsWebService = new PortalComponentsWebService({ $store: this.$store });
+    
+
+
+    /**
+     * 关闭视图
+     *
+     * @param {any} args
+     * @memberof PortalComponentsWebBase
+     */
+    public closeView(args: any): void {
+        let _this: any = this;
+        _this.$emit('closeview', [args]);
+    }
+
+    /**
+     *  计数器刷新
+     *
+     * @memberof PortalComponentsWebBase
+     */
+    public counterRefresh(){
+        const _this:any =this;
+        if(_this.counterServiceArray && _this.counterServiceArray.length >0){
+            _this.counterServiceArray.forEach((item:any) =>{
+                if(item.refreshData && item.refreshData instanceof Function){
+                    item.refreshData();
+                }
+            })
+        }
+    }
+
+
+
+    /**
+     * 长度
+     *
+     * @type {number}
+     * @memberof PortalComponentsWebBase
+     */
+    @Prop() public height?: number;
+
+    /**
+     * 宽度
+     *
+     * @type {number}
+     * @memberof PortalComponentsWebBase
+     */
+    @Prop() public width?: number;
+
+    /**
+     * 门户部件类型
+     *
+     * @type {string}
+     * @memberof PortalComponentsWebBase
+     */
+    public portletType: string = 'html';
+
+    /**
+     * 部件类型
+     *
+     * @type {string}
+     * @memberof PortalComponentsWebBase
+     */
+    public controlType: string = 'PORTLET';
+
+    /**
+     * 视图默认使用
+     *
+     * @type {string}
+     * @memberof PortalComponentsWebBase
+     */
+    @Inject({from:'navModel',default: 'tab'})
+    public navModel!:string;
+
+
+    /**
+     * 界面行为模型数据
+     *
+     * @memberof PortalComponentsWebBase
+     */
+    public uiactionModel: any = {
+    }
+
+
+    /**
+     * 是否自适应大小
+     *
+     * @returns {boolean}
+     * @memberof PortalComponentsWebBase
+     */
+    @Prop({default: false})public isAdaptiveSize!: boolean;
+
+    /**
+     * 获取多项数据
+     *
+     * @returns {any[]}
+     * @memberof PortalComponentsWebBase
+     */
+    public getDatas(): any[] {
+        return [];
+    }
+
+    /**
+     * 获取单项树
+     *
+     * @returns {*}
+     * @memberof PortalComponentsWebBase
+     */
+    public getData(): any {
+        return {};
+    }
+
+    /**
+     * 获取高度
+     *
+     * @returns {any[]}
+     * @memberof PortalComponentsWebBase
+     */
+    get getHeight(){
+        if(!this.$util.isEmpty(this.height) && !this.$util.isNumberNaN(this.height)){
+            if(this.height == 0){
+                return 'auto';
+            }else{
+                return this.height+'px';
+            }
+        }else{
+            return '300px';
+        }
+    }
+
+    /**
+     * 刷新
+     *
+     * @memberof PortalComponentsWebBase
+     */
+    public refresh(args?: any) {
+    }
+
+    /**
+     * vue 生命周期
+     *
+     * @memberof PortalComponentsWebBase
+     */
+    public created() {
+        this.afterCreated();
+    }
+
+    /**
+     * 执行created后的逻辑
+     *
+     *  @memberof PortalComponentsWebBase
+     */    
+    public afterCreated(){
+        if (this.viewState) {
+            this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
+                if(Object.is(tag, "all-portlet") && Object.is(action,'loadmodel')){
+                   this.calcUIActionAuthState(data);
+                }
+                if (!Object.is(tag, this.name)) {
+                    return;
+                }
+                const refs: any = this.$refs;
+                Object.keys(refs).forEach((_name: string) => {
+                    this.viewState.next({ tag: _name, action: action, data: data });
+                });
+            });
+        }
+    }
+
+    /**
+     * vue 生命周期
+     *
+     * @memberof PortalComponentsWebBase
+     */
+    public destroyed() {
+        this.afterDestroy();
+    }
+
+    /**
+     * 执行destroyed后的逻辑
+     *
+     * @memberof PortalComponentsWebBase
+     */
+    public afterDestroy() {
+        if (this.viewStateEvent) {
+            this.viewStateEvent.unsubscribe();
+        }
+    }
+
+
+    /**
+     * 计算界面行为权限
+     *
+     * @memberof PortalComponentsWebBase
+     */
+    public calcUIActionAuthState(data:any = {}) {
+        //  如果是操作栏，不计算权限
+        if(this.portletType && Object.is('actionbar', this.portletType)) {
+            return;
+        }
+        let _this: any = this;
+        let uiservice: any = _this.appUIService ? _this.appUIService : new UIService();
+        if(_this.uiactionModel){
+            ViewTool.calcActionItemAuthState(data,_this.uiactionModel,uiservice);
+        }
+    }
+
+}
+</script>
+
+<style lang='less'>
+@import './portal-components-web-portlet.less';
+</style>
+

app_Web/src/widgets/app/portal-components-web-portlet/portal-components-web-portlet-model.ts

+// 基于 @CONTROL/门户部件/MODEL.ts.ftl 生成
+/**
+ * PortalComponentsWeb 部件模型
+ *
+ * @export
+ * @class PortalComponentsWebModel
+ */
+export default class PortalComponentsWebModel {
+
+  /**
+    * 获取数据项集合
+    *
+    * @returns {any[]}
+    * @memberof PortalComponentsWebModel
+    */
+  public getDataItems(): any[] {
+    return [
+    ]
+  }
+
+
+}

app_Web/src/widgets/app/portal-components-web-portlet/portal-components-web-portlet-service.ts

+// 基于 @CONTROL/门户部件/SERVICE.ts.ftl 生成
+import { Http } from '@/utils';
+import ControlService from '@/widgets/control-service';
+
+/**
+ * PortalComponentsWeb 部件服务对象
+ *
+ * @export
+ * @class PortalComponentsWebService
+ */
+export default class PortalComponentsWebService extends ControlService {
+}

app_Web/src/widgets/app/portal-components-web-portlet/portal-components-web-portlet.less

+// 基于 @CONTROL/门户部件/CONTROL.less.ftl 生成
+// this is less
+.portlet{
+  height: 100%;
+  width: 100%;
+  > .portlet-title{
+    padding: 14px 16px;
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: flex;
+    height: 52px;
+    -webkit-box-align: center;
+    -ms-flex-align: center;
+    align-items: center;
+    justify-content: space-between;
+    width:100%;
+    line-height: 22px;
+    font-size: 16px;
+    font-weight: 500;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    color: #304265;
+    font-weight: 600;
+    i{
+      margin-right: 5px;
+    }
+    >.portlet-action{
+      margin-left: 12px;
+      font-size: 14px;
+      >a{
+        padding: 6px;
+      }
+    }
+  }
+    > .divider {
+      margin: 0px 0px 11px 0px;
+    }
+  > .portlet-with-title{
+    width:100%;
+    height:calc(100% - 58px);
+    overflow:auto;
+    padding:0px 12px;
+  }
+  > .portlet-without-title{
+    width:100%;
+    height:100%;
+    overflow:auto;
+    padding:0px 12px;
+  }
+  .app-charts{
+    height: 100%!important;
+  }
+  .toolbar-container {
+    button{
+      margin: 6px 0px 4px 16px;
+    }
+    .ivu-badge{
+      .ivu-badge-count{
+        top: 0;
+      }
+    }
+  }
+  // 日历视图样式特殊处理（防止刷新时日历大小发生变化并且门户部件要定高）
+  .decalendarview {
+    height: 100%;
+    >.view-card {
+        height: 100%;
+    }
+  }
+}

app_Web/src/widgets/app/portal-components-web-portlet/portal-components-web-portlet.vue

+
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import PortalComponentsWebBase from './portal-components-web-portlet-base.vue';
+
+
+// 基于 @CONTROL/门户部件/CONTROL.vue.ftl 生成
+@Component({
+    components: {
+         
+    }
+})
+export default class PortalComponentsWeb extends PortalComponentsWebBase {
+
+}
+</script>

app_Web/src/widgets/ibizbook/usr2-dataview/usr2-dataview-model.ts

@@ -11,7 +11,7 @@ export default class Usr2Model {
 	 * 获取数据项集合
 	 *
 	 * @returns {any[]}
-	 * @memberof Usr2DataViewMode
+	 * @memberof Usr2Dataviewexpbar_dataviewMode
 	 */
 	public getDataItems(): any[] {
 		return [
@@ -40,17 +40,6 @@ export default class Usr2Model {
 				dataType: 'FONTKEY',
 			},
 
-      {
-        name: 'n_ibizbookname_like',
-        prop: 'n_ibizbookname_like',
-        dataType: 'QUERYPARAM'
-      },
-      {
-        name: 'n_price_gtandeq',
-        prop: 'n_price_gtandeq',
-        dataType: 'QUERYPARAM'
-      },
-
 
       {
         name:'size',

app_Web/src/widgets/ibizorder-detail/main-grid/main-grid-base.vue

@@ -964,7 +964,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.fetchAction) {
             this.$Notice.error({
                 title: this.$t("app.commonWords.wrong") as string,
-                desc: "IBIZOrderDetailGridView9" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
+                desc: "IBIZOrderDetailSGridView9" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
             });
             return;
         }
@@ -1123,7 +1123,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.removeAction) {
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZOrderDetailGridView9' + (this.$t('app.gridpage.notConfig.removeAction') as string)
+                desc: 'IBIZOrderDetailSGridView9' + (this.$t('app.gridpage.notConfig.removeAction') as string)
             });
             return;
         }
@@ -1237,7 +1237,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public addBatch(arg: any = {}): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailGridView9'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailSGridView9'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -2132,7 +2132,7 @@ export default class MainBase 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: 'IBIZOrderDetailGridView9'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailSGridView9'+(this.$t('app.gridpage.notConfig.createAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2141,7 +2141,7 @@ export default class MainBase 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: 'IBIZOrderDetailGridView9'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailSGridView9'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2217,7 +2217,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if(!this.loaddraftAction){
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZOrderDetailGridView9' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
+                desc: 'IBIZOrderDetailSGridView9' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
             });
             return;
         }

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

@@ -768,7 +768,7 @@ export default class CardNavigationBase extends Vue implements ControlInterface
      */
     public async load(opt: any = {}, isReset: boolean = false): Promise<any> {
         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};
@@ -862,7 +862,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[] = [];
@@ -978,7 +978,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);
@@ -986,7 +986,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){

app_Web/src/widgets/ibizorder/main-grid/main-grid-base.vue

@@ -310,7 +310,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZOrderSF1GridViewBase
+     * @memberof IBIZOrderPickupGridViewBase
      */
     public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         if (args.length === 0) {
@@ -453,20 +453,6 @@ export default class MainBase extends Vue implements ControlInterface {
         return this.selections[0];
     }
 
-    /**
-     * 打开新建数据视图
-     *
-     * @type {any}
-     * @memberof MainBase
-     */
-    @Prop() public newdata: any;
-    /**
-     * 打开编辑数据视图
-     *
-     * @type {any}
-     * @memberof MainBase
-     */
-    @Prop() public opendata: any;
     
     /**
     * 是否嵌入关系界面
@@ -997,7 +983,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.fetchAction) {
             this.$Notice.error({
                 title: this.$t("app.commonWords.wrong") as string,
-                desc: "IBIZOrderSF1GridView" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
+                desc: "IBIZOrderPickupGridView" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
             });
             return;
         }
@@ -1156,7 +1142,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.removeAction) {
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZOrderSF1GridView' + (this.$t('app.gridpage.notConfig.removeAction') as string)
+                desc: 'IBIZOrderPickupGridView' + (this.$t('app.gridpage.notConfig.removeAction') as string)
             });
             return;
         }
@@ -1270,7 +1256,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public addBatch(arg: any = {}): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -2192,7 +2178,7 @@ export default class MainBase 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: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2201,7 +2187,7 @@ export default class MainBase 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: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2277,7 +2263,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if(!this.loaddraftAction){
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZOrderSF1GridView' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
+                desc: 'IBIZOrderPickupGridView' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
             });
             return;
         }

app_Web/src/widgets/ibizorder/main-grid/main-grid-model.ts

@@ -106,21 +106,6 @@ export default class MainModel {
         prop: 'n_ibizordername_like',
         dataType: 'QUERYPARAM'
       },
-      {
-        name: 'n_orderstate_eq',
-        prop: 'n_orderstate_eq',
-        dataType: 'QUERYPARAM'
-      },
-      {
-        name: 'n_ordertime_gt',
-        prop: 'n_ordertime_gt',
-        dataType: 'QUERYPARAM'
-      },
-      {
-        name: 'n_ordertime_lt',
-        prop: 'n_ordertime_lt',
-        dataType: 'QUERYPARAM'
-      },
 
         {
           name:'size',

app_Web/src/widgets/ibizorder/portal-components-list2-portlet/portal-components-list2-portlet-base.vue

 <template>
     <div class='portlet portal-components-list2 ' :style="{'height': isAdaptiveSize ? 'calc(100% - 16px)' : getHeight,}">
-        <div class="portlet-without-title">
+        <p class='portlet-title'>
+            <span>
+            
+            列表
+            </span>
+        </p>
+        <el-divider class="divider"></el-divider>
+        <div class="portlet-with-title">
         <!-- 测试 -->
-              <view_portlet_OrderList_list 
+              <view_db_sysportlet3_list 
           :viewState="viewState"  
           :viewparams="viewparams" 
           :context="context"
@@ -13,10 +20,10 @@
           fetchAction="FetchDefault"
           :showBusyIndicator="true"
         :parentType="controlType"
-          name="portlet_OrderList_list"  
-          ref='portlet_OrderList_list' 
+          name="db_sysportlet3_list"  
+          ref='db_sysportlet3_list' 
           @closeview="closeView($event)">
-      </view_portlet_OrderList_list>
+      </view_db_sysportlet3_list>
         </div>
     </div>
 </template>
@@ -270,7 +277,7 @@ export default class IBIZOrderPortalComponentsList2Base extends Vue implements C
      * @memberof PortalComponentsList2Base
      */
     public refresh(args?: any) {
-      this.viewState.next({ tag: 'portlet_OrderList_list', action: 'refresh', data: args });
+      this.viewState.next({ tag: 'db_sysportlet3_list', action: 'refresh', data: args });
     }
 
     /**

app_Web/src/widgets/ibizorder/portal-components-list2-portlet/portal-components-list2-portlet.less

@@ -33,6 +33,9 @@
       }
     }
   }
+    > .divider {
+      margin: 0px 0px 11px 0px;
+    }
   > .portlet-with-title{
     width:100%;
     height:calc(100% - 58px);

app_Web/src/widgets/ibizorder/portal-components-list2-portlet/portal-components-list2-portlet.vue

@@ -2,13 +2,13 @@
 <script lang='tsx'>
 import { Component } from 'vue-property-decorator';
 import IBIZOrderPortalComponentsList2Base from './portal-components-list2-portlet-base.vue';
-import view_portlet_OrderList_list from '@widgets/ibizorder/usr-list/usr-list.vue';
+import view_db_sysportlet3_list from '@widgets/ibizorder/usr-list/usr-list.vue';
 
 
 // 基于 @CONTROL/门户部件/CONTROL.vue.ftl 生成
 @Component({
     components: {
-        view_portlet_OrderList_list, 
+        view_db_sysportlet3_list, 
          
     }
 })

app_Web/src/widgets/ibizorder/usr-list/usr-list-base.vue

@@ -557,7 +557,7 @@ export default class UsrBase extends Vue implements ControlInterface {
      */
     public async load(opt: any = {}): Promise<any> {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'AppPortletContainerView' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'AppPortalView2' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }        
         const arg: any = {...opt};
@@ -687,7 +687,7 @@ export default class UsrBase 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: 'AppPortletContainerView' + (this.$t('app.list.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'AppPortalView2' + (this.$t('app.list.notConfig.removeAction') as string) });
             return;
         }
         if (datas.length === 0) {
@@ -792,7 +792,7 @@ export default class UsrBase 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: 'AppPortletContainerView' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'AppPortalView2' + (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);
@@ -800,7 +800,7 @@ export default class UsrBase extends Vue implements ControlInterface {
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.warning') as string), desc: 'AppPortletContainerView' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.warning') as string), desc: 'AppPortalView2' + (this.$t('app.list.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizorder){

app_Web/src/widgets/ibizorder/usr-list/usr-list-model.ts

@@ -11,7 +11,7 @@ export default class UsrModel {
 	 * 获取数据项集合
 	 *
 	 * @returns {any[]}
-	 * @memberof UsrPortlet_OrderList_listMode
+	 * @memberof UsrDb_sysportlet3_listMode
 	 */
 	public getDataItems(): any[] {
 		return [

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

@@ -12,18 +12,6 @@
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
   },
   "getPSDETreeColumns" : [ {
-    "caption" : "归还日期",
-    "codeName" : "returntime",
-    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "returntime",
-    "mOSFilePath" : "psdetreecols/returntime",
-    "name" : "returntime",
-    "rTMOSFilePath" : "psdetreecols/returntime",
-    "width" : 200,
-    "widthUnit" : "px",
-    "enableExpand" : false,
-    "enableSort" : false
-  }, {
     "caption" : "作者",
     "codeName" : "author",
     "columnType" : "DEFGRIDCOLUMN",
@@ -35,18 +23,6 @@
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
-  }, {
-    "caption" : "出版社",
-    "codeName" : "press",
-    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "press",
-    "mOSFilePath" : "psdetreecols/press",
-    "name" : "press",
-    "rTMOSFilePath" : "psdetreecols/press",
-    "width" : 200,
-    "widthUnit" : "px",
-    "enableExpand" : false,
-    "enableSort" : false
   }, {
     "caption" : "图书名称",
     "codeName" : "ibizbookname",
@@ -59,6 +35,30 @@
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
+  }, {
+    "caption" : "归还日期",
+    "codeName" : "returntime",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "returntime",
+    "mOSFilePath" : "psdetreecols/returntime",
+    "name" : "returntime",
+    "rTMOSFilePath" : "psdetreecols/returntime",
+    "width" : 200,
+    "widthUnit" : "px",
+    "enableExpand" : false,
+    "enableSort" : false
+  }, {
+    "caption" : "出版社",
+    "codeName" : "press",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "press",
+    "mOSFilePath" : "psdetreecols/press",
+    "name" : "press",
+    "rTMOSFilePath" : "psdetreecols/press",
+    "width" : 200,
+    "widthUnit" : "px",
+    "enableExpand" : false,
+    "enableSort" : false
   }, {
     "caption" : "借出日期",
     "codeName" : "lendouttime",

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

@@ -20,18 +20,6 @@
     }
   } ],
   "getPSDETreeColumns" : [ {
-    "caption" : "图书名称",
-    "codeName" : "ibizbookname",
-    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "ibizbookname",
-    "mOSFilePath" : "psdetreecols/ibizbookname",
-    "name" : "ibizbookname",
-    "rTMOSFilePath" : "psdetreecols/ibizbookname",
-    "width" : 50,
-    "widthUnit" : "px",
-    "enableExpand" : false,
-    "enableSort" : false
-  }, {
     "caption" : "图书描述",
     "codeName" : "subtext",
     "columnType" : "DEFGRIDCOLUMN",
@@ -43,6 +31,18 @@
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
+  }, {
+    "caption" : "图书名称",
+    "codeName" : "ibizbookname",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "ibizbookname",
+    "mOSFilePath" : "psdetreecols/ibizbookname",
+    "name" : "ibizbookname",
+    "rTMOSFilePath" : "psdetreecols/ibizbookname",
+    "width" : 50,
+    "widthUnit" : "px",
+    "enableExpand" : false,
+    "enableSort" : false
   }, {
     "caption" : "作者",
     "codeName" : "author",

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZOrder/PSLISTS/Usr.json

@@ -15,23 +15,13 @@
     "id" : "load"
   },
   "groupMode" : "NONE",
-  "hookEventNames" : [ "ROWDBLCLICK", "SELECTIONCHANGE", "REMOVE", "LOAD", "BEFORELOAD" ],
+  "height" : 300.0,
   "logicName" : "Usr",
   "mOSFilePath" : "psmodules/Sample/psdataentities/IBIZORDER/psdelists/Usr",
   "getPSAppDataEntity" : {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZOrder.json"
   },
-  "getPSControlLogics" : [ {
-    "eventNames" : "ROWDBLCLICK;SELECTIONCHANGE;REMOVE;LOAD;BEFORELOAD",
-    "logicTag" : "list",
-    "logicType" : "APPVIEWENGINE",
-    "name" : "engine_list",
-    "getPSAppViewEngine" : {
-      "modelref" : true,
-      "id" : "engine"
-    }
-  } ],
   "getPSDEDataImport" : {
     "modelref" : true,
     "id" : "Import"
@@ -105,7 +95,7 @@
     "name" : "srfmstag"
   } ],
   "pagingSize" : 1000,
-  "rTMOSFilePath" : "pssysapps/Web/psappdeviews/IBIZOrderListView/psappviewctrls/list",
+  "rTMOSFilePath" : "pssysapps/Web/psappportalviews/AppPortalView2/psappviewctrls/db_sysportlet3_list",
   "getRemovePSControlAction" : {
     "modelref" : true,
     "id" : "remove"

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKGanttView.json

@@ -42,18 +42,6 @@
       "id" : "GANTT"
     },
     "getPSDETreeColumns" : [ {
-      "caption" : "归还日期",
-      "codeName" : "returntime",
-      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "returntime",
-      "mOSFilePath" : "psdetreecols/returntime",
-      "name" : "returntime",
-      "rTMOSFilePath" : "psdetreecols/returntime",
-      "width" : 200,
-      "widthUnit" : "px",
-      "enableExpand" : false,
-      "enableSort" : false
-    }, {
       "caption" : "作者",
       "codeName" : "author",
       "columnType" : "DEFGRIDCOLUMN",
@@ -65,18 +53,6 @@
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
-    }, {
-      "caption" : "出版社",
-      "codeName" : "press",
-      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "press",
-      "mOSFilePath" : "psdetreecols/press",
-      "name" : "press",
-      "rTMOSFilePath" : "psdetreecols/press",
-      "width" : 200,
-      "widthUnit" : "px",
-      "enableExpand" : false,
-      "enableSort" : false
     }, {
       "caption" : "图书名称",
       "codeName" : "ibizbookname",
@@ -89,6 +65,30 @@
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
+    }, {
+      "caption" : "归还日期",
+      "codeName" : "returntime",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "returntime",
+      "mOSFilePath" : "psdetreecols/returntime",
+      "name" : "returntime",
+      "rTMOSFilePath" : "psdetreecols/returntime",
+      "width" : 200,
+      "widthUnit" : "px",
+      "enableExpand" : false,
+      "enableSort" : false
+    }, {
+      "caption" : "出版社",
+      "codeName" : "press",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "press",
+      "mOSFilePath" : "psdetreecols/press",
+      "name" : "press",
+      "rTMOSFilePath" : "psdetreecols/press",
+      "width" : 200,
+      "widthUnit" : "px",
+      "enableExpand" : false,
+      "enableSort" : false
     }, {
       "caption" : "借出日期",
       "codeName" : "lendouttime",

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKTreeGridExView.json

@@ -88,18 +88,6 @@
       "id" : "TREEGRIDEX"
     },
     "getPSDETreeColumns" : [ {
-      "caption" : "图书名称",
-      "codeName" : "ibizbookname",
-      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "ibizbookname",
-      "mOSFilePath" : "psdetreecols/ibizbookname",
-      "name" : "ibizbookname",
-      "rTMOSFilePath" : "psdetreecols/ibizbookname",
-      "width" : 50,
-      "widthUnit" : "px",
-      "enableExpand" : false,
-      "enableSort" : false
-    }, {
       "caption" : "图书描述",
       "codeName" : "subtext",
       "columnType" : "DEFGRIDCOLUMN",
@@ -111,6 +99,18 @@
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
+    }, {
+      "caption" : "图书名称",
+      "codeName" : "ibizbookname",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "ibizbookname",
+      "mOSFilePath" : "psdetreecols/ibizbookname",
+      "name" : "ibizbookname",
+      "rTMOSFilePath" : "psdetreecols/ibizbookname",
+      "width" : 50,
+      "widthUnit" : "px",
+      "enableExpand" : false,
+      "enableSort" : false
     }, {
       "caption" : "作者",
       "codeName" : "author",

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZOrderSEditView2.json

@@ -1332,9 +1332,7 @@
     } ],
     "getPSDEDRCtrlItems" : [ {
       "getCapPSLanguageRes" : {
-        "lanResTag" : "DE.LNAME.IBIZORDERDETAIL",
-        "mOSFilePath" : "pslanguageres/Auto904",
-        "rTMOSFilePath" : "pslanguageres/Auto904"
+        "lanResTag" : "OTHER.TEST"
       },
       "caption" : "订单交易明细2",
       "counterId" : "DETAILNUM",

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZOrderSEditView2_layout.json

@@ -1332,9 +1332,7 @@
     } ],
     "getPSDEDRCtrlItems" : [ {
       "getCapPSLanguageRes" : {
-        "lanResTag" : "DE.LNAME.IBIZORDERDETAIL",
-        "mOSFilePath" : "pslanguageres/Auto904",
-        "rTMOSFilePath" : "pslanguageres/Auto904"
+        "lanResTag" : "OTHER.TEST"
       },
       "caption" : "订单交易明细2",
       "counterId" : "DETAILNUM",

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZOrderSEditView3.json

@@ -220,9 +220,7 @@
     },
     "getPSDEDRTabPages" : [ {
       "getCapPSLanguageRes" : {
-        "lanResTag" : "DE.LNAME.IBIZORDERDETAIL",
-        "mOSFilePath" : "pslanguageres/Auto904",
-        "rTMOSFilePath" : "pslanguageres/Auto904"
+        "lanResTag" : "OTHER.TEST"
       },
       "caption" : "订单交易明细2",
       "counterId" : "DETAILNUM",

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZOrderSEditView3_layout.json

@@ -222,9 +222,7 @@
     },
     "getPSDEDRTabPages" : [ {
       "getCapPSLanguageRes" : {
-        "lanResTag" : "DE.LNAME.IBIZORDERDETAIL",
-        "mOSFilePath" : "pslanguageres/Auto904",
-        "rTMOSFilePath" : "pslanguageres/Auto904"
+        "lanResTag" : "OTHER.TEST"
       },
       "caption" : "订单交易明细2",
       "counterId" : "DETAILNUM",

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZOrderSEditView4.json

@@ -220,9 +220,7 @@
     },
     "getPSDEDRTabPages" : [ {
       "getCapPSLanguageRes" : {
-        "lanResTag" : "DE.LNAME.IBIZORDERDETAIL",
-        "mOSFilePath" : "pslanguageres/Auto904",
-        "rTMOSFilePath" : "pslanguageres/Auto904"
+        "lanResTag" : "OTHER.TEST"
       },
       "caption" : "订单交易明细2",
       "counterId" : "DETAILNUM",

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZOrderSEditView4_layout.json

@@ -1324,9 +1324,7 @@
     },
     "getPSDEDRTabPages" : [ {
       "getCapPSLanguageRes" : {
-        "lanResTag" : "DE.LNAME.IBIZORDERDETAIL",
-        "mOSFilePath" : "pslanguageres/Auto904",
-        "rTMOSFilePath" : "pslanguageres/Auto904"
+        "lanResTag" : "OTHER.TEST"
       },
       "caption" : "订单交易明细2",
       "counterId" : "DETAILNUM",

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZOrderSGridView2.json

@@ -1060,9 +1060,7 @@
     },
     "getPSDEDRTabPages" : [ {
       "getCapPSLanguageRes" : {
-        "lanResTag" : "DE.LNAME.IBIZORDERDETAIL",
-        "mOSFilePath" : "pslanguageres/Auto904",
-        "rTMOSFilePath" : "pslanguageres/Auto904"
+        "lanResTag" : "OTHER.TEST"
       },
       "caption" : "订单交易明细2",
       "counterId" : "DETAILNUM",

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZOrderState10EditView2.json

@@ -1317,9 +1317,7 @@
     } ],
     "getPSDEDRCtrlItems" : [ {
       "getCapPSLanguageRes" : {
-        "lanResTag" : "DE.LNAME.IBIZORDERDETAIL",
-        "mOSFilePath" : "pslanguageres/Auto904",
-        "rTMOSFilePath" : "pslanguageres/Auto904"
+        "lanResTag" : "OTHER.TEST"
       },
       "caption" : "订单交易明细2",
       "counterId" : "DETAILNUM",

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZOrderState30EditView2.json

@@ -1282,9 +1282,7 @@
     } ],
     "getPSDEDRCtrlItems" : [ {
       "getCapPSLanguageRes" : {
-        "lanResTag" : "DE.LNAME.IBIZORDERDETAIL",
-        "mOSFilePath" : "pslanguageres/Auto904",
-        "rTMOSFilePath" : "pslanguageres/Auto904"
+        "lanResTag" : "OTHER.TEST"
       },
       "caption" : "订单交易明细2",
       "counterId" : "DETAILNUM",

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZOrderState40EditView2.json

@@ -1317,9 +1317,7 @@
     } ],
     "getPSDEDRCtrlItems" : [ {
       "getCapPSLanguageRes" : {
-        "lanResTag" : "DE.LNAME.IBIZORDERDETAIL",
-        "mOSFilePath" : "pslanguageres/Auto904",
-        "rTMOSFilePath" : "pslanguageres/Auto904"
+        "lanResTag" : "OTHER.TEST"
       },
       "caption" : "订单交易明细2",
       "counterId" : "DETAILNUM",

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZOrderTestCLEditView2.json

@@ -1347,9 +1347,7 @@
       } ],
       "getPSDEDRCtrlItems" : [ {
         "getCapPSLanguageRes" : {
-          "lanResTag" : "DE.LNAME.IBIZORDERDETAIL",
-          "mOSFilePath" : "pslanguageres/Auto904",
-          "rTMOSFilePath" : "pslanguageres/Auto904"
+          "lanResTag" : "OTHER.TEST"
         },
         "caption" : "订单交易明细2",
         "counterId" : "DETAILNUM",

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSSYSAPP.hubsubapp.json

@@ -1084,9 +1084,7 @@
     } ],
     "getPSDEDRCtrlItems" : [ {
       "getCapPSLanguageRes" : {
-        "lanResTag" : "DE.LNAME.IBIZORDERDETAIL",
-        "mOSFilePath" : "pslanguageres/Auto904",
-        "rTMOSFilePath" : "pslanguageres/Auto904"
+        "lanResTag" : "OTHER.TEST"
       },
       "caption" : "订单交易明细2",
       "counterId" : "DETAILNUM",
@@ -1413,9 +1411,7 @@
     },
     "getPSDEDRTabPages" : [ {
       "getCapPSLanguageRes" : {
-        "lanResTag" : "DE.LNAME.IBIZORDERDETAIL",
-        "mOSFilePath" : "pslanguageres/Auto904",
-        "rTMOSFilePath" : "pslanguageres/Auto904"
+        "lanResTag" : "OTHER.TEST"
       },
       "caption" : "订单交易明细2",
       "counterId" : "DETAILNUM",
@@ -1586,9 +1582,7 @@
     } ],
     "getPSDEDRCtrlItems" : [ {
       "getCapPSLanguageRes" : {
-        "lanResTag" : "DE.LNAME.IBIZORDERDETAIL",
-        "mOSFilePath" : "pslanguageres/Auto904",
-        "rTMOSFilePath" : "pslanguageres/Auto904"
+        "lanResTag" : "OTHER.TEST"
       },
       "caption" : "订单交易明细2",
       "counterId" : "DETAILNUM",
@@ -1720,9 +1714,7 @@
     },
     "getPSDEDRTabPages" : [ {
       "getCapPSLanguageRes" : {
-        "lanResTag" : "DE.LNAME.IBIZORDERDETAIL",
-        "mOSFilePath" : "pslanguageres/Auto904",
-        "rTMOSFilePath" : "pslanguageres/Auto904"
+        "lanResTag" : "OTHER.TEST"
       },
       "caption" : "订单交易明细2",
       "counterId" : "DETAILNUM",
@@ -1890,9 +1882,7 @@
     } ],
     "getPSDEDRCtrlItems" : [ {
       "getCapPSLanguageRes" : {
-        "lanResTag" : "DE.LNAME.IBIZORDERDETAIL",
-        "mOSFilePath" : "pslanguageres/Auto904",
-        "rTMOSFilePath" : "pslanguageres/Auto904"
+        "lanResTag" : "OTHER.TEST"
       },
       "caption" : "订单交易明细2",
       "counterId" : "DETAILNUM",
@@ -2026,9 +2016,7 @@
     },
     "getPSDEDRTabPages" : [ {
       "getCapPSLanguageRes" : {
-        "lanResTag" : "DE.LNAME.IBIZORDERDETAIL",
-        "mOSFilePath" : "pslanguageres/Auto904",
-        "rTMOSFilePath" : "pslanguageres/Auto904"
+        "lanResTag" : "OTHER.TEST"
       },
       "caption" : "订单交易明细2",
       "counterId" : "DETAILNUM",
@@ -2292,9 +2280,7 @@
     },
     "getPSDEDRTabPages" : [ {
       "getCapPSLanguageRes" : {
-        "lanResTag" : "DE.LNAME.IBIZORDERDETAIL",
-        "mOSFilePath" : "pslanguageres/Auto904",
-        "rTMOSFilePath" : "pslanguageres/Auto904"
+        "lanResTag" : "OTHER.TEST"
       },
       "caption" : "订单交易明细2",
       "counterId" : "DETAILNUM",
@@ -2417,9 +2403,7 @@
     },
     "getPSDEDRTabPages" : [ {
       "getCapPSLanguageRes" : {
-        "lanResTag" : "DE.LNAME.IBIZORDERDETAIL",
-        "mOSFilePath" : "pslanguageres/Auto904",
-        "rTMOSFilePath" : "pslanguageres/Auto904"
+        "lanResTag" : "OTHER.TEST"
       },
       "caption" : "订单交易明细2",
       "counterId" : "DETAILNUM",
@@ -2645,9 +2629,7 @@
     } ],
     "getPSDEDRCtrlItems" : [ {
       "getCapPSLanguageRes" : {
-        "lanResTag" : "DE.LNAME.IBIZORDERDETAIL",
-        "mOSFilePath" : "pslanguageres/Auto904",
-        "rTMOSFilePath" : "pslanguageres/Auto904"
+        "lanResTag" : "OTHER.TEST"
       },
       "caption" : "订单交易明细2",
       "counterId" : "DETAILNUM",
@@ -2787,9 +2769,7 @@
     } ],
     "getPSDEDRCtrlItems" : [ {
       "getCapPSLanguageRes" : {
-        "lanResTag" : "DE.LNAME.IBIZORDERDETAIL",
-        "mOSFilePath" : "pslanguageres/Auto904",
-        "rTMOSFilePath" : "pslanguageres/Auto904"
+        "lanResTag" : "OTHER.TEST"
       },
       "caption" : "订单交易明细2",
       "counterId" : "DETAILNUM",
@@ -2929,9 +2909,7 @@
     } ],
     "getPSDEDRCtrlItems" : [ {
       "getCapPSLanguageRes" : {
-        "lanResTag" : "DE.LNAME.IBIZORDERDETAIL",
-        "mOSFilePath" : "pslanguageres/Auto904",
-        "rTMOSFilePath" : "pslanguageres/Auto904"
+        "lanResTag" : "OTHER.TEST"
       },
       "caption" : "订单交易明细2",
       "counterId" : "DETAILNUM",

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

@@ -172,7 +172,7 @@
 
 
     <!--输出实体[IBIZBOOK]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-1508-7">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-1515-7">
         <createTable tableName="T_IBIZBOOK">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -344,7 +344,7 @@
 
 
     <!--输出实体[IBIZORDER]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizorder-898-14">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizorder-940-14">
         <createTable tableName="T_IBIZORDER">
                 <column name="TP" remarks="" type="TEXT(1048576)">
                 </column>

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

@@ -37,7 +37,7 @@
          </createView>
      </changeSet>
         <!--输出实体[IBIZORDER]视图结构信息 runOnChange="true"  当视图发生变更时，通过liquibase强刷prod的视图，实现视图的同步-->
-     <changeSet author="a_LAB01_df847bdfd" id="view-ibizorder-898-8" runOnChange="true">
+     <changeSet author="a_LAB01_df847bdfd" id="view-ibizorder-940-8" runOnChange="true">
          <createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZORDER">
                <![CDATA[ SELECT t1.[AMOUNT], t1.[CREATEDATE], t1.[CREATEMAN], t1.[DETAILNUM], t1.[IBIZCUSTOMERID], t11.[IBIZCUSTOMERNAME], t1.[IBIZORDERID], t1.[IBIZORDERNAME], t1.[MEMO], t1.[ORDERSTATE], t1.[ORDERTIME], t1.[ORDERTYPE], t1.[ORDERUID], t1.[UPDATEDATE], t1.[UPDATEMAN], t1.[WFINSTANCEID], t1.[WFSTATE], t1.[WFSTEP] FROM [T_IBIZORDER] t1  LEFT JOIN T_IBIZCUSTOMER t11 ON t1.IBIZCUSTOMERID = t11.IBIZCUSTOMERID  ]]>
          </createView>