lxm1993 发布系统代码 [TrainSys，网页端]

app_Web/CHANGELOG.md

+## v8.0.1 [2022-9-02]
+
+## 2022-09-02
+
+动态代码表支持禁用选择配置[22891ad82](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/22891ad826d5a9b9ab5b84e8d54a4b6554a1b44b)（by Shine-zwj）
+
+面板属性绑定样式名及样式[cb299d659](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/cb299d659856f96dbca632b2a88f00625446c317)（by Shine-zwj)
+
+新增导航类视图支持刷新内嵌视图[e595ad37f](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/e595ad37f3ca09faee7b37b6517421ab98391fe9)（by tony）
+
+分页导航面板支持样式表[ab0e169a0](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/ab0e169a0459cdc4faf0a5b47b264b6e0b16dffe)（by tony）
+
+支持工具栏项为自定义代码类型[1f49cbf3c](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/1f49cbf3c788bed3d26f1b7de56775deb136c2ed)（by tony）
+
+更新无数据遮罩文字提示[1a926295e](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/1a926295e0e5dcf437240a245873652417adeeaf)（by Shine-zwj)
+
+更新是否显示工具栏逻辑[955d69143](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/955d691430c15296950c01b1e7a3e9833d7223e6)（by Shine-zwj)
+
+更新实体单项数据视图拥有getViewData方法能力[51e4928b1](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/51e4928b191a7f3ed702576bc5874ad17eebfe98)（by tony）
+
+升级模型api包版本为0.0.61 [02e851696](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/02e851696f40b48b2b5c9c50085dcb2b5d0cd2c7)（by tony）
+
+支持视图布局面板绑定应用全局变量/顶级视图会话共享变量/当前视图会话共享变量[80e61635a](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/80e61635a0aec49288ffc50a5e20125307afc46e)（by tony）
+
+前台界面行为支持用户自定义[9ef6693e3](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/9ef6693e399606ab232b6fd7e3f38a363d265361)（by tony）
+
+表单分组显示更多逻辑优化[1ce9cd252](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/1ce9cd252ed035209556b68061f743e726a0fe32)（by RedPig97）
+
+表格支持适应屏宽配置[a0ba8c27a](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/a0ba8c27a549b132370e2012814f5175202ce18c)（by RedPig97）
+
 ## v8.0.0 [2022-8-26]
 
 ## 2022-08-26

app_Web/package.json

@@ -72,7 +72,7 @@
         "@interactjs/actions": "^1.10.11",
         "@interactjs/modifiers": "^1.10.11",
         "@interactjs/dev-tools": "^1.10.11",
-        "@ibiz/dynamic-model-api": "1.0.5",
+        "@ibiz/dynamic-model-api": "1.0.6",
         "@ibiz/model-location": "^0.0.4",
         "xgplayer":"2.31.4",
         "xlsx": "^0.16.9"

app_Web/packages/ibiz-core/src/model/form-detail/form-group-panel.ts

