zhujiamin 部署微服务应用 [TrainSys，网页端]

app_Web/packages/ibiz-core/src/engine/panel-view-engine.ts

+import { Util } from "../utils";
 import { ViewEngine } from "./view-engine";
 
 /**
@@ -42,6 +43,47 @@ export class PanelViewEngine extends ViewEngine {
     this.isLoadDefault = false;
   }
 
+    /**
+     * 加载模型
+     * 
+     * @memberof PanelViewEngine
+     */
+     public loadModel() {
+      const _this = this.view;
+      if (_this.context[_this.appDeCodeName.toLowerCase()]) {
+          let tempContext: any = Util.deepCopy(_this.context);
+          if (tempContext && tempContext.srfsessionid) {
+              tempContext.srfsessionkey = tempContext.srfsessionid;
+              delete tempContext.srfsessionid;
+          }
+          _this.appEntityService?.getViewData(tempContext, {}, false).then((response: any) => {
+              if (!response || response.status !== 200) {
+                  _this.$throw(`${response.data?.message ? response.data.message : '发生未知错误！'}`)
+                  return;
+              }
+              const { data: _data } = response;
+              if(_data.srfopprivs){
+                  _this.$store.commit('authresource/setSrfappdeData', { key: `${_this.deName}-${_data[_this.appDeKeyFieldName.toLowerCase()]}`, value: _data.srfopprivs });
+              }
+              if (_data[_this.appDeMajorFieldName.toLowerCase()]) {
+                  _this.model.dataInfo = _data[_this.appDeMajorFieldName.toLowerCase()];
+                  if (_this.$tabPageExp) {
+                      _this.$tabPageExp.setCurPageCaption({
+                          caption: _this.model.srfCaption,
+                          title: _this.model.srfCaption,
+                          info: _this.model.dataInfo,
+                          viewtag: _this.viewtag,
+                          cacheRoutePath: _this.cacheRoutePath
+                      });
+                  }
+                  if (_this.$route) {
+                      _this.$route.meta.info = _this.model.dataInfo;
+                  }
+              }
+          })
+      }
+  }
+
   /**
    * 刷新
    *

app_Web/packages/ibiz-core/src/engine/portal-view-engine.ts

@@ -77,7 +77,7 @@ export class PortalViewEngine extends ViewEngine {
                 tempContext.srfsessionkey = tempContext.srfsessionid;
                 delete tempContext.srfsessionid;
             }
-            _this.appEntityService?.getDataInfo?.(tempContext, {}, false).then((response: any) => {
+            _this.appEntityService?.getViewData?.(tempContext, {}, false).then((response: any) => {
                 if (!response || response.status !== 200) {
                     return;
                 }

app_Web/packages/ibiz-core/src/engine/tab-exp-view-engine.ts

@@ -64,7 +64,7 @@ export class TabExpViewEngine extends ViewEngine {
                 tempContext.srfsessionkey = tempContext.srfsessionid;
                 delete tempContext.srfsessionid;
             }
-            _this.appEntityService?.getDataInfo(tempContext, {}, false).then((response: any) => {
+            _this.appEntityService?.getViewData(tempContext, {}, false).then((response: any) => {
                 if (!response || response.status !== 200) {
                     _this.$throw(`${response.data?.message ? response.data.message : '发生未知错误！'}`)
                     return;

app_Web/packages/ibiz-core/src/service/data-service/data-service-base.ts

@@ -1434,7 +1434,7 @@ export class DataBaseService<T extends IEntityBase> implements IEntityLocalDataS
     }
 
     /**
-     * getDataInfo接口方法
+     * getViewData接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data]
@@ -1442,7 +1442,7 @@ export class DataBaseService<T extends IEntityBase> implements IEntityLocalDataS
      * @returns {Promise<any>}
      * @memberof EntityService
      */