@@ -47,7 +47,7 @@ export class FormGroupPanelModel extends FormDetailModel {
      * @type {*}
      * @memberof FormGroupPanelModel
      */
-    public manageContainerStatus: boolean = true;
+    public manageContainerStatus: boolean = false;
 
     /**
      * Creates an instance of FormGroupPanelModel.

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

@@ -9,7 +9,7 @@ import {
     IPSNavigateContext,
     IPSNavigateParam
 } from '@ibiz/dynamic-model-api';
-import { Http, IContext, IParams, LogUtil, ModelTool, StringUtil, UIActionTool, UIServiceHelp, Util, ViewTool } from 'ibiz-core';
+import { EleSelector, Http, IContext, IParams, LogUtil, ModelTool, StringUtil, UIActionTool, UIServiceHelp, Util, ViewTool } from 'ibiz-core';
 import { Subject } from 'rxjs';
 import { AppGlobalService } from '../app-service';
 import { appPopup } from '../utils';
@@ -123,8 +123,11 @@ export class AppFrontAction extends AppDEUIAction {
                 srfparentkey: srfParentDeName ? context[srfParentDeName.toLowerCase()] : null,
             };
             Object.assign(context, parentObj);
+            if (Object.is(this.actionModel.frontProcessType, 'OTHER')) {
+                await this.executeOther(actionContext, context, params, args);
+            }
             // 打印
-            if (Object.is(this.actionModel.frontProcessType, 'PRINT')) {
+            else if (Object.is(this.actionModel.frontProcessType, 'PRINT')) {
                 await this.executePrint(actionContext, context, params);
             }
             // 数据导入            
@@ -151,6 +154,8 @@ export class AppFrontAction extends AppDEUIAction {
         }
     }
 
+
+
     /**
      * 打开视图
      *
@@ -441,6 +446,27 @@ export class AppFrontAction extends AppDEUIAction {
         })
     }
 
+    /**
+     * 执行用户自定义
+     * 
+     * @param actionContext 
+     * @param context 
+     * @param viewparams 
+     * @param data 
+     */
+    async executeOther(actionContext: any, context: IContext, viewparams: IParams,args:any){
+        if(this.actionModel.scriptCode){
+            const data = args;
+            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/common/app-picker/app-picker.vue

@@ -18,7 +18,6 @@
                     }
                 "
                 @select="onACSelect"
-                @input="onInput"
                 @blur="onBlur"
                 @focus="onAcFocus"
                 style="width: 100%"
@@ -356,14 +355,6 @@ export default class AppPicker extends Vue {
      */
     throttle: Function = throttle;
 
-    /**
-     * 输入状态
-     *
-     * @type {boolean}
-     * @memberof AppPicker
-     */
-    public inputState: boolean = false;
-
     /**
      * 当前选择的值
      *
@@ -521,10 +512,9 @@ export default class AppPicker extends Vue {
         let _context = data.context;
         let _param = data.param;
         query = !query ? '' : query;
-        if (!this.inputState && other && Object.is(query, this.value)) {
+        if (other && Object.is(query, this.value)) {
             query = '';
         }
-        this.inputState = false;
         if (this.sort && !Object.is(this.sort, '')) {
             Object.assign(_param, { sort: this.sort });
         }
@@ -1017,17 +1007,6 @@ export default class AppPicker extends Vue {
         }
     }
 
-    /**
-     * 输入过程中
-     *
-     * @memberof AppPicker
-     */
-    public onInput($event: any) {
-        if (Object.is($event, this.value)) {
-            this.inputState = true;
-        }
-    }
-
     /**
      * 展开下拉
      *

app_Web/packages/ibiz-vue/src/components/control/app-common-control/app-grid-base.tsx

@@ -244,16 +244,21 @@ export class AppGridBase extends GridControlBase {
      * @memberof AppGridBase
      */
     public renderGridContent(h: any) {
+        const isForceFit = true;
         this.renderEmptyColumn = !this.allColumns.find((column: any) => {
             return column.columnType != 'GROUPGRIDCOLUMN' && column.show && Object.is(column.unit, 'STAR');
         });
+        const controlClass = {
+            'grid-rowactive-click': this.gridRowActiveMode == 1,
+            'force-fit': isForceFit
+        }
         return this.$createElement(
             'el-table',
             {
                 props: this.computeGridParams(),
                 on: this.computeGridEvents(),
                 ref: `${this.realCtrlRefName}`,
-                class: this.gridRowActiveMode == 1 ? "grid-rowactive-click" : null,
+                class: controlClass,
                 scopedSlots: {
                     // 无数据插槽
                     empty: (scope: any) => {
@@ -279,7 +284,7 @@ export class AppGridBase extends GridControlBase {
                     ></el-table-column>
                 ) : null,
                 this.renderGridColumns(this.allColumnsInstance),
-                this.renderEmptyColumn ? <el-table-column></el-table-column> : null,
+                this.renderEmptyColumn && !isForceFit ? <el-table-column></el-table-column> : null,
                 this.renderSummaryPanel()
             ],
         );

app_Web/packages/ibiz-vue/src/components/control/app-common-control/app-portlet-base.tsx

@@ -363,12 +363,11 @@ export class AppPortletBase extends PortletControlBase {
     /**
      * 处理操作列点击
      * 
-     * @memberof GridControlBase
+     * @memberof AppPortletBase
      */
     public handleActionClick(event: any, detail: any) {
         const { name } = this.controlInstance;
-        let data = Util.deepCopy(this.context);
-        AppViewLogicService.getInstance().executeViewLogic(`${name}_${detail.name}_click`, event, this, data, this.controlInstance?.getPSAppViewLogics());
+        AppViewLogicService.getInstance().executeViewLogic(`${name}_${detail.name}_click`, event, this, {}, this.controlInstance?.getPSAppViewLogics());
     }
 
     /**
@@ -403,4 +402,4 @@ export class AppPortletBase extends PortletControlBase {
             </div>
         )
     }
-}
+}
\ No newline at end of file

app_Web/packages/ibiz-vue/src/components/control/app-default-grid/app-default-grid.less

@@ -108,6 +108,14 @@
           height: auto;
           display: block !important;
       }
+      &.force-fit {
+        >.el-table__header-wrapper>.el-table__header {
+          width: 100% !important;
+        }
+        >.el-table__body-wrapper >.el-table__body{
+          width: 100% !important;
+        }
+      }
   }
 // 表格(单击能打开时移上去有小手)
   .el-table.grid-rowactive-click {

app_Web/packages/ibiz-vue/src/view-container/app-indexview-shell.tsx

 import { IPSAppDataEntity, IPSAppIndexView, IPSAppView, IPSLanguageRes, IPSSysImage } from '@ibiz/dynamic-model-api';
-import { AppServiceBase, EntityPathService, LogUtil, Util } from 'ibiz-core';
+import { AppServiceBase, EntityPathService, LogUtil, ModelTool, Util } from 'ibiz-core';
+import qs from 'qs';
 import { isNilOrEmpty } from 'qx-util';
 import { Component, Emit, Prop } from 'vue-property-decorator';
 import { AppViewShell } from './app-view-shell';
@@ -51,8 +52,17 @@ export class AppIndexViewShell extends ViewContainerBase {
     // 挂载动态路由
     this.mountedDynaRoute(this.$router);
     // 跳转重定向来源路由
-    if (AppServiceBase.getInstance().getRedirectedFromRoute()) {
-      this.$router.push(AppServiceBase.getInstance().getRedirectedFromRoute());
+    let redirectUrl = AppServiceBase.getInstance().getRedirectedFromRoute();
+    if (redirectUrl) {
+      // 全局重定向跳转(对路径做处理)
+      const tempViewParam = this.parseViewParam(redirectUrl);
+      if(tempViewParam.redirectType && Object.is(tempViewParam.redirectType,'APPREDIRECT') && tempViewParam.redirectDEName){
+        const redirectCodeName = ModelTool.getAppEntityCodeNameByName(tempViewParam.redirectDEName);
+        if(redirectCodeName !== tempViewParam.redirectDEName){
+          redirectUrl = redirectUrl.replace(Util.srfpluralize(tempViewParam.redirectDEName),Util.srfpluralize(redirectCodeName));
+        }
+      }
+      this.$router.push(redirectUrl);
     }
     const currentParams = this.$route.params;
     let targetIndexView: IPSAppView | undefined = undefined;
@@ -84,7 +94,7 @@ export class AppIndexViewShell extends ViewContainerBase {
           return route.name === 'index';
         })
         if (indexRoute && indexRoute.meta) {
-          if(indexView.caption){
+          if (indexView.caption) {
             indexRoute.meta.caption = indexView.caption;
             document.title = indexView.caption;
           }
@@ -110,6 +120,25 @@ export class AppIndexViewShell extends ViewContainerBase {
     super.destroyed();
   }
 
+  /**
+   * 处理路径数据
+   *
+   * @param {*} [urlStr] 路径
+   *
+   * @memberof AppIndexViewShell
+   */
+  public parseViewParam(urlStr: string): any {
+    let tempViewParam: any = {};
+    const tempViewparam: any = urlStr.slice(urlStr.lastIndexOf('?') + 1);
+    const viewparamArray: Array<string> = decodeURIComponent(tempViewparam).split(';');
+    if (viewparamArray.length > 0) {
+      viewparamArray.forEach((item: any) => {
+        Object.assign(tempViewParam, qs.parse(item));
+      });
+    }
+    return tempViewParam;
+  }
+
   /**
    * 挂载动态路由
    *

app_Web/packages/ibiz-vue/src/widgets/editform-control-base.tsx

@@ -1445,7 +1445,7 @@ export class EditFormControlBase extends FormControlBase implements EditFormCont
             model.setManageContainerStatus(!model.manageContainerStatus);
             model.controlledItems.forEach((item: any) => {
                 if (this.detailsModel[item].isControlledContent) {
-                    this.detailsModel[item].setVisible(model.manageContainerStatus ? this.detailsModel[item].oldVisible : false);
+                    this.detailsModel[item].setVisible(model.manageContainerStatus);
                 }
             });
             this.$forceUpdate();
@@ -1681,14 +1681,15 @@ export class EditFormControlBase extends FormControlBase implements EditFormCont
         const allFormDetails: IPSDEFormDetail[] = ModelTool.getAllFormDetails(this.controlInstance);
         if (allFormDetails.length > 0) {
             for (const detail of allFormDetails) {
+                const isShowMore = detail.showMoreMode == 1;
                 let detailOpts: any = {
                     name: detail.name,
                     caption: detail.caption,
                     isShowCaption: detail.showCaption,
                     detailType: detail.detailType,
-                    visible: !ModelTool.findGroupLogicByLogicCat('PANELVISIBLE', detail.getPSDEFDGroupLogics()),
+                    visible: !ModelTool.findGroupLogicByLogicCat('PANELVISIBLE', detail.getPSDEFDGroupLogics()) && !isShowMore,
                     form: this,
-                    isControlledContent: detail.showMoreMode == 1,
+                    isControlledContent: isShowMore,
                 };
                 let detailModel: any = null;
                 switch (detail.detailType) {

app_Web/packages/ibiz-vue/src/widgets/grid-exp-bar-control-base.ts

@@ -36,7 +36,11 @@ export class GridExpBarControlBase extends ExpBarControlBase implements GridExpB
             this.navViewName = navPSAppView.modelPath;
         }
         this.navFilter = this.$xDataControl?.navFilter ? this.$xDataControl.navFilter : "";
-        this.navPSDer = (this.$xDataControl?.getNavPSDER?.() as IPSDERBase) ? "n_" + (this.$xDataControl.getNavPSDER() as IPSDERBase).minorCodeName?.toLowerCase() + "_eq" : "";
+        const navPSDer: any = this.$xDataControl.getNavPSDER();
+        if (navPSDer) {
+            this.navPSDer = `n_${(navPSDer.pickupDEFName && navPSDer.minorCodeName).toLowerCase()}_eq`;
+        }
+        // this.navPSDer = (this.$xDataControl?.getNavPSDER?.() as IPSDERBase) ? "n_" + (this.$xDataControl.getNavPSDER() as any).pickupDEFName?.toLowerCase() + "_eq" : "";
         //  导航上下文
         const navContext = (this.$xDataControl as any).getPSNavigateContexts();
         if (navContext && navContext.length) {

app_Web/src/components/app-redirect-view/app-redirect-view.vue

@@ -57,10 +57,11 @@ export default class AppRedirectView extends Vue {
             this.$throw('跳转参数不足，无法完成跳转操作!', 'executeRedirectLogic');
             return;
         }
+        // 添加全局重定向标识redirectType和redirectDEName
+        Object.assign(tempViewParam,{redirectType:'APPREDIRECT',redirectDEName:tempViewParam['srfdename']});
         // 避免数据污染
         delete tempViewParam['srfdename'];
         delete tempViewParam['srfindexname'];
-        delete tempViewParam[srfdename];
         // 计算路径
         let viewPath: string = `/${srfindexname}/${Util.srfpluralize(srfdecodename)}/${
             viewparam[srfdename]

app_Web/src/styles/default.less

@@ -522,6 +522,7 @@ html, body{
     //  快速搜索
     .app-quick-search {
       width: 200px;
+      padding-left: 0;
     }
     //  工具栏
     .toolbar-container {

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

@@ -50,7 +50,7 @@
     </changeSet>
 
     <!--输出实体[BOOK]数据结构 -->
-    <changeSet author="root" id="tab-book-187-3">
+    <changeSet author="root" id="tab-book-196-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

@@ -2025,7 +2025,7 @@
         "editorType" : "MOBDATE",
         "name" : "[DATE][日期]移动端默认",
         "uIMode" : "MOBILEDEFAULT",
-        "valueFormat" : "%1$tY-%1$tm-%1$td",
+        "valueFormat" : "YYYY",
         "mobileMode" : true
       },
       "type" : "MOBILEDEFAULT",
@@ -2038,7 +2038,7 @@
         "editorType" : "DATEPICKEREX_NOTIME",
         "name" : "[DATE][日期]",
         "uIMode" : "DEFAULT",
-        "valueFormat" : "%1$tY-%1$tm-%1$td"
+        "valueFormat" : "YYYY"
       },
       "type" : "DEFAULT"
     } ],
@@ -2071,7 +2071,7 @@
       "id" : "DATE"
     },
     "stdDataType" : 5,
-    "valueFormat" : "%1$tY-%1$tm-%1$td"
+    "valueFormat" : "YYYY"
   }, {
     "getAllPSDEFDTColumns" : [ {
       "columnName" : "FIELD11",

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

@@ -76,7 +76,8 @@
     },
     "requestMethod" : "POST",
     "requestParamType" : "ENTITY",
-    "builtinMethod" : false
+    "builtinMethod" : false,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "READ",
     "codeName" : "Get",
@@ -102,7 +103,8 @@
     "requestMethod" : "GET",
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "GETDRAFT",
     "codeName" : "GetDraft",
@@ -151,7 +153,8 @@
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
     "enableBatchAction" : true,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "UNKNOWN",
     "codeName" : "Save",
@@ -199,7 +202,8 @@
     "requestMethod" : "PUT",
     "requestParamType" : "ENTITY",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   } ],
   "getAllPSAppDEDataSets" : [ {
     "codeName" : "FetchDefault",
@@ -462,7 +466,8 @@
     },
     "requestMethod" : "POST",
     "requestParamType" : "ENTITY",
-    "builtinMethod" : false
+    "builtinMethod" : false,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "READ",
     "codeName" : "Get",
@@ -488,7 +493,8 @@
     "requestMethod" : "GET",
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "GETDRAFT",
     "codeName" : "GetDraft",
@@ -537,7 +543,8 @@
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
     "enableBatchAction" : true,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "UNKNOWN",
     "codeName" : "Save",
@@ -585,7 +592,8 @@
     "requestMethod" : "PUT",
     "requestParamType" : "ENTITY",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "codeName" : "FetchDefault",
     "methodType" : "FETCH",

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

@@ -76,7 +76,8 @@
     },
     "requestMethod" : "POST",
     "requestParamType" : "ENTITY",
-    "builtinMethod" : false
+    "builtinMethod" : false,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "READ",
     "codeName" : "Get",
@@ -102,7 +103,8 @@
     "requestMethod" : "GET",
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "GETDRAFT",
     "codeName" : "GetDraft",
@@ -151,7 +153,8 @@
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
     "enableBatchAction" : true,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "UNKNOWN",
     "codeName" : "Save",
@@ -199,7 +202,8 @@
     "requestMethod" : "PUT",
     "requestParamType" : "ENTITY",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   } ],
   "getAllPSAppDEDataSets" : [ {
     "codeName" : "FetchDefault",
@@ -1025,7 +1029,8 @@
     },
     "requestMethod" : "POST",
     "requestParamType" : "ENTITY",
-    "builtinMethod" : false
+    "builtinMethod" : false,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "READ",
     "codeName" : "Get",
@@ -1051,7 +1056,8 @@
     "requestMethod" : "GET",
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "GETDRAFT",
     "codeName" : "GetDraft",
@@ -1100,7 +1106,8 @@
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
     "enableBatchAction" : true,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "UNKNOWN",
     "codeName" : "Save",
@@ -1148,7 +1155,8 @@
     "requestMethod" : "PUT",
     "requestParamType" : "ENTITY",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "codeName" : "FetchDefault",
     "methodType" : "FETCH",

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

@@ -283,8 +283,8 @@
           "enableLinkView" : false
         },
         "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
+          "grow" : -1,
+          "layout" : "FLEX"
         },
         "allowEmpty" : true,
         "showCaption" : true
@@ -328,8 +328,8 @@
           } ]
         },
         "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
+          "grow" : -1,
+          "layout" : "FLEX"
         },
         "allowEmpty" : true,
         "showCaption" : true
@@ -359,8 +359,8 @@
           "singleSelect" : true
         },
         "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
+          "grow" : -1,
+          "layout" : "FLEX"
         },
         "allowEmpty" : true,
         "needCodeListConfig" : true,
@@ -391,8 +391,8 @@
           "singleSelect" : true
         },
         "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
+          "grow" : -1,
+          "layout" : "FLEX"
         },
         "allowEmpty" : true,
         "needCodeListConfig" : true,
@@ -423,8 +423,8 @@
           "singleSelect" : false
         },
         "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
+          "grow" : -1,
+          "layout" : "FLEX"
         },
         "allowEmpty" : true,
         "needCodeListConfig" : true,
@@ -454,8 +454,8 @@
           }
         },
         "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
+          "grow" : -1,
+          "layout" : "FLEX"
         },
         "allowEmpty" : true,
         "needCodeListConfig" : true,
@@ -485,8 +485,8 @@
           }
         },
         "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
+          "grow" : -1,
+          "layout" : "FLEX"
         },
         "allowEmpty" : true,
         "needCodeListConfig" : true,
@@ -518,8 +518,8 @@
           "name" : "date"
         },
         "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
+          "grow" : -1,
+          "layout" : "FLEX"
         },
         "valueFormat" : "yyyy-MM",
         "allowEmpty" : true,
@@ -558,8 +558,8 @@
           "name" : "field6"
         },
         "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
+          "grow" : -1,
+          "layout" : "FLEX"
         },
         "allowEmpty" : true,
         "showCaption" : true
@@ -587,8 +587,8 @@
           "name" : "field18"
         },
         "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
+          "grow" : -1,
+          "layout" : "FLEX"
         },
         "allowEmpty" : true,
         "showCaption" : true
@@ -613,8 +613,8 @@
           "name" : "field7"
         },
         "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
+          "grow" : -1,
+          "layout" : "FLEX"
         },
         "allowEmpty" : true,
         "showCaption" : true
@@ -640,8 +640,8 @@
           "name" : "field8"
         },
         "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
+          "grow" : -1,
+          "layout" : "FLEX"
         },
         "allowEmpty" : true,
         "showCaption" : true
@@ -667,8 +667,8 @@
           "enableLinkView" : false
         },
         "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
+          "grow" : -1,
+          "layout" : "FLEX"
         },
         "allowEmpty" : true,
         "showCaption" : true
@@ -726,8 +726,8 @@
           "singleSelect" : true
         },
         "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
+          "grow" : -1,
+          "layout" : "FLEX"
         },
         "valueItemName" : "field16",
         "allowEmpty" : true,
@@ -770,8 +770,8 @@
           "singleSelect" : true
         },
         "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
+          "grow" : -1,
+          "layout" : "FLEX"
         },
         "valueItemName" : "field16",
         "allowEmpty" : true,
@@ -821,8 +821,8 @@
           "singleSelect" : true
         },
         "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
+          "grow" : -1,
+          "layout" : "FLEX"
         },
         "valueItemName" : "field16",
         "allowEmpty" : true,
@@ -867,8 +867,8 @@
           "singleSelect" : true
         },
         "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
+          "grow" : -1,
+          "layout" : "FLEX"
         },
         "valueItemName" : "field16",
         "allowEmpty" : true,
@@ -919,8 +919,8 @@
           "showTrigger" : true
         },
         "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
+          "grow" : -1,
+          "layout" : "FLEX"
         },
         "valueItemName" : "field16",
         "allowEmpty" : true,
@@ -948,18 +948,24 @@
           "showMaxLength" : true
         },
         "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
+          "grow" : -1,
+          "layout" : "FLEX"
         },
         "allowEmpty" : true,
         "showCaption" : true
       } ],
       "getPSLayout" : {
-        "columnCount" : 24,
-        "layout" : "TABLE_24COL"
+        "align" : "center",
+        "dir" : "column",
+        "layout" : "FLEX",
+        "vAlign" : "stretch"
       },
       "getPSLayoutPos" : {
-        "colMD" : 24,
+        "colLG" : 24,
+        "colMD" : 22,
+        "colMDOffset" : 2,
+        "colSM" : 23,
+        "colXS" : 23,
         "layout" : "TABLE_24COL"
       },
       "infoGroupMode" : false,
@@ -1009,8 +1015,12 @@
           "enableLinkView" : false
         },
         "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
+          "colLG" : 10,
+          "colLGOffset" : 2,
+          "colMD" : 12,
+          "colSM" : 11,
+          "colXS" : 11,
+          "layout" : "TABLE_12COL"
         },
         "allowEmpty" : true,
         "convertToCodeItemText" : true,
@@ -1037,8 +1047,11 @@
           "enableLinkView" : false
         },
         "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
+          "colLG" : 11,
+          "colMD" : 11,
+          "colSM" : 11,
+          "colXS" : 11,
+          "layout" : "TABLE_12COL"
         },
         "valueFormat" : "YYYY-MM-DD HH:mm:ss",
         "allowEmpty" : true,
@@ -1069,8 +1082,11 @@
           "enableLinkView" : false
         },
         "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
+          "colLG" : 11,
+          "colMD" : 11,
+          "colSM" : 11,
+          "colXS" : 11,
+          "layout" : "TABLE_12COL"
         },
         "allowEmpty" : true,
         "convertToCodeItemText" : true,
@@ -1097,16 +1113,19 @@
           "enableLinkView" : false
         },
         "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
+          "colLG" : 11,
+          "colMD" : 11,
+          "colSM" : 11,
+          "colXS" : 11,
+          "layout" : "TABLE_12COL"
         },
         "valueFormat" : "YYYY-MM-DD HH:mm:ss",
         "allowEmpty" : true,
         "showCaption" : true
       } ],
       "getPSLayout" : {
-        "columnCount" : 24,
-        "layout" : "TABLE_24COL"
+        "columnCount" : 12,
+        "layout" : "TABLE_12COL"
       },
       "getPSLayoutPos" : {
         "colMD" : 24,

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

@@ -145,7 +145,7 @@
       "name" : "DATE",
       "codeName" : "Date"
     },
-    "valueFormat" : "YYYY-MM-DD",
+    "valueFormat" : "YYYY",
     "width" : 100,
     "widthUnit" : "PX",
     "enableRowEdit" : true,
@@ -168,6 +168,24 @@
     "widthUnit" : "PX",
     "enableRowEdit" : true,
     "enableSort" : true
+  }, {
+    "align" : "LEFT",
+    "cLConvertMode" : "NONE",
+    "caption" : "值项",
+    "codeName" : "field16",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "field16",
+    "excelCaption" : "值项",
+    "name" : "field16",
+    "noPrivDisplayMode" : 1,
+    "getPSAppDEField" : {
+      "name" : "FIELD16",
+      "codeName" : "Field16"
+    },
+    "width" : 100,
+    "widthUnit" : "PX",
+    "enableRowEdit" : true,
+    "enableSort" : true
   }, {
     "align" : "LEFT",
     "cLConvertMode" : "NONE",
@@ -181,7 +199,7 @@
       "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BookTypeGridView.json",
       "viewType" : "DEGRIDVIEW"
     },
-    "linkValueItem" : "field6",
+    "linkValueItem" : "field16",
     "name" : "field6",
     "noPrivDisplayMode" : 1,
     "getPSAppDEField" : {
@@ -248,7 +266,7 @@
       "codeName" : "Field4"
     }
   }, {
-    "format" : "YYYY-MM-DD",
+    "format" : "YYYY",
     "dataType" : 5,
     "name" : "date",
     "getPSAppDEField" : {
@@ -262,6 +280,13 @@
       "name" : "FIELD5",
       "codeName" : "Field5"
     }
+  }, {
+    "dataType" : 25,
+    "name" : "field16",
+    "getPSAppDEField" : {
+      "name" : "FIELD16",
+      "codeName" : "Field16"
+    }
   }, {
     "dataType" : 25,
     "name" : "field6",
@@ -432,6 +457,22 @@
       "name" : "field5"
     },
     "allowEmpty" : true
+  }, {
+    "caption" : "值项",
+    "codeName" : "field16",
+    "enableCond" : 3,
+    "ignoreInput" : 0,
+    "name" : "field16",
+    "getPSAppDEField" : {
+      "name" : "FIELD16",
+      "codeName" : "Field16"
+    },
+    "getPSEditor" : {
+      "editorType" : "TEXTBOX",
+      "maxLength" : 100,
+      "name" : "field16"
+    },
+    "allowEmpty" : true
   }, {
     "caption" : "数据选择",
     "codeName" : "field6",
@@ -461,12 +502,14 @@
         "modelref" : true,
         "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/RawMaterial.json"
       },
+      "valueItemName" : "field16",
       "enableAC" : true,
       "enablePickupView" : true,
       "forceSelection" : true,
       "showTrigger" : true,
       "singleSelect" : true
     },
+    "valueItemName" : "field16",
     "allowEmpty" : true
   }, {
     "caption" : "文件上传",

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

@@ -76,7 +76,8 @@
     },
     "requestMethod" : "POST",
     "requestParamType" : "ENTITY",
-    "builtinMethod" : false
+    "builtinMethod" : false,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "READ",
     "codeName" : "Get",
@@ -102,7 +103,8 @@
     "requestMethod" : "GET",
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "GETDRAFT",
     "codeName" : "GetDraft",
@@ -151,7 +153,8 @@
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
     "enableBatchAction" : true,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "UNKNOWN",
     "codeName" : "Save",
@@ -199,7 +202,8 @@
     "requestMethod" : "PUT",
     "requestParamType" : "ENTITY",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   } ],
   "getAllPSAppDEDataSets" : [ {
     "codeName" : "FetchDefault",
@@ -462,7 +466,8 @@
     },
     "requestMethod" : "POST",
     "requestParamType" : "ENTITY",
-    "builtinMethod" : false
+    "builtinMethod" : false,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "READ",
     "codeName" : "Get",
@@ -488,7 +493,8 @@
     "requestMethod" : "GET",
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "GETDRAFT",
     "codeName" : "GetDraft",
@@ -537,7 +543,8 @@
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
     "enableBatchAction" : true,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "UNKNOWN",
     "codeName" : "Save",
@@ -585,7 +592,8 @@
     "requestMethod" : "PUT",
     "requestParamType" : "ENTITY",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "codeName" : "FetchDefault",
     "methodType" : "FETCH",

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

@@ -76,7 +76,8 @@
     },
     "requestMethod" : "POST",
     "requestParamType" : "ENTITY",
-    "builtinMethod" : false
+    "builtinMethod" : false,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "READ",
     "codeName" : "Get",
@@ -102,7 +103,8 @@
     "requestMethod" : "GET",
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "GETDRAFT",
     "codeName" : "GetDraft",
@@ -151,7 +153,8 @@
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
     "enableBatchAction" : true,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "UNKNOWN",
     "codeName" : "Save",
@@ -199,7 +202,8 @@
     "requestMethod" : "PUT",
     "requestParamType" : "ENTITY",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   } ],
   "getAllPSAppDEDataSets" : [ {
     "codeName" : "FetchDefault",
@@ -480,7 +484,8 @@
     },
     "requestMethod" : "POST",
     "requestParamType" : "ENTITY",
-    "builtinMethod" : false
+    "builtinMethod" : false,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "READ",
     "codeName" : "Get",
@@ -506,7 +511,8 @@
     "requestMethod" : "GET",
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "GETDRAFT",
     "codeName" : "GetDraft",
@@ -555,7 +561,8 @@
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
     "enableBatchAction" : true,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "UNKNOWN",
     "codeName" : "Save",
@@ -603,7 +610,8 @@
     "requestMethod" : "PUT",
     "requestParamType" : "ENTITY",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "codeName" : "FetchDefault",
     "methodType" : "FETCH",

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

@@ -76,7 +76,8 @@
     },
     "requestMethod" : "POST",
     "requestParamType" : "ENTITY",
-    "builtinMethod" : false
+    "builtinMethod" : false,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "READ",
     "codeName" : "Get",
@@ -102,7 +103,8 @@
     "requestMethod" : "GET",
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "GETDRAFT",
     "codeName" : "GetDraft",
@@ -151,7 +153,8 @@
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
     "enableBatchAction" : true,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "UNKNOWN",
     "codeName" : "Save",
@@ -199,7 +202,8 @@
     "requestMethod" : "PUT",
     "requestParamType" : "ENTITY",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   } ],
   "getAllPSAppDEDataSets" : [ {
     "codeName" : "FetchByIPhone",
@@ -504,7 +508,8 @@
     },
     "requestMethod" : "POST",
     "requestParamType" : "ENTITY",
-    "builtinMethod" : false
+    "builtinMethod" : false,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "READ",
     "codeName" : "Get",
@@ -530,7 +535,8 @@
     "requestMethod" : "GET",
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "GETDRAFT",
     "codeName" : "GetDraft",
@@ -579,7 +585,8 @@
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
     "enableBatchAction" : true,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "UNKNOWN",
     "codeName" : "Save",
@@ -627,7 +634,8 @@
     "requestMethod" : "PUT",
     "requestParamType" : "ENTITY",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "codeName" : "FetchByIPhone",
     "methodType" : "FETCH",

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

@@ -76,7 +76,8 @@
     },
     "requestMethod" : "POST",
     "requestParamType" : "ENTITY",
-    "builtinMethod" : false
+    "builtinMethod" : false,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "READ",
     "codeName" : "Get",
@@ -102,7 +103,8 @@
     "requestMethod" : "GET",
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "GETDRAFT",
     "codeName" : "GetDraft",
@@ -151,7 +153,8 @@
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
     "enableBatchAction" : true,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "UNKNOWN",
     "codeName" : "Save",
@@ -199,7 +202,8 @@
     "requestMethod" : "PUT",
     "requestParamType" : "ENTITY",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   } ],
   "getAllPSAppDEDataSets" : [ {
     "codeName" : "FetchDefault",
@@ -426,7 +430,8 @@
     },
     "requestMethod" : "POST",
     "requestParamType" : "ENTITY",
-    "builtinMethod" : false
+    "builtinMethod" : false,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "READ",
     "codeName" : "Get",
@@ -452,7 +457,8 @@
     "requestMethod" : "GET",
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "GETDRAFT",
     "codeName" : "GetDraft",
@@ -501,7 +507,8 @@
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
     "enableBatchAction" : true,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "UNKNOWN",
     "codeName" : "Save",
@@ -549,7 +556,8 @@
     "requestMethod" : "PUT",
     "requestParamType" : "ENTITY",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "codeName" : "FetchDefault",
     "methodType" : "FETCH",

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

@@ -76,7 +76,8 @@
     },
     "requestMethod" : "POST",
     "requestParamType" : "ENTITY",
-    "builtinMethod" : false
+    "builtinMethod" : false,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "READ",
     "codeName" : "Get",
@@ -102,7 +103,8 @@
     "requestMethod" : "GET",
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "GETDRAFT",
     "codeName" : "GetDraft",
@@ -151,7 +153,8 @@
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
     "enableBatchAction" : true,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "UNKNOWN",
     "codeName" : "Save",
@@ -199,7 +202,8 @@
     "requestMethod" : "PUT",
     "requestParamType" : "ENTITY",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   } ],
   "getAllPSAppDEDataSets" : [ {
     "codeName" : "FetchDefault",
@@ -569,7 +573,8 @@
     },
     "requestMethod" : "POST",
     "requestParamType" : "ENTITY",
-    "builtinMethod" : false
+    "builtinMethod" : false,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "READ",
     "codeName" : "Get",
@@ -595,7 +600,8 @@
     "requestMethod" : "GET",
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "GETDRAFT",
     "codeName" : "GetDraft",
@@ -644,7 +650,8 @@
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
     "enableBatchAction" : true,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "UNKNOWN",
     "codeName" : "Save",
@@ -692,7 +699,8 @@
     "requestMethod" : "PUT",
     "requestParamType" : "ENTITY",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "codeName" : "FetchDefault",
     "methodType" : "FETCH",

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

@@ -76,7 +76,8 @@
     },
     "requestMethod" : "POST",
     "requestParamType" : "ENTITY",
-    "builtinMethod" : false
+    "builtinMethod" : false,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "READ",
     "codeName" : "Get",
@@ -102,7 +103,8 @@
     "requestMethod" : "GET",
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "GETDRAFT",
     "codeName" : "GetDraft",
@@ -151,7 +153,8 @@
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
     "enableBatchAction" : true,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "UNKNOWN",
     "codeName" : "Save",
@@ -199,7 +202,8 @@
     "requestMethod" : "PUT",
     "requestParamType" : "ENTITY",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   } ],
   "getAllPSAppDEDataSets" : [ {
     "codeName" : "FetchDefault",
@@ -552,7 +556,8 @@
     },
     "requestMethod" : "POST",
     "requestParamType" : "ENTITY",
-    "builtinMethod" : false
+    "builtinMethod" : false,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "READ",
     "codeName" : "Get",
@@ -578,7 +583,8 @@
     "requestMethod" : "GET",
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "GETDRAFT",
     "codeName" : "GetDraft",
@@ -627,7 +633,8 @@
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
     "enableBatchAction" : true,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "UNKNOWN",
     "codeName" : "Save",
@@ -675,7 +682,8 @@
     "requestMethod" : "PUT",
     "requestParamType" : "ENTITY",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "codeName" : "FetchDefault",
     "methodType" : "FETCH",

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

@@ -76,7 +76,8 @@
     },
     "requestMethod" : "POST",
     "requestParamType" : "ENTITY",
-    "builtinMethod" : false
+    "builtinMethod" : false,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "READ",
     "codeName" : "Get",
@@ -102,7 +103,8 @@
     "requestMethod" : "GET",
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "GETDRAFT",
     "codeName" : "GetDraft",
@@ -151,7 +153,8 @@
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
     "enableBatchAction" : true,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "UNKNOWN",
     "codeName" : "Save",
@@ -199,7 +202,8 @@
     "requestMethod" : "PUT",
     "requestParamType" : "ENTITY",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   } ],
   "getAllPSAppDEDataSets" : [ {
     "codeName" : "FetchDefault",
@@ -551,7 +555,8 @@
     },
     "requestMethod" : "POST",
     "requestParamType" : "ENTITY",
-    "builtinMethod" : false
+    "builtinMethod" : false,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "READ",
     "codeName" : "Get",
@@ -577,7 +582,8 @@
     "requestMethod" : "GET",
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "GETDRAFT",
     "codeName" : "GetDraft",
@@ -626,7 +632,8 @@
     "requestParamType" : "FIELD",
     "builtinMethod" : false,
     "enableBatchAction" : true,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "actionMode" : "UNKNOWN",
     "codeName" : "Save",
@@ -674,7 +681,8 @@
     "requestMethod" : "PUT",
     "requestParamType" : "ENTITY",
     "builtinMethod" : false,
-    "needResourceKey" : true
+    "needResourceKey" : true,
+    "noServiceCodeName" : true
   }, {
     "codeName" : "FetchDefault",
     "methodType" : "FETCH",

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

@@ -404,8 +404,8 @@
             "enableLinkView" : false
           },
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "grow" : -1,
+            "layout" : "FLEX"
           },
           "allowEmpty" : true,
           "showCaption" : true
@@ -449,8 +449,8 @@
             } ]
           },
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "grow" : -1,
+            "layout" : "FLEX"
           },
           "allowEmpty" : true,
           "showCaption" : true
@@ -480,8 +480,8 @@
             "singleSelect" : true
           },
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "grow" : -1,
+            "layout" : "FLEX"
           },
           "allowEmpty" : true,
           "needCodeListConfig" : true,
@@ -512,8 +512,8 @@
             "singleSelect" : true
           },
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "grow" : -1,
+            "layout" : "FLEX"
           },
           "allowEmpty" : true,
           "needCodeListConfig" : true,
@@ -544,8 +544,8 @@
             "singleSelect" : false
           },
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "grow" : -1,
+            "layout" : "FLEX"
           },
           "allowEmpty" : true,
           "needCodeListConfig" : true,
@@ -575,8 +575,8 @@
             }
           },
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "grow" : -1,
+            "layout" : "FLEX"
           },
           "allowEmpty" : true,
           "needCodeListConfig" : true,
@@ -606,8 +606,8 @@
             }
           },
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "grow" : -1,
+            "layout" : "FLEX"
           },
           "allowEmpty" : true,
           "needCodeListConfig" : true,
@@ -639,8 +639,8 @@
             "name" : "date"
           },
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "grow" : -1,
+            "layout" : "FLEX"
           },
           "valueFormat" : "yyyy-MM",
           "allowEmpty" : true,
@@ -679,8 +679,8 @@
             "name" : "field6"
           },
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "grow" : -1,
+            "layout" : "FLEX"
           },
           "allowEmpty" : true,
           "showCaption" : true
@@ -708,8 +708,8 @@
             "name" : "field18"
           },
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "grow" : -1,
+            "layout" : "FLEX"
           },
           "allowEmpty" : true,
           "showCaption" : true
@@ -734,8 +734,8 @@
             "name" : "field7"
           },
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "grow" : -1,
+            "layout" : "FLEX"
           },
           "allowEmpty" : true,
           "showCaption" : true
@@ -761,8 +761,8 @@
             "name" : "field8"
           },
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "grow" : -1,
+            "layout" : "FLEX"
           },
           "allowEmpty" : true,
           "showCaption" : true
@@ -788,8 +788,8 @@
             "enableLinkView" : false
           },
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "grow" : -1,
+            "layout" : "FLEX"
           },
           "allowEmpty" : true,
           "showCaption" : true
@@ -847,8 +847,8 @@
             "singleSelect" : true
           },
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "grow" : -1,
+            "layout" : "FLEX"
           },
           "valueItemName" : "field16",
           "allowEmpty" : true,
@@ -891,8 +891,8 @@
             "singleSelect" : true
           },
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "grow" : -1,
+            "layout" : "FLEX"
           },
           "valueItemName" : "field16",
           "allowEmpty" : true,
@@ -942,8 +942,8 @@
             "singleSelect" : true
           },
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "grow" : -1,
+            "layout" : "FLEX"
           },
           "valueItemName" : "field16",
           "allowEmpty" : true,
@@ -988,8 +988,8 @@
             "singleSelect" : true
           },
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "grow" : -1,
+            "layout" : "FLEX"
           },
           "valueItemName" : "field16",
           "allowEmpty" : true,
@@ -1040,8 +1040,8 @@
             "showTrigger" : true
           },
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "grow" : -1,
+            "layout" : "FLEX"
           },
           "valueItemName" : "field16",
           "allowEmpty" : true,
@@ -1069,18 +1069,24 @@
             "showMaxLength" : true
           },
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "grow" : -1,
+            "layout" : "FLEX"
           },
           "allowEmpty" : true,
           "showCaption" : true
         } ],
         "getPSLayout" : {
-          "columnCount" : 24,
-          "layout" : "TABLE_24COL"
+          "align" : "center",
+          "dir" : "column",
+          "layout" : "FLEX",
+          "vAlign" : "stretch"
         },
         "getPSLayoutPos" : {
-          "colMD" : 24,
+          "colLG" : 24,
+          "colMD" : 22,
+          "colMDOffset" : 2,
+          "colSM" : 23,
+          "colXS" : 23,
           "layout" : "TABLE_24COL"
         },
         "infoGroupMode" : false,
@@ -1130,8 +1136,12 @@
             "enableLinkView" : false
           },
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "colLG" : 10,
+            "colLGOffset" : 2,
+            "colMD" : 12,
+            "colSM" : 11,
+            "colXS" : 11,
+            "layout" : "TABLE_12COL"
           },
           "allowEmpty" : true,
           "convertToCodeItemText" : true,
@@ -1158,8 +1168,11 @@
             "enableLinkView" : false
           },
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "colLG" : 11,
+            "colMD" : 11,
+            "colSM" : 11,
+            "colXS" : 11,
+            "layout" : "TABLE_12COL"
           },
           "valueFormat" : "YYYY-MM-DD HH:mm:ss",
           "allowEmpty" : true,
@@ -1190,8 +1203,11 @@
             "enableLinkView" : false
           },
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "colLG" : 11,
+            "colMD" : 11,
+            "colSM" : 11,
+            "colXS" : 11,
+            "layout" : "TABLE_12COL"
           },
           "allowEmpty" : true,
           "convertToCodeItemText" : true,
@@ -1218,16 +1234,19 @@
             "enableLinkView" : false
           },
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "colLG" : 11,
+            "colMD" : 11,
+            "colSM" : 11,
+            "colXS" : 11,
+            "layout" : "TABLE_12COL"
           },
           "valueFormat" : "YYYY-MM-DD HH:mm:ss",
           "allowEmpty" : true,
           "showCaption" : true
         } ],
         "getPSLayout" : {
-          "columnCount" : 24,
-          "layout" : "TABLE_24COL"
+          "columnCount" : 12,
+          "layout" : "TABLE_12COL"
         },
         "getPSLayoutPos" : {
           "colMD" : 24,

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

@@ -334,7 +334,7 @@
         "name" : "DATE",
         "codeName" : "Date"
       },
-      "valueFormat" : "YYYY-MM-DD",
+      "valueFormat" : "YYYY",
       "width" : 100,
       "widthUnit" : "PX",
       "enableRowEdit" : true,
@@ -357,6 +357,24 @@
       "widthUnit" : "PX",
       "enableRowEdit" : true,
       "enableSort" : true
+    }, {
+      "align" : "LEFT",
+      "cLConvertMode" : "NONE",
+      "caption" : "值项",
+      "codeName" : "field16",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "field16",
+      "excelCaption" : "值项",
+      "name" : "field16",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "FIELD16",
+        "codeName" : "Field16"
+      },
+      "width" : 100,
+      "widthUnit" : "PX",
+      "enableRowEdit" : true,
+      "enableSort" : true
     }, {
       "align" : "LEFT",
       "cLConvertMode" : "NONE",
@@ -370,7 +388,7 @@
         "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BookTypeGridView.json",
         "viewType" : "DEGRIDVIEW"
       },
-      "linkValueItem" : "field6",
+      "linkValueItem" : "field16",
       "name" : "field6",
       "noPrivDisplayMode" : 1,
       "getPSAppDEField" : {
@@ -437,7 +455,7 @@
         "codeName" : "Field4"
       }
     }, {
-      "format" : "YYYY-MM-DD",
+      "format" : "YYYY",
       "dataType" : 5,
       "name" : "date",
       "getPSAppDEField" : {
@@ -451,6 +469,13 @@
         "name" : "FIELD5",
         "codeName" : "Field5"
       }
+    }, {
+      "dataType" : 25,
+      "name" : "field16",
+      "getPSAppDEField" : {
+        "name" : "FIELD16",
+        "codeName" : "Field16"
+      }
     }, {
       "dataType" : 25,
       "name" : "field6",
@@ -621,6 +646,22 @@
         "name" : "field5"
       },
       "allowEmpty" : true
+    }, {
+      "caption" : "值项",
+      "codeName" : "field16",
+      "enableCond" : 3,
+      "ignoreInput" : 0,
+      "name" : "field16",
+      "getPSAppDEField" : {
+        "name" : "FIELD16",
+        "codeName" : "Field16"
+      },
+      "getPSEditor" : {
+        "editorType" : "TEXTBOX",
+        "maxLength" : 100,
+        "name" : "field16"
+      },
+      "allowEmpty" : true
     }, {
       "caption" : "数据选择",
       "codeName" : "field6",
@@ -650,12 +691,14 @@
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/RawMaterial.json"
         },
+        "valueItemName" : "field16",
         "enableAC" : true,
         "enablePickupView" : true,
         "forceSelection" : true,
         "showTrigger" : true,
         "singleSelect" : true
       },
+      "valueItemName" : "field16",
       "allowEmpty" : true
     }, {
       "caption" : "文件上传",

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

@@ -4150,8 +4150,8 @@
                 "enableLinkView" : false
               },
               "getPSLayoutPos" : {
-                "colMD" : 24,
-                "layout" : "TABLE_24COL"
+                "grow" : -1,
+                "layout" : "FLEX"
               },
               "allowEmpty" : true,
               "showCaption" : true
@@ -4195,8 +4195,8 @@
                 } ]
               },
               "getPSLayoutPos" : {
-                "colMD" : 24,
-                "layout" : "TABLE_24COL"
+                "grow" : -1,
+                "layout" : "FLEX"
               },
               "allowEmpty" : true,
               "showCaption" : true
@@ -4226,8 +4226,8 @@
                 "singleSelect" : true
               },
               "getPSLayoutPos" : {
-                "colMD" : 24,
-                "layout" : "TABLE_24COL"
+                "grow" : -1,
+                "layout" : "FLEX"
               },
               "allowEmpty" : true,
               "needCodeListConfig" : true,
@@ -4258,8 +4258,8 @@
                 "singleSelect" : true
               },
               "getPSLayoutPos" : {
-                "colMD" : 24,
-                "layout" : "TABLE_24COL"
+                "grow" : -1,
+                "layout" : "FLEX"
               },
               "allowEmpty" : true,
               "needCodeListConfig" : true,
@@ -4290,8 +4290,8 @@
                 "singleSelect" : false
               },
               "getPSLayoutPos" : {
-                "colMD" : 24,
-                "layout" : "TABLE_24COL"
+                "grow" : -1,
+                "layout" : "FLEX"
               },
               "allowEmpty" : true,
               "needCodeListConfig" : true,
@@ -4321,8 +4321,8 @@
                 }
               },
               "getPSLayoutPos" : {
-                "colMD" : 24,
-                "layout" : "TABLE_24COL"
+                "grow" : -1,
+                "layout" : "FLEX"
               },
               "allowEmpty" : true,
               "needCodeListConfig" : true,
@@ -4352,8 +4352,8 @@
                 }
               },
               "getPSLayoutPos" : {
-                "colMD" : 24,
-                "layout" : "TABLE_24COL"
+                "grow" : -1,
+                "layout" : "FLEX"
               },
               "allowEmpty" : true,
               "needCodeListConfig" : true,
@@ -4385,8 +4385,8 @@
                 "name" : "date"
               },
               "getPSLayoutPos" : {
-                "colMD" : 24,
-                "layout" : "TABLE_24COL"
+                "grow" : -1,
+                "layout" : "FLEX"
               },
               "valueFormat" : "yyyy-MM",
               "allowEmpty" : true,
@@ -4425,8 +4425,8 @@
                 "name" : "field6"
               },
               "getPSLayoutPos" : {
-                "colMD" : 24,
-                "layout" : "TABLE_24COL"
+                "grow" : -1,
+                "layout" : "FLEX"
               },
               "allowEmpty" : true,
               "showCaption" : true
@@ -4454,8 +4454,8 @@
                 "name" : "field18"
               },
               "getPSLayoutPos" : {
-                "colMD" : 24,
-                "layout" : "TABLE_24COL"
+                "grow" : -1,
+                "layout" : "FLEX"
               },
               "allowEmpty" : true,
               "showCaption" : true
@@ -4480,8 +4480,8 @@
                 "name" : "field7"
               },
               "getPSLayoutPos" : {
-                "colMD" : 24,
-                "layout" : "TABLE_24COL"
+                "grow" : -1,
+                "layout" : "FLEX"
               },
               "allowEmpty" : true,
               "showCaption" : true
@@ -4507,8 +4507,8 @@
                 "name" : "field8"
               },
               "getPSLayoutPos" : {
-                "colMD" : 24,
-                "layout" : "TABLE_24COL"
+                "grow" : -1,
+                "layout" : "FLEX"
               },
               "allowEmpty" : true,
               "showCaption" : true
@@ -4534,8 +4534,8 @@
                 "enableLinkView" : false
               },
               "getPSLayoutPos" : {
-                "colMD" : 24,
-                "layout" : "TABLE_24COL"
+                "grow" : -1,
+                "layout" : "FLEX"
               },
               "allowEmpty" : true,
               "showCaption" : true
@@ -4593,8 +4593,8 @@
                 "singleSelect" : true
               },
               "getPSLayoutPos" : {
-                "colMD" : 24,
-                "layout" : "TABLE_24COL"
+                "grow" : -1,
+                "layout" : "FLEX"
               },
               "valueItemName" : "field16",
               "allowEmpty" : true,
@@ -4637,8 +4637,8 @@
                 "singleSelect" : true
               },
               "getPSLayoutPos" : {
-                "colMD" : 24,
-                "layout" : "TABLE_24COL"
+                "grow" : -1,
+                "layout" : "FLEX"
               },
               "valueItemName" : "field16",
               "allowEmpty" : true,
@@ -4688,8 +4688,8 @@
                 "singleSelect" : true
               },
               "getPSLayoutPos" : {
-                "colMD" : 24,
-                "layout" : "TABLE_24COL"
+                "grow" : -1,
+                "layout" : "FLEX"
               },
               "valueItemName" : "field16",
               "allowEmpty" : true,
@@ -4734,8 +4734,8 @@
                 "singleSelect" : true
               },
               "getPSLayoutPos" : {
-                "colMD" : 24,
-                "layout" : "TABLE_24COL"
+                "grow" : -1,
+                "layout" : "FLEX"
               },
               "valueItemName" : "field16",
               "allowEmpty" : true,
@@ -4786,8 +4786,8 @@
                 "showTrigger" : true
               },
               "getPSLayoutPos" : {
-                "colMD" : 24,
-                "layout" : "TABLE_24COL"
+                "grow" : -1,
+                "layout" : "FLEX"
               },
               "valueItemName" : "field16",
               "allowEmpty" : true,
@@ -4815,18 +4815,24 @@
                 "showMaxLength" : true
               },
               "getPSLayoutPos" : {
-                "colMD" : 24,
-                "layout" : "TABLE_24COL"
+                "grow" : -1,
+                "layout" : "FLEX"
               },
               "allowEmpty" : true,
               "showCaption" : true
             } ],
             "getPSLayout" : {
-              "columnCount" : 24,
-              "layout" : "TABLE_24COL"
+              "align" : "center",
+              "dir" : "column",
+              "layout" : "FLEX",
+              "vAlign" : "stretch"
             },
             "getPSLayoutPos" : {
-              "colMD" : 24,
+              "colLG" : 24,
+              "colMD" : 22,
+              "colMDOffset" : 2,
+              "colSM" : 23,
+              "colXS" : 23,
               "layout" : "TABLE_24COL"
             },
             "infoGroupMode" : false,
@@ -4876,8 +4882,12 @@
                 "enableLinkView" : false
               },
               "getPSLayoutPos" : {
-                "colMD" : 24,
-                "layout" : "TABLE_24COL"
+                "colLG" : 10,
+                "colLGOffset" : 2,
+                "colMD" : 12,
+                "colSM" : 11,
+                "colXS" : 11,
+                "layout" : "TABLE_12COL"
               },
               "allowEmpty" : true,
               "convertToCodeItemText" : true,
@@ -4904,8 +4914,11 @@
                 "enableLinkView" : false
               },
               "getPSLayoutPos" : {
-                "colMD" : 24,
-                "layout" : "TABLE_24COL"
+                "colLG" : 11,
+                "colMD" : 11,
+                "colSM" : 11,
+                "colXS" : 11,
+                "layout" : "TABLE_12COL"
               },
               "valueFormat" : "YYYY-MM-DD HH:mm:ss",
               "allowEmpty" : true,
@@ -4936,8 +4949,11 @@
                 "enableLinkView" : false
               },
               "getPSLayoutPos" : {
-                "colMD" : 24,
-                "layout" : "TABLE_24COL"
+                "colLG" : 11,
+                "colMD" : 11,
+                "colSM" : 11,
+                "colXS" : 11,
+                "layout" : "TABLE_12COL"
               },
               "allowEmpty" : true,
               "convertToCodeItemText" : true,
@@ -4964,16 +4980,19 @@
                 "enableLinkView" : false
               },
               "getPSLayoutPos" : {
-                "colMD" : 24,
-                "layout" : "TABLE_24COL"
+                "colLG" : 11,
+                "colMD" : 11,
+                "colSM" : 11,
+                "colXS" : 11,
+                "layout" : "TABLE_12COL"
               },
               "valueFormat" : "YYYY-MM-DD HH:mm:ss",
               "allowEmpty" : true,
               "showCaption" : true
             } ],
             "getPSLayout" : {
-              "columnCount" : 24,
-              "layout" : "TABLE_24COL"
+              "columnCount" : 12,
+              "layout" : "TABLE_12COL"
             },
             "getPSLayoutPos" : {
               "colMD" : 24,
@@ -5366,7 +5385,7 @@
             "name" : "DATE",
             "codeName" : "Date"
           },
-          "valueFormat" : "YYYY-MM-DD",
+          "valueFormat" : "YYYY",
           "width" : 100,
           "widthUnit" : "PX",
           "enableRowEdit" : true,
@@ -5389,6 +5408,24 @@
           "widthUnit" : "PX",
           "enableRowEdit" : true,
           "enableSort" : true
+        }, {
+          "align" : "LEFT",
+          "cLConvertMode" : "NONE",
+          "caption" : "值项",
+          "codeName" : "field16",
+          "columnType" : "DEFGRIDCOLUMN",
+          "dataItemName" : "field16",
+          "excelCaption" : "值项",
+          "name" : "field16",
+          "noPrivDisplayMode" : 1,
+          "getPSAppDEField" : {
+            "name" : "FIELD16",
+            "codeName" : "Field16"
+          },
+          "width" : 100,
+          "widthUnit" : "PX",
+          "enableRowEdit" : true,
+          "enableSort" : true
         }, {
           "align" : "LEFT",
           "cLConvertMode" : "NONE",
@@ -5402,7 +5439,7 @@
             "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BookTypeGridView.json",
             "viewType" : "DEGRIDVIEW"
           },
-          "linkValueItem" : "field6",
+          "linkValueItem" : "field16",
           "name" : "field6",
           "noPrivDisplayMode" : 1,
           "getPSAppDEField" : {
@@ -5469,7 +5506,7 @@
             "codeName" : "Field4"
           }
         }, {
-          "format" : "YYYY-MM-DD",
+          "format" : "YYYY",
           "dataType" : 5,
           "name" : "date",
           "getPSAppDEField" : {
@@ -5483,6 +5520,13 @@
             "name" : "FIELD5",
             "codeName" : "Field5"
           }
+        }, {
+          "dataType" : 25,
+          "name" : "field16",
+          "getPSAppDEField" : {
+            "name" : "FIELD16",
+            "codeName" : "Field16"
+          }
         }, {
           "dataType" : 25,
           "name" : "field6",
@@ -5653,6 +5697,22 @@
             "name" : "field5"
           },
           "allowEmpty" : true
+        }, {
+          "caption" : "值项",
+          "codeName" : "field16",
+          "enableCond" : 3,
+          "ignoreInput" : 0,
+          "name" : "field16",
+          "getPSAppDEField" : {
+            "name" : "FIELD16",
+            "codeName" : "Field16"
+          },
+          "getPSEditor" : {
+            "editorType" : "TEXTBOX",
+            "maxLength" : 100,
+            "name" : "field16"
+          },
+          "allowEmpty" : true
         }, {
           "caption" : "数据选择",
           "codeName" : "field6",
@@ -5682,12 +5742,14 @@
               "modelref" : true,
               "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/RawMaterial.json"
             },
+            "valueItemName" : "field16",
             "enableAC" : true,
             "enablePickupView" : true,
             "forceSelection" : true,
             "showTrigger" : true,
             "singleSelect" : true
           },
+          "valueItemName" : "field16",
           "allowEmpty" : true
         }, {
           "caption" : "文件上传",
@@ -11621,7 +11683,8 @@
         },
         "requestMethod" : "POST",
         "requestParamType" : "ENTITY",
-        "builtinMethod" : false
+        "builtinMethod" : false,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "READ",
         "codeName" : "Get",
@@ -11647,7 +11710,8 @@
         "requestMethod" : "GET",
         "requestParamType" : "FIELD",
         "builtinMethod" : false,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "GETDRAFT",
         "codeName" : "GetDraft",
@@ -11696,7 +11760,8 @@
         "requestParamType" : "FIELD",
         "builtinMethod" : false,
         "enableBatchAction" : true,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "UNKNOWN",
         "codeName" : "Save",
@@ -11744,7 +11809,8 @@
         "requestMethod" : "PUT",
         "requestParamType" : "ENTITY",
         "builtinMethod" : false,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       } ],
       "getAllPSAppDEDataSets" : [ {
         "codeName" : "FetchDefault",
@@ -12114,7 +12180,8 @@
         },
         "requestMethod" : "POST",
         "requestParamType" : "ENTITY",
-        "builtinMethod" : false
+        "builtinMethod" : false,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "READ",
         "codeName" : "Get",
@@ -12140,7 +12207,8 @@
         "requestMethod" : "GET",
         "requestParamType" : "FIELD",
         "builtinMethod" : false,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "GETDRAFT",
         "codeName" : "GetDraft",
@@ -12189,7 +12257,8 @@
         "requestParamType" : "FIELD",
         "builtinMethod" : false,
         "enableBatchAction" : true,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "UNKNOWN",
         "codeName" : "Save",
@@ -12237,7 +12306,8 @@
         "requestMethod" : "PUT",
         "requestParamType" : "ENTITY",
         "builtinMethod" : false,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       }, {
         "codeName" : "FetchDefault",
         "methodType" : "FETCH",
@@ -12439,7 +12509,8 @@
         },
         "requestMethod" : "POST",
         "requestParamType" : "ENTITY",
-        "builtinMethod" : false
+        "builtinMethod" : false,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "READ",
         "codeName" : "Get",
@@ -12465,7 +12536,8 @@
         "requestMethod" : "GET",
         "requestParamType" : "FIELD",
         "builtinMethod" : false,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "GETDRAFT",
         "codeName" : "GetDraft",
@@ -12514,7 +12586,8 @@
         "requestParamType" : "FIELD",
         "builtinMethod" : false,
         "enableBatchAction" : true,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "UNKNOWN",
         "codeName" : "Save",
@@ -12562,7 +12635,8 @@
         "requestMethod" : "PUT",
         "requestParamType" : "ENTITY",
         "builtinMethod" : false,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       } ],
       "getAllPSAppDEDataSets" : [ {
         "codeName" : "FetchByIPhone",
@@ -12867,7 +12941,8 @@
         },
         "requestMethod" : "POST",
         "requestParamType" : "ENTITY",
-        "builtinMethod" : false
+        "builtinMethod" : false,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "READ",
         "codeName" : "Get",
@@ -12893,7 +12968,8 @@
         "requestMethod" : "GET",
         "requestParamType" : "FIELD",
         "builtinMethod" : false,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "GETDRAFT",
         "codeName" : "GetDraft",
@@ -12942,7 +13018,8 @@
         "requestParamType" : "FIELD",
         "builtinMethod" : false,
         "enableBatchAction" : true,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "UNKNOWN",
         "codeName" : "Save",
@@ -12990,7 +13067,8 @@
         "requestMethod" : "PUT",
         "requestParamType" : "ENTITY",
         "builtinMethod" : false,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       }, {
         "codeName" : "FetchByIPhone",
         "methodType" : "FETCH",
@@ -13261,7 +13339,8 @@
         },
         "requestMethod" : "POST",
         "requestParamType" : "ENTITY",
-        "builtinMethod" : false
+        "builtinMethod" : false,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "READ",
         "codeName" : "Get",
@@ -13287,7 +13366,8 @@
         "requestMethod" : "GET",
         "requestParamType" : "FIELD",
         "builtinMethod" : false,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "GETDRAFT",
         "codeName" : "GetDraft",
@@ -13336,7 +13416,8 @@
         "requestParamType" : "FIELD",
         "builtinMethod" : false,
         "enableBatchAction" : true,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "UNKNOWN",
         "codeName" : "Save",
@@ -13384,7 +13465,8 @@
         "requestMethod" : "PUT",
         "requestParamType" : "ENTITY",
         "builtinMethod" : false,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       } ],
       "getAllPSAppDEDataSets" : [ {
         "codeName" : "FetchDefault",
@@ -14210,7 +14292,8 @@
         },
         "requestMethod" : "POST",
         "requestParamType" : "ENTITY",
-        "builtinMethod" : false
+        "builtinMethod" : false,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "READ",
         "codeName" : "Get",
@@ -14236,7 +14319,8 @@
         "requestMethod" : "GET",
         "requestParamType" : "FIELD",
         "builtinMethod" : false,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "GETDRAFT",
         "codeName" : "GetDraft",
@@ -14285,7 +14369,8 @@
         "requestParamType" : "FIELD",
         "builtinMethod" : false,
         "enableBatchAction" : true,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "UNKNOWN",
         "codeName" : "Save",
@@ -14333,7 +14418,8 @@
         "requestMethod" : "PUT",
         "requestParamType" : "ENTITY",
         "builtinMethod" : false,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       }, {
         "codeName" : "FetchDefault",
         "methodType" : "FETCH",
@@ -14582,7 +14668,8 @@
         },
         "requestMethod" : "POST",
         "requestParamType" : "ENTITY",
-        "builtinMethod" : false
+        "builtinMethod" : false,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "READ",
         "codeName" : "Get",
@@ -14608,7 +14695,8 @@
         "requestMethod" : "GET",
         "requestParamType" : "FIELD",
         "builtinMethod" : false,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "GETDRAFT",
         "codeName" : "GetDraft",
@@ -14657,7 +14745,8 @@
         "requestParamType" : "FIELD",
         "builtinMethod" : false,
         "enableBatchAction" : true,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "UNKNOWN",
         "codeName" : "Save",
@@ -14705,7 +14794,8 @@
         "requestMethod" : "PUT",
         "requestParamType" : "ENTITY",
         "builtinMethod" : false,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       } ],
       "getAllPSAppDEDataSets" : [ {
         "codeName" : "FetchDefault",
@@ -14968,7 +15058,8 @@
         },
         "requestMethod" : "POST",
         "requestParamType" : "ENTITY",
-        "builtinMethod" : false
+        "builtinMethod" : false,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "READ",
         "codeName" : "Get",
@@ -14994,7 +15085,8 @@
         "requestMethod" : "GET",
         "requestParamType" : "FIELD",
         "builtinMethod" : false,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "GETDRAFT",
         "codeName" : "GetDraft",
@@ -15043,7 +15135,8 @@
         "requestParamType" : "FIELD",
         "builtinMethod" : false,
         "enableBatchAction" : true,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "UNKNOWN",
         "codeName" : "Save",
@@ -15091,7 +15184,8 @@
         "requestMethod" : "PUT",
         "requestParamType" : "ENTITY",
         "builtinMethod" : false,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       }, {
         "codeName" : "FetchDefault",
         "methodType" : "FETCH",
@@ -16258,7 +16352,8 @@
         },
         "requestMethod" : "POST",
         "requestParamType" : "ENTITY",
-        "builtinMethod" : false
+        "builtinMethod" : false,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "READ",
         "codeName" : "Get",
@@ -16284,7 +16379,8 @@
         "requestMethod" : "GET",
         "requestParamType" : "FIELD",
         "builtinMethod" : false,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "GETDRAFT",
         "codeName" : "GetDraft",
@@ -16333,7 +16429,8 @@
         "requestParamType" : "FIELD",
         "builtinMethod" : false,
         "enableBatchAction" : true,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "UNKNOWN",
         "codeName" : "Save",
@@ -16381,7 +16478,8 @@
         "requestMethod" : "PUT",
         "requestParamType" : "ENTITY",
         "builtinMethod" : false,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       } ],
       "getAllPSAppDEDataSets" : [ {
         "codeName" : "FetchDefault",
@@ -16734,7 +16832,8 @@
         },
         "requestMethod" : "POST",
         "requestParamType" : "ENTITY",
-        "builtinMethod" : false
+        "builtinMethod" : false,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "READ",
         "codeName" : "Get",
@@ -16760,7 +16859,8 @@
         "requestMethod" : "GET",
         "requestParamType" : "FIELD",
         "builtinMethod" : false,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "GETDRAFT",
         "codeName" : "GetDraft",
@@ -16809,7 +16909,8 @@
         "requestParamType" : "FIELD",
         "builtinMethod" : false,
         "enableBatchAction" : true,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "UNKNOWN",
         "codeName" : "Save",
@@ -16857,7 +16958,8 @@
         "requestMethod" : "PUT",
         "requestParamType" : "ENTITY",
         "builtinMethod" : false,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       }, {
         "codeName" : "FetchDefault",
         "methodType" : "FETCH",
@@ -17064,7 +17166,8 @@
         },
         "requestMethod" : "POST",
         "requestParamType" : "ENTITY",
-        "builtinMethod" : false
+        "builtinMethod" : false,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "READ",
         "codeName" : "Get",
@@ -17090,7 +17193,8 @@
         "requestMethod" : "GET",
         "requestParamType" : "FIELD",
         "builtinMethod" : false,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "GETDRAFT",
         "codeName" : "GetDraft",
@@ -17139,7 +17243,8 @@
         "requestParamType" : "FIELD",
         "builtinMethod" : false,
         "enableBatchAction" : true,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "UNKNOWN",
         "codeName" : "Save",
@@ -17187,7 +17292,8 @@
         "requestMethod" : "PUT",
         "requestParamType" : "ENTITY",
         "builtinMethod" : false,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       } ],
       "getAllPSAppDEDataSets" : [ {
         "codeName" : "FetchDefault",
@@ -17539,7 +17645,8 @@
         },
         "requestMethod" : "POST",
         "requestParamType" : "ENTITY",
-        "builtinMethod" : false
+        "builtinMethod" : false,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "READ",
         "codeName" : "Get",
@@ -17565,7 +17672,8 @@
         "requestMethod" : "GET",
         "requestParamType" : "FIELD",
         "builtinMethod" : false,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "GETDRAFT",
         "codeName" : "GetDraft",
@@ -17614,7 +17722,8 @@
         "requestParamType" : "FIELD",
         "builtinMethod" : false,
         "enableBatchAction" : true,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       }, {
         "actionMode" : "UNKNOWN",
         "codeName" : "Save",
@@ -17662,7 +17771,8 @@
         "requestMethod" : "PUT",
         "requestParamType" : "ENTITY",
         "builtinMethod" : false,
-        "needResourceKey" : true
+        "needResourceKey" : true,
+        "noServiceCodeName" : true
       }, {
         "codeName" : "FetchDefault",
         "methodType" : "FETCH",