-    public async getDataInfo(context: any = {}, data: any, isloading?: boolean): Promise<any> {
+    public async getViewData(context: any = {}, data: any, isloading?: boolean): Promise<any> {
         if (context[this.APPDENAME.toLowerCase()]) {
             return this.execute('Get', context, data);
         }

app_Web/packages/ibiz-core/src/utils/index.ts

@@ -5,6 +5,7 @@ export { XMLWriter } from './util/xml-writer';
 export { DataTypes } from './util/data-types';
 export { LayoutTool } from './util/layout-tool';
 export { ModelUtil } from './util/model-util';
+export { EleSelector } from './util/ele-selector';
 export { UIActionTool } from './ui-tools/uiaction-tool';
 export { AppEmbeddedUILogic } from './ui-tools/app-embedded-uilogic';
 export { ViewTool } from './ui-tools/view-tool';

app_Web/packages/ibiz-core/src/utils/util/ele-selector.ts

+/**
+ * 元素选择对象
+ */
+export class EleSelector {
+
+    /**
+     * 操作上下文
+     */
+    private actionContext: any;
+
+    /**
+     * 构造EleSelector对象
+     */
+    public constructor(actionContext: any) {
+        this.actionContext = actionContext;
+    }
+
+
+    /**
+     * 元素选择器(顶层路由视图)
+     * @param tag （id选择/class类名选择/css元素选择）
+     * @returns Array<any>
+     */
+    public selector(tag: string): Array<any> {
+        const targetRange = this.getTargetRange('TOPVIEW');
+        return this.getTargetElement(targetRange, tag);
+    }
+
+    /**
+     * 元素选择器(当前视图)
+     * @param tag （id选择/class类名选择/css元素选择）
+     * @returns Array<any>
+     */
+    public viewSelector(tag: string): Array<any> {
+        const targetRange = this.getTargetRange('VIEW');
+        return this.getTargetElement(targetRange, tag);
+    }
+
+    /**
+     * 元素选择器(当前应用)
+     * @param tag （id选择/class类名选择/css元素选择）
+     * @returns Array<any>
+     */
+    public appSelector(tag: string): Array<any> {
+        const targetRange = this.getTargetRange('APP');
+        return this.getTargetElement(targetRange, tag);
+    }
+
+    /**
+     * 获取目标范围
+     * @param scope 
+     */
+    private getTargetRange(scope: 'VIEW' | 'TOPVIEW' | 'APP') {
+        if (!this.actionContext || !this.actionContext.viewCtx) {
+            return document;
+        }
+        const viewCtx = this.actionContext.viewCtx;
+        if (Object.is(scope, 'VIEW')) {
+            let viewElement: any;
+            const view = viewCtx.view;
+            if (view && view.viewInstance) {
+                viewElement = document.querySelector(`#${view.viewInstance.codeName}`);
+            }
+            return viewElement ? viewElement : document;
+        } else if (Object.is(scope, 'TOPVIEW')) {
+            let topViewElement: any;
+            const topView = viewCtx.topview;
+            if (topView && topView.viewInstance) {
+                topViewElement = document.querySelector(`#${topView.viewInstance.codeName}`);
+            }
+            return topViewElement ? topViewElement : document;
+        } else {
+            return document;
+        }
+    }
+
+    /**
+     * 获取目标元素 
+     * @param range 选中范围 
+     * @param tag 选择器tag
+     */
+    private getTargetElement(range: any, tag: string): Array<any> {
+        if (!range || !tag) {
+            return [];
+        }
+        // id选择若存在返回数组
+        const tryIdEle = range.querySelector(`#${tag}`);
+        if (tryIdEle) {
+            return [tryIdEle];
+        }
+        // class类名选择返回数组
+        const tryclsNameEle = range.querySelector(`.${tag}`);
+        if (tryclsNameEle) {
+            return [tryclsNameEle];
+        }
+        // 通过css元素器获取第一个符合条件的元素的数组
+        const tryqueryEle = range.querySelector(tag);
+        if (tryqueryEle) {
+            return [tryqueryEle];
+        }
+        // 未找到返回[]
+        return [];
+    }
+}
\ No newline at end of file

app_Web/packages/ibiz-core/src/utils/util/util.ts

@@ -728,23 +728,6 @@ export class Util {
         })
     }
 
-    /**
-     * 元素选择器
-     * @param tag （id选择/class类名选择/css元素选择）
-     */
-    public static selector(tag: string) {
-        // id选择直接返回
-        if (document.getElementById(tag)) {
-            return document.getElementById(tag);
-        }
-        // class选择返回找到的第一个元素
-        if (document.getElementsByClassName(tag)) {
-            return document.getElementsByClassName(tag)[0];
-        }
-        // 通过css元素器获取第一个符合条件的元素
-        return document.querySelector(tag);
-    }
-
 }
 /**
  * 创建 UUID

app_Web/packages/ibiz-vue/src/app-logic/app-custom-action.ts

-import { LogUtil, Util } from 'ibiz-core';
+import { EleSelector, LogUtil } from 'ibiz-core';
 import { AppDEUIAction } from './app-ui-action';
 
 export class AppCustomAction extends AppDEUIAction {
@@ -39,7 +39,10 @@ export class AppCustomAction extends AppDEUIAction {
     if (this.actionModel && this.actionModel.scriptCode) {
       // 准备自定义脚本数据(context:应用上下文，params：视图参数，data：业务数据)
       const data = args;
-      const selector = Util.selector;
+      const eleSelector = new EleSelector(actionContext);
+      const selector = eleSelector.selector.bind(eleSelector);
+      const viewselector = eleSelector.viewSelector.bind(eleSelector);
+      const appselector = eleSelector.appSelector.bind(eleSelector);
       eval(this.actionModel.scriptCode);
     } else {
       LogUtil.warn(`自定义界面行为暂未实现`);

app_Web/packages/ibiz-vue/src/components/layout/app-default-layout/app-default-depanelview-layout/app-default-depanelview-layout.tsx

@@ -24,17 +24,19 @@ export class AppDefaultDePanelViewLayout extends AppDefaultViewLayout {
   public engineInit(opts: any = {}) {
     const controls: any[] = this.containerModel.getPSControls() || [];
     const panel = ModelTool.findPSControlByType('PANEL', controls);
+    const engineOpts: any = {
+      view: this,
+      p2k: '0',
+      isLoadDefault: true,
+      keyPSDEField: this.appDeCodeName.toLowerCase(),
+      majorPSDEField: this.appDeMajorFieldName.toLowerCase()
+    }
     if (panel) {
-      const engineOpts: any = {
-        view: this,
-        p2k: '0',
-        isLoadDefault: true,
-        keyPSDEField: this.appDeCodeName.toLowerCase(),
-        majorPSDEField: this.appDeMajorFieldName.toLowerCase(),
+      Object.assign(engineOpts,{
         panel: (this.$refs[panel.name] as any).ctrl
-      }
-      this.engine.init(engineOpts);
+      })
     }
+    this.engine.init(engineOpts);
   }
 
 }
\ No newline at end of file

app_Web/packages/ibiz-vue/src/components/layout/app-default-layout/app-default-indexview-layout/app-default-indexview-layout.less

@@ -24,7 +24,7 @@
 
     .app-horizontal-layout {
         .view-container {
-            height: calc(100% - 32px);
+            height: calc(100% - 24px) !important;
             width: calc(100% - 24px);
             margin: 12px;
         }

app_Web/packages/ibiz-vue/src/components/layout/app-default-layout/app-default-view-layout/app-default-view-layout.tsx

-import { IPSControl, IPSPanelButton, IPSPanelContainer, IPSPanelItem, IPSPanelRawItem, IPSPanelTabPage, IPSPanelTabPanel, IPSSysPanelButton, IPSSysPanelField, IPSViewLayoutPanel } from '@ibiz/dynamic-model-api';
+import { IPSControl, IPSDEToolbar, IPSPanelButton, IPSPanelContainer, IPSPanelItem, IPSPanelRawItem, IPSPanelTabPage, IPSPanelTabPanel, IPSSysPanelButton, IPSSysPanelField, IPSViewLayoutPanel } from '@ibiz/dynamic-model-api';
 import { appEngineService, AppServiceBase, debounce, ModelTool, PanelButtonModel, PanelContainerModel, PanelControlModel, PanelCtrlPosModel, PanelFieldModel, PanelRawitemModel, PanelTabPageModel, PanelTabPanelModel, PanelUserControlModel, PluginService, throttle, Util } from 'ibiz-core';
 import { Subject } from 'rxjs';
 import { Prop, Component } from 'vue-property-decorator';
@@ -329,7 +329,10 @@ export class AppDefaultViewLayout extends ControlContainer {
      * @memberof AppDefaultViewLayout
      */
     public async initViewLayOut() {
-        this.viewIsshowToolbar = ModelTool.findPSControlByType("TOOLBAR", this.viewInstance?.getPSControls()) ? true : false;
+        const viewToolBar: IPSDEToolbar  = ModelTool.findPSControlByType("TOOLBAR", this.viewInstance?.getPSControls());
+        if (viewToolBar && viewToolBar.getPSDEToolbarItems()) {
+          this.viewIsshowToolbar = true;
+        }
         if (this.viewLayoutPanel && !this.viewLayoutPanel.useDefaultLayout) {
             await this.initDetailsModel(null, this.viewLayoutPanel?.getRootPSPanelItems());
             this.viewIsInit = true;
@@ -640,7 +643,7 @@ export class AppDefaultViewLayout extends ControlContainer {
             <card class={cardClass} disHover={true} bordered={false}>
                 {(this.showCaption || (this.viewIsshowToolbar && this.$slots.toolbar)) && (
                     <div slot='title' class='header-container' key='view-header'>
-                        {[this.showCaption ? <span class='caption-info'>{this.$slots['layout-captionbar'] ? this.$slots['layout-captionbar'] : this.model.srfCaption}</span> : null,
+                        {[this.renderProxyViewCaption(),
                         this.viewIsshowToolbar ? <div class='toolbar-container'>
                             {this.$slots.toolbar}
                         </div> : null]}
@@ -656,6 +659,25 @@ export class AppDefaultViewLayout extends ControlContainer {
         );
     }
 
+    /**
+     * 绘制代理视图标题
+     * 
+     * @memberof AppDefaultViewLayout
+     */
+     public renderProxyViewCaption() {
+        if (this.showCaption) {
+            if (this.viewProxyMode) {
+                if (this.model.dataInfo && this.model.srfCaption) {
+                    return <span class='caption-info'>{this.model.srfCaption + '-' + this.model.dataInfo}</span>
+                } else {
+                    return <span class='caption-info'>{this.$slots['layout-captionbar'] ? this.$slots['layout-captionbar'] : this.model.srfCaption}</span>
+                }
+            } else {
+                return <span class='caption-info'>{this.$slots['layout-captionbar'] ? this.$slots['layout-captionbar'] : this.model.srfCaption}</span>
+            }
+        }
+    }
+
     /**
      * 根据detailType绘制对应detail
      *

app_Web/src/styles/default.less

@@ -171,7 +171,7 @@ html, body{
     position: absolute;
     top: 0;
     background-color: rgba(125,125,125, .3);
-    background-image: url("/assets/img/empty-data.svg");
+    background-image: url("~@/assets/img/empty-data.svg");
     background-repeat: no-repeat;
     background-position: center;
     .empty-data-shade-tip {
@@ -179,7 +179,7 @@ html, body{
       position: absolute;
       top: 50%;
       left: 50%;
-      transform: translate(-50px, 90px);
+      transform: translate(-50px, 100px);
       font-size: 20px;
     }
     &+.no-nodata-shade-child {

app_Web/swarm.yaml

@@ -3,7 +3,7 @@ services:
   trainsys-app-web:
     image: dstimage
     ports:
-      - "80:80"
+      - "50100:80"
     networks:
       - agent_network
     environment:

config.xml

@@ -55,6 +55,15 @@
 	  git clone -b master $para2 trainsys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd trainsys/
+      mkdir -p /var/lib/jenkins/appcache/A3064A91-F42D-4D7F-BC1C-4173A4F5772C
+      if [ -e app_Web/.dynamic ]
+      then
+          cd app_Web
+      else
+          cd app_Web/app
+      fi
+      sed -i "s#dstimage#registry.cn-shanghai.aliyuncs.com/ibizsys/ibizcloud-standardsys-app-webapp:2022.07.29.003#g" swarm.yaml
+      docker -H $para1 stack deploy --compose-file=swarm.yaml ebsx --with-registry-auth    
       </command>
     </hudson.tasks.Shell>
   </builders>

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

@@ -50,7 +50,7 @@
     </changeSet>
 
     <!--输出实体[BOOK]数据结构 -->
-    <changeSet author="root" id="tab-book-171-3">
+    <changeSet author="root" id="tab-book-173-3">
         <createTable tableName="T_BOOK">
                 <column name="BOOKNAME" remarks="" type="VARCHAR(200)">
                 </column>

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book.json

@@ -3721,6 +3721,12 @@
     "name" : "书实体编辑视图(测试编辑器)",
     "realModelSubType" : "DEEDITVIEW",
     "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "Usr2GridView",
+    "logicName" : "书实体测试编辑器表格视图",
+    "name" : "书实体测试编辑器表格视图",
+    "realModelSubType" : "DEGRIDVIEW",
+    "realModelType" : "PSDEVIEWBASE"
   }, {
     "codeName" : "PickupGridView",
     "logicName" : "书实体选择表格视图（部件视图）",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSGRIDS/TestEditorGrid.json

+{
+  "aggMode" : "NONE",
+  "codeName" : "TestEditorGrid",
+  "columnEnableLink" : 2,
+  "controlType" : "GRID",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSGRIDS/TestEditorGrid.json",
+  "getFetchPSControlAction" : {
+    "modelref" : true,
+    "id" : "fetch"
+  },
+  "groupMode" : "NONE",
+  "hookEventNames" : [ "ROWDBLCLICK", "SELECTIONCHANGE", "REMOVE", "LOAD", "BEFORELOAD" ],
+  "logicName" : "测试行编辑",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+  },
+  "getPSControlLogics" : [ {
+    "eventNames" : "ROWDBLCLICK;SELECTIONCHANGE;REMOVE;LOAD;BEFORELOAD",
+    "logicTag" : "grid",
+    "logicType" : "APPVIEWENGINE",
+    "name" : "engine_grid",
+    "getPSAppViewEngine" : {
+      "modelref" : true,
+      "id" : "engine"
+    }
+  } ],
+  "getPSDEGridColumns" : [ {
+    "align" : "LEFT",
+    "cLConvertMode" : "NONE",
+    "caption" : "书名称",
+    "codeName" : "bookname",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "bookname",
+    "excelCaption" : "书名称",
+    "name" : "bookname",
+    "noPrivDisplayMode" : 1,
+    "getPSAppDEField" : {
+      "name" : "BOOKNAME",
+      "codeName" : "BookName"
+    },
+    "width" : 150,
+    "widthUnit" : "PX",
+    "enableSort" : true
+  }, {
+    "align" : "LEFT",
+    "cLConvertMode" : "FRONT",
+    "caption" : "更新人",
+    "codeName" : "updateman",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "updateman",
+    "excelCaption" : "更新人",
+    "name" : "updateman",
+    "noPrivDisplayMode" : 1,
+    "getPSAppCodeList" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
+    },
+    "getPSAppDEField" : {
+      "name" : "UPDATEMAN",
+      "codeName" : "UpdateMan"
+    },
+    "width" : 150,
+    "widthUnit" : "PX",
+    "enableSort" : true
+  }, {
+    "align" : "LEFT",
+    "cLConvertMode" : "NONE",
+    "caption" : "更新时间",
+    "codeName" : "updatedate",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "updatedate",
+    "excelCaption" : "更新时间",
+    "name" : "updatedate",
+    "noPrivDisplayMode" : 1,
+    "getPSAppDEField" : {
+      "name" : "UPDATEDATE",
+      "codeName" : "UpdateDate"
+    },
+    "valueFormat" : "YYYY-MM-DD HH:mm:ss",
+    "width" : 150,
+    "widthUnit" : "PX",
+    "enableSort" : true
+  }, {
+    "align" : "LEFT",
+    "cLConvertMode" : "NONE",
+    "caption" : "类型",
+    "codeName" : "type",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "type",
+    "excelCaption" : "类型",
+    "name" : "type",
+    "noPrivDisplayMode" : 1,
+    "getPSAppDEField" : {
+      "name" : "TYPE",
+      "codeName" : "Type"
+    },
+    "width" : 100,
+    "widthUnit" : "PX",
+    "enableSort" : true
+  } ],
+  "getPSDEGridDataItems" : [ {
+    "dataType" : 25,
+    "name" : "bookname",
+    "getPSAppDEField" : {
+      "name" : "BOOKNAME",
+      "codeName" : "BookName"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "updateman",
+    "getPSAppDEField" : {
+      "name" : "UPDATEMAN",
+      "codeName" : "UpdateMan"
+    }
+  }, {
+    "format" : "YYYY-MM-DD HH:mm:ss",
+    "dataType" : 5,
+    "name" : "updatedate",
+    "getPSAppDEField" : {
+      "name" : "UPDATEDATE",
+      "codeName" : "UpdateDate"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "type",
+    "getPSAppDEField" : {
+      "name" : "TYPE",
+      "codeName" : "Type"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "srfkey",
+    "getPSAppDEField" : {
+      "name" : "BOOKID",
+      "codeName" : "BookId"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "srfdataaccaction",
+    "getPSAppDEField" : {
+      "name" : "BOOKID",
+      "codeName" : "BookId"
+    },
+    "dataAccessAction" : true
+  }, {
+    "dataType" : 25,
+    "name" : "srfmajortext",
+    "getPSAppDEField" : {
+      "name" : "BOOKNAME",
+      "codeName" : "BookName"
+    }
+  } ],
+  "getPSDEGridEditItems" : [ {
+    "caption" : "书标识",
+    "codeName" : "srfkey",
+    "enableCond" : 3,
+    "ignoreInput" : 0,
+    "name" : "srfkey",
+    "getPSAppDEField" : {
+      "name" : "BOOKID",
+      "codeName" : "BookId"
+    },
+    "getPSEditor" : {
+      "editorType" : "HIDDEN",
+      "name" : "srfkey"
+    },
+    "allowEmpty" : true
+  } ],
+  "pagingSize" : 20,
+  "getRemovePSControlAction" : {
+    "actionName" : "Remove",
+    "actionType" : "DEACTION",
+    "dataAccessAction" : "DELETE",
+    "name" : "remove",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "Remove"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+    }
+  },
+  "sortMode" : "REMOTE",
+  "hasWFDataItems" : false,
+  "enableColFilter" : false,
+  "enableCustomized" : true,
+  "enableGroup" : false,
+  "enablePagingBar" : true,
+  "enableRowEdit" : false,
+  "enableRowEditOrder" : false,
+  "enableRowNew" : false,
+  "forceFit" : false,
+  "hideHeader" : false,
+  "noSort" : false,
+  "singleSelect" : false,
+  "modelid" : "0DBB175D-29C0-4062-879E-F0927B0629C9",
+  "modeltype" : "PSDEGRID"
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2GridView.json

+{
+  "accUserMode" : 2,
+  "caption" : "书",
+  "codeName" : "bookUsr2GridView",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2GridView.json",
+  "gridRowActiveMode" : 2,
+  "name" : "bookUsr2GridView",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+  },
+  "getPSAppViewEngines" : [ {
+    "engineCat" : "VIEW",
+    "engineType" : "GridView",
+    "name" : "engine",
+    "getPSUIEngineParams" : [ {
+      "appViewLogicName" : "opendata",
+      "name" : "OPENDATA",
+      "paramType" : "LOGIC"
+    }, {
+      "appViewLogicName" : "newdata",
+      "name" : "NEWDATA",
+      "paramType" : "LOGIC"
+    }, {
+      "ctrlName" : "grid",
+      "name" : "GRID",
+      "paramType" : "CTRL"
+    }, {
+      "ctrlName" : "searchform",
+      "name" : "SEARCHFORM",
+      "paramType" : "CTRL"
+    } ]
+  } ],
+  "getPSAppViewLogics" : [ {
+    "logicTrigger" : "CUSTOM",
+    "logicType" : "SYSUILOGIC",
+    "name" : "newdata",
+    "getPSAppUILogic" : {
+      "actionAfterWizard" : "DEFAULT",
+      "logicType" : "PREDEFINED",
+      "name" : "新建数据",
+      "getNewDataPSAppView" : {
+        "getRefPSAppView" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookEditView.json",
+          "viewType" : "DEEDITVIEW"
+        }
+      },
+      "getPSAppUILogicRefViews" : [ {
+        "getRefPSAppView" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookEditView.json",
+          "viewType" : "DEEDITVIEW"
+        }
+      } ],
+      "viewLogicType" : "APP_NEWDATA",
+      "batchAddOnly" : false,
+      "enableBatchAdd" : false,
+      "enableWizardAdd" : false
+    }
+  }, {
+    "logicTrigger" : "CUSTOM",
+    "logicType" : "SYSUILOGIC",
+    "name" : "opendata",
+    "getPSAppUILogic" : {
+      "logicType" : "PREDEFINED",
+      "name" : "打开数据",
+      "getOpenDataPSAppView" : {
+        "getRefPSAppView" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookEditView.json",
+          "viewType" : "DEEDITVIEW"
+        }
+      },
+      "getPSAppUILogicRefViews" : [ {
+        "getRefPSAppView" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookEditView.json",
+          "viewType" : "DEEDITVIEW"
+        }
+      } ],
+      "viewLogicType" : "APP_OPENDATA",
+      "editMode" : true
+    }
+  } ],
+  "getPSAppViewRefs" : [ {
+    "name" : "NEWDATA",
+    "realTitle" : "书编辑视图",
+    "getRefPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookEditView.json",
+      "viewType" : "DEEDITVIEW"
+    }
+  }, {
+    "name" : "EDITDATA",
+    "realTitle" : "书编辑视图",
+    "getRefPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookEditView.json",
+      "viewType" : "DEEDITVIEW"
+    }
+  } ],
+  "getPSControls" : [ {
+    "aggMode" : "NONE",
+    "codeName" : "TestEditorGrid",
+    "columnEnableLink" : 2,
+    "controlType" : "GRID",
+    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSGRIDS/TestEditorGrid.json",
+    "getFetchPSControlAction" : {
+      "modelref" : true,
+      "id" : "fetch"
+    },
+    "groupMode" : "NONE",
+    "hookEventNames" : [ "ROWDBLCLICK", "SELECTIONCHANGE", "REMOVE", "LOAD", "BEFORELOAD" ],
+    "logicName" : "测试行编辑",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+    },
+    "getPSControlHandler" : {
+      "getPSHandlerActions" : [ {
+        "actionName" : "Get",
+        "actionType" : "DEACTION",
+        "dataAccessAction" : "READ",
+        "name" : "load",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "Get"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+        }
+      }, {
+        "actionName" : "Create",
+        "actionType" : "DEACTION",
+        "dataAccessAction" : "CREATE",
+        "name" : "create",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "Create"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+        }
+      }, {
+        "actionName" : "Update",
+        "actionType" : "DEACTION",
+        "dataAccessAction" : "UPDATE",
+        "name" : "update",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "Update"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+        }
+      }, {
+        "actionName" : "Remove",
+        "actionType" : "DEACTION",
+        "dataAccessAction" : "DELETE",
+        "name" : "remove",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "Remove"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+        }
+      }, {
+        "actionName" : "GetDraft",
+        "actionType" : "DEACTION",
+        "dataAccessAction" : "CREATE",
+        "name" : "loaddraft",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "GetDraft"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+        }
+      }, {
+        "actionType" : "DEDATASET",
+        "name" : "fetch",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "FetchDefault"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+        }
+      } ],
+      "userDRAction" : "READ",
+      "enableDEFieldPrivilege" : false,
+      "id" : "数据表格处理器"
+    },
+    "getPSControlLogics" : [ {
+      "eventNames" : "ROWDBLCLICK;SELECTIONCHANGE;REMOVE;LOAD;BEFORELOAD",
+      "logicTag" : "grid",
+      "logicType" : "APPVIEWENGINE",
+      "name" : "engine_grid",
+      "getPSAppViewEngine" : {
+        "modelref" : true,
+        "id" : "engine"
+      }
+    } ],
+    "getPSControlParam" : {
+      "autoLoad" : true,
+      "showBusyIndicator" : true,
+      "id" : "GRID"
+    },
+    "getPSDEGridColumns" : [ {
+      "align" : "LEFT",
+      "cLConvertMode" : "NONE",
+      "caption" : "书名称",
+      "codeName" : "bookname",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "bookname",
+      "excelCaption" : "书名称",
+      "name" : "bookname",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "BOOKNAME",
+        "codeName" : "BookName"
+      },
+      "width" : 150,
+      "widthUnit" : "PX",
+      "enableSort" : true
+    }, {
+      "align" : "LEFT",
+      "cLConvertMode" : "FRONT",
+      "caption" : "更新人",
+      "codeName" : "updateman",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "updateman",
+      "excelCaption" : "更新人",
+      "name" : "updateman",
+      "noPrivDisplayMode" : 1,
+      "getPSAppCodeList" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
+      },
+      "getPSAppDEField" : {
+        "name" : "UPDATEMAN",
+        "codeName" : "UpdateMan"
+      },
+      "width" : 150,
+      "widthUnit" : "PX",
+      "enableSort" : true
+    }, {
+      "align" : "LEFT",
+      "cLConvertMode" : "NONE",
+      "caption" : "更新时间",
+      "codeName" : "updatedate",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "updatedate",
+      "excelCaption" : "更新时间",
+      "name" : "updatedate",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "UPDATEDATE",
+        "codeName" : "UpdateDate"
+      },
+      "valueFormat" : "YYYY-MM-DD HH:mm:ss",
+      "width" : 150,
+      "widthUnit" : "PX",
+      "enableSort" : true
+    }, {
+      "align" : "LEFT",
+      "cLConvertMode" : "NONE",
+      "caption" : "类型",
+      "codeName" : "type",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "type",
+      "excelCaption" : "类型",
+      "name" : "type",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "TYPE",
+        "codeName" : "Type"
+      },
+      "width" : 100,
+      "widthUnit" : "PX",
+      "enableSort" : true
+    } ],
+    "getPSDEGridDataItems" : [ {
+      "dataType" : 25,
+      "name" : "bookname",
+      "getPSAppDEField" : {
+        "name" : "BOOKNAME",
+        "codeName" : "BookName"
+      }
+    }, {
+      "dataType" : 25,
+      "name" : "updateman",
+      "getPSAppDEField" : {
+        "name" : "UPDATEMAN",
+        "codeName" : "UpdateMan"
+      }
+    }, {
+      "format" : "YYYY-MM-DD HH:mm:ss",
+      "dataType" : 5,
+      "name" : "updatedate",
+      "getPSAppDEField" : {
+        "name" : "UPDATEDATE",
+        "codeName" : "UpdateDate"
+      }
+    }, {
+      "dataType" : 25,
+      "name" : "type",
+      "getPSAppDEField" : {
+        "name" : "TYPE",
+        "codeName" : "Type"
+      }
+    }, {
+      "dataType" : 25,
+      "name" : "srfkey",
+      "getPSAppDEField" : {
+        "name" : "BOOKID",
+        "codeName" : "BookId"
+      }
+    }, {
+      "dataType" : 25,
+      "name" : "srfdataaccaction",
+      "getPSAppDEField" : {
+        "name" : "BOOKID",
+        "codeName" : "BookId"
+      },
+      "dataAccessAction" : true
+    }, {
+      "dataType" : 25,
+      "name" : "srfmajortext",
+      "getPSAppDEField" : {
+        "name" : "BOOKNAME",
+        "codeName" : "BookName"
+      }
+    } ],
+    "getPSDEGridEditItems" : [ {
+      "caption" : "书标识",
+      "codeName" : "srfkey",
+      "enableCond" : 3,
+      "ignoreInput" : 0,
+      "name" : "srfkey",
+      "getPSAppDEField" : {
+        "name" : "BOOKID",
+        "codeName" : "BookId"
+      },
+      "getPSEditor" : {
+        "editorType" : "HIDDEN",
+        "name" : "srfkey"
+      },
+      "allowEmpty" : true
+    } ],
+    "pagingSize" : 20,
+    "getRemovePSControlAction" : {
+      "actionName" : "Remove",
+      "actionType" : "DEACTION",
+      "dataAccessAction" : "DELETE",
+      "name" : "remove",
+      "getPSAppDEMethod" : {
+        "modelref" : true,
+        "id" : "Remove"
+      },
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+      }
+    },
+    "sortMode" : "REMOTE",
+    "hasWFDataItems" : false,
+    "enableColFilter" : false,
+    "enableCustomized" : true,
+    "enableGroup" : false,
+    "enablePagingBar" : true,
+    "enableRowEdit" : false,
+    "enableRowEditOrder" : false,
+    "enableRowNew" : false,
+    "forceFit" : false,
+    "hideHeader" : false,
+    "noSort" : false,
+    "singleSelect" : false,
+    "name" : "grid",
+    "modelid" : "0DBB175D-29C0-4062-879E-F0927B0629C9",
+    "modeltype" : "PSDEGRID"
+  }, {
+    "codeName" : "Default",
+    "controlType" : "SEARCHFORM",
+    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSSEARCHFORMS/Default.json",
+    "hookEventNames" : [ "SEARCH", "LOAD", "SAVE" ],
+    "logicName" : "默认搜索表单",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+    },
+    "getPSControlHandler" : {
+      "getPSHandlerActions" : [ {
+        "actionType" : "FILTERACTION",
+        "name" : "load",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "FilterGet"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+        }
+      }, {
+        "actionType" : "FILTERACTION",
+        "name" : "loaddraft",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "FilterGetDraft"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+        }
+      }, {
+        "actionType" : "FILTERACTION",
+        "name" : "search",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "FilterSearch"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+        }
+      } ],
+      "enableDEFieldPrivilege" : false,
+      "id" : "搜索表单处理器"
+    },
+    "getPSControlLogics" : [ {
+      "eventNames" : "SEARCH;LOAD;SAVE",
+      "logicTag" : "searchform",
+      "logicType" : "APPVIEWENGINE",
+      "name" : "engine_searchform",
+      "getPSAppViewEngine" : {
+        "modelref" : true,
+        "id" : "engine"
+      }
+    } ],
+    "getPSControlParam" : {
+      "autoLoad" : true,
+      "showBusyIndicator" : true,
+      "id" : "SEARCHFORM"
+    },
+    "getPSDEFormPages" : [ {
+      "caption" : "常规条件",
+      "codeName" : "formpage1",
+      "detailStyle" : "DEFAULT",
+      "detailType" : "FORMPAGE",
+      "name" : "formpage1",
+      "getPSLayout" : {
+        "columnCount" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "infoGroupMode" : false
+    } ],
+    "getPSLayout" : {
+      "columnCount" : 24,
+      "layout" : "TABLE_24COL"
+    },
+    "searchButtonStyle" : "DEFAULT",
+    "tabHeaderPos" : "TOP",
+    "enableAdvanceSearch" : false,
+    "enableAutoSearch" : false,
+    "enableFilterSave" : false,
+    "noTabHeader" : true,
+    "name" : "searchform",
+    "modelid" : "5e4b87cb5540f41fffa44b8cc73b3404",
+    "modeltype" : "PSDEFORM_SEARCHFORM"
+  }, {
+    "codeName" : "Usr2GridViewtoolbar",
+    "controlType" : "TOOLBAR",
+    "name" : "toolbar",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+    },
+    "getPSControlParam" : {
+      "id" : "TOOLBAR"
+    },
+    "modelid" : "ba535ef97a2136f0249bd64e432421e8_toolbar",
+    "modeltype" : "PSDETOOLBAR"
+  } ],
+  "getPSDEViewCodeName" : "Usr2GridView",
+  "getPSDEViewId" : "C7A2DCD7-1BF2-4423-984D-2DACEFDA43A8",
+  "getPSViewLayoutPanel" : {
+    "codeName" : "Layoutpanel",
+    "controlStyle" : "APPDEGRIDVIEW",
+    "controlType" : "VIEWLAYOUTPANEL",
+    "name" : "layoutpanel",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+    },
+    "getPSControlParam" : { },
+    "layoutBodyOnly" : true,
+    "layoutPanel" : true,
+    "useDefaultLayout" : true
+  },
+  "title" : "书实体测试编辑器表格视图",
+  "viewStyle" : "DEFAULT",
+  "viewType" : "DEGRIDVIEW",
+  "xDataControlName" : "grid",
+  "enableDP" : true,
+  "enableExport" : true,
+  "enableFilter" : true,
+  "enableImport" : true,
+  "enableQuickSearch" : true,
+  "enableRowEdit" : false,
+  "enableSearch" : true,
+  "rowEditDefault" : false,
+  "modelid" : "ba535ef97a2136f0249bd64e432421e8",
+  "modeltype" : "PSAPPDEVIEW"
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json

@@ -1128,6 +1128,12 @@
     "viewType" : "DEEDITVIEW",
     "resource" : "BXDMX",
     "view" : "EditView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2GridView.json",
+    "viewType" : "DEGRIDVIEW",
+    "resource" : "Book",
+    "view" : "Usr2GridView"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2EditView2.json",