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

README.md

@@ -3,10 +3,6 @@
 ## 背景
 
 ## 系统模块
-* [公共模块](module/common4.md)
-* [公共模块](module/common2.md)
-* [公共模块](module/common5.md)
-* [公共模块](module/common3.md)
 * [公共模块](module/common.md)
 
 

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

@@ -23,7 +23,7 @@ export class AppDeLogicNodeBase {
         LogUtil.log(`已完成执行${logicNode?.name}节点，操作参数数据如下:`);
         if (actionContext.paramsMap && (actionContext.paramsMap.size > 0)) {
             for (let [key, value] of actionContext.paramsMap) {
-                LogUtil.log(`${key}:`, value.getReal());
+                LogUtil.log(`${key}:`, Util.deepCopy(value.getReal()));
             }
         }
         let result: any = { nextNodes: [], actionContext };
@@ -66,7 +66,7 @@ export class AppDeLogicNodeBase {
                 const logicLinkSingleCond = logicLinkCond as IPSDELogicLinkSingleCond
                 let dstValue = actionContext.getParam(logicLinkSingleCond?.getDstLogicParam?.()?.codeName as string);
                 if (logicLinkSingleCond.dstFieldName) {
-                    dstValue = dstValue.get(logicLinkSingleCond.dstFieldName);
+                    dstValue = dstValue.get(logicLinkSingleCond.dstFieldName.toLowerCase());
                 }
                 let targetValue;
                 if (logicLinkSingleCond.paramType) {

app_Web/packages/ibiz-plugin/src/components/app-preset-input/app-preset-input.vue

@@ -6,6 +6,7 @@
             :type="curType"
             :disabled="disabled"
             :placeholder="curPlaceHolder"
+            :password="curType == 'password' && enableShowPwd" 
         >
         </i-input>
     </div>
@@ -48,6 +49,14 @@ export default class AppPreSetInput extends Vue {
      */
     @Prop() public disabled?: boolean;
 
+    /**
+     * 密码框是否启用显示值切换图标
+     *
+     * @type {boolean}
+     * @memberof AppPreSetInput
+     */
+    @Prop({default:false}) public enableShowPwd!: boolean;
+
     /**
      * 当前值
      *

app_Web/packages/ibiz-vue/src/app-logic/appuilogic/uilogic-node/logic-node-base.ts

@@ -23,7 +23,7 @@ export class AppUILogicNodeBase {
         LogUtil.log(`已完成执行${logicNode?.name}节点，操作参数数据如下:`);
         if (actionContext.paramsMap && (actionContext.paramsMap.size > 0)) {
             for (let [key, value] of actionContext.paramsMap) {
-                LogUtil.log(`${key}:`, value.getReal());
+                LogUtil.log(`${key}:`, Util.deepCopy(value.getReal()));
             }
         }
         let result: any = { nextNodes: [], actionContext };

app_Web/packages/ibiz-vue/src/app-service/common-service/codelist-translator.ts

@@ -132,8 +132,8 @@ export class CodeListTranslator {
      * @memberof CodeListTranslator
      */
     private getLocaleText(localeTag: string | undefined , _this: any, defaultText: string){
-        if(!Util.isEmpty(_this.$t) && typeof _this.$t === 'function' && !Util.isEmpty(localeTag)){
-            let localText = _this.$t(localeTag);
+        if(!Util.isEmpty(_this.$tl) && typeof _this.$tl === 'function' && !Util.isEmpty(localeTag)){
+            let localText = _this.$tl(localeTag, defaultText);
             if(!Util.isEmpty(localText)){
                 return localText;
             }

app_Web/packages/ibiz-vue/src/components/common/app-image-select/app-image-select.vue

@@ -80,7 +80,7 @@ export default class AppImageSelect extends Vue {
     @Watch('value')
     onValueChange(newVal: any, oldVal: any) {
         if (newVal) {
-            const reg = /^(data:image)/;
+            const reg = /^(data:image)|(.(bmp|jpg|jpeg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp))$/;
             if (reg.test(newVal)) {
                 this.dialogImageUrl = newVal;
                 this.svg = '';

app_Web/packages/ibiz-vue/src/components/common/input-box/input-box.vue

@@ -22,6 +22,7 @@
       :size="size"
       :type="type"
       :rows="rows"
+      :password="type == 'password' && enableShowPwd"
       :readonly="readonly"
       v-model="CurrentVal"
       :disabled="disabled ? true : false"
@@ -167,6 +168,15 @@ export default class InputBox extends Vue {
    */
   @Prop({default: true}) public isDebounce?: Boolean;
 
+
+  /**
+   * 密码框是否启用显示值切换图标
+   *
+   * @type {Boolean}
+   * @memberof InputBox
+   */
+  @Prop({default:false}) public enableShowPwd!: Boolean;
+
   /**
    * 数值框numberId
    */

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

@@ -228,6 +228,7 @@ export class AppDefaultEditor extends Vue {
             'FILEUPLOADER',
             'PICTURE',
             'PICTURE_ONE',
+            'PICTURE_ONE_RAW',
             'FILEUPLOADER_DISK',
             'PICTURE_ROMATE',
             'PICTURE_DISKPIC',

app_Web/packages/ibiz-vue/src/components/editor/textbox-editor/textbox-editor.tsx

@@ -42,6 +42,7 @@ export default class TextboxEditor extends EditorBase {
             case 'PASSWORD':
                 this.customProps.isDebounce = this.isDebounce;
                 this.customProps.type = 'password';
+                this.customProps.enableShowPwd = this.editorInstance.editorParams?.['enableShowPwd'] ? JSON.parse(this.editorInstance.editorParams['enableShowPwd'] as string) : false;
                 break;
             case 'TEXTAREA':
                 this.customProps.isDebounce = this.isDebounce;

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

@@ -1107,19 +1107,22 @@ export class EditFormControlBase extends FormControlBase implements EditFormCont
      */
     public async fillForm(_datas: any = {}, action: string): Promise<void> {
         this.ignorefieldvaluechange = true;
+        const tempData = Util.deepCopy(_datas);
         for (let i = 0; i < Object.keys(_datas).length; i++) {
             const name = Object.keys(_datas)[i];
-            if (this.data.hasOwnProperty(name)) {
+            if (tempData.hasOwnProperty(name)) {
                 // 是否转化为代码项文本
                 if (this.detailsModel[name] && this.detailsModel[name]['convertToCodeItemText'] && this.detailsModel[name]['codelist']) {
                     const codeListTranslator: CodeListTranslator = new CodeListTranslator();
                     const text: string = await codeListTranslator.getCodeListText(_datas[name], this.detailsModel[name]['codelist'], this, this.context, this.viewparams);
-                    this.data[name] = text;
+                    tempData[name] = text;
+                    this.codeItemTextMap.set(name, { val: _datas[name], text });
                 } else {
-                    this.data[name] = _datas[name];
+                    tempData[name] = _datas[name];
                 }
             }
         }
+        Object.assign(this.data, tempData);
         if (Object.is(action, 'loadDraft')) {
             this.createDefault();
         }
@@ -1893,7 +1896,6 @@ export class EditFormControlBase extends FormControlBase implements EditFormCont
                             rule.message = `${this.$t('app.formpage.valueverif') as string}${this.data[captionItemName]}`;
                         })
                     }
-                    this.$forceUpdate();
                 }
             }
         })
@@ -1922,6 +1924,7 @@ export class EditFormControlBase extends FormControlBase implements EditFormCont
                 }
             }
         }
+        this.$forceUpdate();
     }
 
     /**

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

 import { Subject, Subscription } from 'rxjs';
-import { ModelTool, Verify, AppErrorCode, EntityFieldErrorCode, FormControlInterface, EntityFieldError } from 'ibiz-core';
+import { ModelTool, Verify, AppErrorCode, EntityFieldErrorCode, FormControlInterface, EntityFieldError, IParams, Util } from 'ibiz-core';
 import { MainControlBase } from './main-control-base';
 import { IPSDEEditFormItem, IPSDEForm } from '@ibiz/dynamic-model-api';
 
@@ -111,6 +111,14 @@ export class FormControlBase extends MainControlBase implements FormControlInter
      */
     public rules: any = {}
 
+    /**
+     * 转化代码项值映射
+     *
+     * @type {Map<string,IParams>}
+     * @memberof FormControlBase
+     */
+    public codeItemTextMap: Map<string, IParams> = new Map();
+
     /**
      * 获取多项数据
      *
@@ -118,7 +126,14 @@ export class FormControlBase extends MainControlBase implements FormControlInter
      * @memberof FormControlBase
      */
     public getDatas(): any[] {
-        return [this.data];
+        const data = Util.deepCopy(this.data);
+        if (this.codeItemTextMap.size > 0) {
+            this.codeItemTextMap.forEach((value, key) => {
+                const { val } = value;
+                data[key] = val;
+            })
+        }
+        return [data];
     }
 
     /**
@@ -128,7 +143,14 @@ export class FormControlBase extends MainControlBase implements FormControlInter
      * @memberof FormControlBase
      */
     public getData(): any {
-        return this.data;
+        const data = Util.deepCopy(this.data);
+        if (this.codeItemTextMap.size > 0) {
+            this.codeItemTextMap.forEach((value, key) => {
+                const { val } = value;
+                data[key] = val;
+            })
+        }
+        return data;
     }
 
     /**
@@ -200,6 +222,10 @@ export class FormControlBase extends MainControlBase implements FormControlInter
      * @memberof FormControlBase
      */
     public setFormEnableCond(data: any): void {
+        // 拷贝模式srfuf设置为0
+        if (this.viewparams && this.viewparams.copymode) {
+            data.srfuf = '0';
+        }
         Object.values(this.detailsModel).forEach((detail: any) => {
             if (!Object.is(detail.detailType, 'FORMITEM')) {
                 return;
@@ -464,7 +490,7 @@ export class FormControlBase extends MainControlBase implements FormControlInter
             if (!(await this.handleCtrlEvents('onloadsuccess', { action: this.loadAction, navParam: viewparamResult, data: data }))) {
                 return;
             }
-            this.onFormLoad(data, 'load');
+            await this.onFormLoad(data, 'load');
             this.ctrlEvent({
                 controlname: this.controlInstance.name,
                 action: 'load',
@@ -515,7 +541,7 @@ export class FormControlBase extends MainControlBase implements FormControlInter
                 return;
             }
             this.resetDraftFormStates();
-            this.onFormLoad(data, 'loadDraft');
+            await this.onFormLoad(data, 'loadDraft');
             setTimeout(() => {
                 const form: any = this.$refs[this.controlInstance.name];
                 if (form) {
@@ -646,7 +672,7 @@ export class FormControlBase extends MainControlBase implements FormControlInter
                     if (!Object.is(EntityFieldErrorCode.ERROR_OK, detail.fielderrortype) && detail.fieldname) {
                         // 解析错误信息
                         let entityFieldError = new EntityFieldError(detail);
-                        let fieldErrorInfo = entityFieldError.fieldlogicname+entityFieldError.fielderrorinfo;
+                        let fieldErrorInfo = entityFieldError.fieldlogicname + entityFieldError.fielderrorinfo;
 
                         // 填充有detailModel字段的错误信息。
                         const tempFormItem: any = this.findFormItemByField(detail.fieldname);
@@ -655,7 +681,7 @@ export class FormControlBase extends MainControlBase implements FormControlInter
                         }
 
                         // notice显示的错误信息，默认只显示没有detailModel字段的错误信息,noticeAllFieldsError为true时显示所有的字段。
-                        if(this.Environment.noticeAllFieldsError || !tempFormItem){
+                        if (this.Environment.noticeAllFieldsError || !tempFormItem) {
                             errorMsg += `${fieldErrorInfo}<br/>`;
                         }
                     }

app_Web/src/utils/service/app-component-service.ts

@@ -312,6 +312,7 @@ export class AppComponentService {
         this.editorMap.set("AC_FS_NOBUTTON_DEFAULT", 'app-autocomplete');
         this.editorMap.set("LISTBOX_DEFAULT", 'app-list-box');
         this.editorMap.set("LISTBOXPICKUP_DEFAULT", 'app-list-box');
+        this.editorMap.set("PICTURE_ONE_RAW_DEFAULT", 'app-image-select');
         //兼容移动端编辑器
         this.editorMap.set('MOBTEXT_DEFAULT','input-box');
         this.editorMap.set('MOBPASSWORD_DEFAULT','input-box');
@@ -371,7 +372,6 @@ export class AppComponentService {
         this.editorMap.set("FILEUPLOADER_USEWORKTEMP", "text-file-upload");
         this.editorMap.set("PICKER_COMMONMICROCOM", "app-common-microcom");
         this.editorMap.set("SLIDER_PROGRESS", 'app-progress');
-        this.editorMap.set("PICTURE_ONE_RAW", 'app-image-select');
        // 注册编辑器
     }
 

ibizmodel.yaml

+modelfolder: trainsys-core/src/main/resources/model/cn/ibizlab/trainsys

trainsys-core/src/main/resources/liquibase/cn/ibizlab/trainsys/DEFAULT/h2_table.xml

@@ -13,6 +13,8 @@
             </column>
             <column name="CREATEMAN" remarks="建立人" type="VARCHAR(60)">
             </column>
+            <column name="DATE" remarks="日期" type="DATETIME">
+            </column>
             <column name="DEPTID" remarks="组织部门标识" type="VARCHAR(60)">
             </column>
             <column name="FIELD" remarks="属性" type="VARCHAR(100)">

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

@@ -2,7 +2,7 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
 
     <!--输出实体[BOOK]数据结构 -->
-    <changeSet author="root" id="tab-book-54-1">
+    <changeSet author="root" id="tab-book-72-1">
         <createTable tableName="T_BOOK">
                 <column name="BOOKNAME" remarks="" type="VARCHAR(200)">
                 </column>
@@ -43,6 +43,8 @@
                 </column>
                 <column name="FIELD10" remarks="" type="DATETIME">
                 </column>
+                <column name="DATE" remarks="" type="DATETIME">
+                </column>
         </createTable>
     </changeSet>
 

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

@@ -240,6 +240,9 @@
     }, {
       "name" : "FIELD10",
       "codeName" : "Field10"
+    }, {
+      "name" : "DATE",
+      "codeName" : "Date"
     } ],
     "codeName" : "Table",
     "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Book/PSDETABLES/Table.json",
@@ -1913,6 +1916,69 @@
     },
     "stdDataType" : 5,
     "valueFormat" : "%1$tY-%1$tm-%1$td"
+  }, {
+    "getAllPSDEFDTColumns" : [ {
+      "columnName" : "DATE",
+      "dBType" : "MYSQL5",
+      "name" : "DATE",
+      "queryCodeExp" : "t1.`DATE`",
+      "standardColumnName" : "`DATE`"
+    } ],
+    "getAllPSDEFUIModes" : [ {
+      "codeName" : "MobileDefault",
+      "name" : "[DATE][日期]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBDATE",
+        "name" : "[DATE][日期]移动端默认",
+        "uIMode" : "MOBILEDEFAULT",
+        "valueFormat" : "%1$tY-%1$tm-%1$td",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    }, {
+      "codeName" : "Default",
+      "name" : "[DATE][日期]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "DATEPICKEREX_NOTIME",
+        "name" : "[DATE][日期]",
+        "uIMode" : "DEFAULT",
+        "valueFormat" : "%1$tY-%1$tm-%1$td"
+      },
+      "type" : "DEFAULT"
+    } ],
+    "getAllPSDEFValueRules" : [ {
+      "codeName" : "Default",
+      "name" : "默认规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组"
+      },
+      "ruleInfo" : "默认规则",
+      "checkDefault" : true,
+      "defaultMode" : true,
+      "enableBackend" : true,
+      "enableFront" : true
+    } ],
+    "codeName" : "Date",
+    "dEFType" : 1,
+    "dataType" : "DATE",
+    "importOrder" : 1000,
+    "logicName" : "日期",
+    "name" : "DATE",
+    "getPSDEDBTable" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Book/PSDETABLES/Table.json"
+    },
+    "getPSSysDBColumn" : {
+      "modelref" : true,
+      "id" : "DATE"
+    },
+    "stdDataType" : 5,
+    "valueFormat" : "%1$tY-%1$tm-%1$td"
   } ],
   "getAllPSDEMethodDTOs" : [ {
     "name" : "BookDTO",
@@ -1964,6 +2030,16 @@
       "type" : "SIMPLE",
       "allowEmpty" : false,
       "readOnly" : true
+    }, {
+      "logicName" : "日期",
+      "name" : "Date",
+      "getPSDEField" : {
+        "name" : "DATE",
+        "codeName" : "Date"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 5,
+      "type" : "SIMPLE"
     }, {
       "logicName" : "组织部门标识",
       "name" : "DeptId",
@@ -2451,6 +2527,12 @@
     "name" : "书实体数据重定向视图",
     "realModelSubType" : "DEREDIRECTVIEW",
     "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "Usr0815395468DataViewExpView",
+    "logicName" : "卡片视图",
+    "name" : "卡片视图",
+    "realModelSubType" : "DEDATAVIEWEXPVIEW",
+    "realModelType" : "PSDEVIEWBASE"
   }, {
     "codeName" : "MPickupView",
     "logicName" : "书实体数据多项选择视图",
@@ -2484,6 +2566,12 @@
     "name" : "书实体选择表格视图（部件视图）",
     "realModelSubType" : "DEPICKUPGRIDVIEW",
     "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "DefaultDataView",
+    "logicName" : "数据视图",
+    "name" : "数据视图",
+    "realModelSubType" : "DEDATAVIEW",
+    "realModelType" : "PSDEVIEWBASE"
   }, {
     "codeName" : "EditView2",
     "logicName" : "书实体编辑视图（左右关系）",

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

@@ -13,6 +13,9 @@
   }, {
     "expression" : "t1.`CREATEMAN`",
     "name" : "CREATEMAN"
+  }, {
+    "expression" : "t1.`DATE`",
+    "name" : "DATE"
   }, {
     "expression" : "t1.`DEPTID`",
     "name" : "DEPTID"
@@ -59,6 +62,6 @@
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
   } ],
-  "queryCode" : "SELECT\nt1.`BOOKID`,\nt1.`BOOKNAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEPTID`,\nt1.`FIELD`,\nt1.`FIELD10`,\nt1.`FIELD2`,\nt1.`FIELD3`,\nt1.`FIELD4`,\nt1.`FIELD5`,\nt1.`FIELD6`,\nt1.`FIELD7`,\nt1.`FIELD8`,\nt1.`FIELD9`,\nt1.`ORGID`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOK` t1 \n",
+  "queryCode" : "SELECT\nt1.`BOOKID`,\nt1.`BOOKNAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DATE`,\nt1.`DEPTID`,\nt1.`FIELD`,\nt1.`FIELD10`,\nt1.`FIELD2`,\nt1.`FIELD3`,\nt1.`FIELD4`,\nt1.`FIELD5`,\nt1.`FIELD6`,\nt1.`FIELD7`,\nt1.`FIELD8`,\nt1.`FIELD9`,\nt1.`ORGID`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOK` t1 \n",
   "id" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

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

@@ -13,6 +13,9 @@
   }, {
     "expression" : "t1.`CREATEMAN`",
     "name" : "CREATEMAN"
+  }, {
+    "expression" : "t1.`DATE`",
+    "name" : "DATE"
   }, {
     "expression" : "t1.`DEPTID`",
     "name" : "DEPTID"
@@ -59,6 +62,6 @@
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
   } ],
-  "queryCode" : "SELECT\nt1.`BOOKID`,\nt1.`BOOKNAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEPTID`,\nt1.`FIELD`,\nt1.`FIELD10`,\nt1.`FIELD2`,\nt1.`FIELD3`,\nt1.`FIELD4`,\nt1.`FIELD5`,\nt1.`FIELD6`,\nt1.`FIELD7`,\nt1.`FIELD8`,\nt1.`FIELD9`,\nt1.`ORGID`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOK` t1 \n",
+  "queryCode" : "SELECT\nt1.`BOOKID`,\nt1.`BOOKNAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DATE`,\nt1.`DEPTID`,\nt1.`FIELD`,\nt1.`FIELD10`,\nt1.`FIELD2`,\nt1.`FIELD3`,\nt1.`FIELD4`,\nt1.`FIELD5`,\nt1.`FIELD6`,\nt1.`FIELD7`,\nt1.`FIELD8`,\nt1.`FIELD9`,\nt1.`ORGID`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOK` t1 \n",
   "id" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

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

@@ -343,6 +343,12 @@
     "name" : "FIELD10",
     "stdDataType" : 5,
     "valueFormat" : "YYYY-MM-DD"
+  }, {
+    "codeName" : "Date",
+    "logicName" : "日期",
+    "name" : "DATE",
+    "stdDataType" : 5,
+    "valueFormat" : "YYYY-MM-DD"
   } ],
   "getAllPSAppDEMethodDTOs" : [ {
     "codeName" : "BookDTO",
@@ -398,6 +404,18 @@
       "stdDataType" : 25,
       "type" : "SIMPLE",
       "allowEmpty" : false
+    }, {
+      "codeName" : "Date",
+      "logicName" : "日期",
+      "name" : "Date",
+      "orderValue" : 1000,
+      "getPSAppDEField" : {
+        "name" : "DATE",
+        "codeName" : "Date"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 5,
+      "type" : "SIMPLE"
     }, {
       "codeName" : "DeptId",
       "logicName" : "组织部门标识",

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

+{
+  "codeName" : "Usr0815070416",
+  "controlType" : "DATAVIEW",
+  "getCreatePSControlAction" : {
+    "modelref" : true,
+    "id" : "create"
+  },
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSDATAVIEWS/Usr0815070416.json",
+  "getFetchPSControlAction" : {
+    "modelref" : true,
+    "id" : "fetch"
+  },
+  "getGetPSControlAction" : {
+    "modelref" : true,
+    "id" : "load"
+  },
+  "groupMode" : "NONE",
+  "hookEventNames" : [ "ROWDBLCLICK", "SELECTIONCHANGE", "REMOVE", "LOAD", "BEFORELOAD" ],
+  "getItemPSLayoutPanel" : {
+    "codeName" : "Usr0815611479",
+    "controlType" : "PANEL",
+    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSPANELS/Usr0815611479.json",
+    "layoutMode" : "TABLE_24COL",
+    "logicName" : "数据视图_卡片视图_卡片面板",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+    },
+    "getPSControlParam" : { },
+    "getPSLayout" : {
+      "columnCount" : 24,
+      "layout" : "TABLE_24COL"
+    },
+    "getRootPSPanelItems" : [ {
+      "itemStyle" : "DEFAULT",
+      "itemType" : "CONTAINER",
+      "name" : "page_container",
+      "getPSLayout" : {
+        "columnCount" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      }
+    } ],
+    "name" : "itemlayoutpanel",
+    "modelid" : "8EC16BD9-F4E3-42C5-9944-D983E327DB2E",
+    "modeltype" : "PSSYSVIEWPANEL"
+  },
+  "logicName" : "数据视图_卡片视图",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+  },
+  "getPSControlLogics" : [ {
+    "eventNames" : "ROWDBLCLICK;SELECTIONCHANGE;REMOVE;LOAD;BEFORELOAD",
+    "logicTag" : "dataview",
+    "logicType" : "APPVIEWENGINE",
+    "name" : "engine_dataview",
+    "getPSAppViewEngine" : {
+      "modelref" : true,
+      "id" : "engine"
+    }
+  } ],
+  "getPSDEDataViewDataItems" : [ {
+    "dataType" : 25,
+    "name" : "srfkey",
+    "getPSAppDEField" : {
+      "name" : "BOOKID",
+      "codeName" : "BookId"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "srfmajortext",
+    "getPSAppDEField" : {
+      "name" : "BOOKNAME",
+      "codeName" : "BookName"
+    }
+  } ],
+  "pagingSize" : 1000,
+  "getRemovePSControlAction" : {
+    "modelref" : true,
+    "id" : "remove"
+  },
+  "getUpdatePSControlAction" : {
+    "modelref" : true,
+    "id" : "update"
+  },
+  "hasWFDataItems" : false,
+  "appendDEItems" : true,
+  "enableCardEdit" : false,
+  "enableCardEditGroup" : false,
+  "enableCardEditOrder" : false,
+  "enableCardNew" : false,
+  "enableGroup" : false,
+  "enablePagingBar" : false,
+  "noSort" : false,
+  "singleSelect" : false,
+  "modelid" : "45D1AB64-196D-4A7E-9DA9-2E375850669E",
+  "modeltype" : "PSDEDATAVIEW"
+}
\ No newline at end of file

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

+{
+  "codeName" : "Usr0815508508",
+  "controlType" : "DATAVIEW",
+  "getCreatePSControlAction" : {
+    "modelref" : true,
+    "id" : "create"
+  },
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSDATAVIEWS/Usr0815508508.json",
+  "getFetchPSControlAction" : {
+    "modelref" : true,
+    "id" : "fetch"
+  },
+  "getGetPSControlAction" : {
+    "modelref" : true,
+    "id" : "load"
+  },
+  "groupMode" : "NONE",
+  "hookEventNames" : [ "SELECTIONCHANGE", "LOAD" ],
+  "getItemPSLayoutPanel" : {
+    "codeName" : "Usr0815727063",
+    "controlType" : "PANEL",
+    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSPANELS/Usr0815727063.json",
+    "layoutMode" : "TABLE_24COL",
+    "logicName" : "卡片视图_卡片视图_卡片面板",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+    },
+    "getPSControlParam" : { },
+    "getPSLayout" : {
+      "columnCount" : 24,
+      "layout" : "TABLE_24COL"
+    },
+    "getRootPSPanelItems" : [ {
+      "itemStyle" : "DEFAULT",
+      "itemType" : "CONTAINER",
+      "name" : "page_container",
+      "getPSLayout" : {
+        "columnCount" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      }
+    } ],
+    "name" : "itemlayoutpanel",
+    "modelid" : "D63C91AF-7846-4F2A-8520-AA9DE8571FA0",
+    "modeltype" : "PSSYSVIEWPANEL"
+  },
+  "logicName" : "卡片视图_卡片视图",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+  },
+  "getPSControlLogics" : [ {
+    "eventNames" : "SELECTIONCHANGE",
+    "logicTag" : "dataviewexpbar_dataview",
+    "logicType" : "CUSTOM",
+    "name" : "dataviewexpbar_selectionchange"
+  }, {
+    "eventNames" : "LOAD",
+    "logicTag" : "dataviewexpbar_dataview",
+    "logicType" : "CUSTOM",
+    "name" : "dataviewexpbar_load"
+  } ],
+  "getPSDEDataViewDataItems" : [ {
+    "dataType" : 25,
+    "name" : "srfkey",
+    "getPSAppDEField" : {
+      "name" : "BOOKID",
+      "codeName" : "BookId"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "srfmajortext",
+    "getPSAppDEField" : {
+      "name" : "BOOKNAME",
+      "codeName" : "BookName"
+    }
+  } ],
+  "pagingSize" : 1000,
+  "getRemovePSControlAction" : {
+    "modelref" : true,
+    "id" : "remove"
+  },
+  "getUpdatePSControlAction" : {
+    "modelref" : true,
+    "id" : "update"
+  },
+  "hasWFDataItems" : false,
+  "appendDEItems" : true,
+  "enableCardEdit" : false,
+  "enableCardEditGroup" : false,
+  "enableCardEditOrder" : false,
+  "enableCardNew" : false,
+  "enableGroup" : false,
+  "enablePagingBar" : false,
+  "noSort" : false,
+  "singleSelect" : false,
+  "modelid" : "8C0CC153-FBB4-4696-9D12-25CAF311BF88",
+  "modeltype" : "PSDEDATAVIEW"
+}
\ No newline at end of file

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

@@ -148,6 +148,13 @@
       "name" : "FIELD8",
       "codeName" : "Field8"
     }
+  }, {
+    "id" : "date",
+    "dataType" : 5,
+    "getPSAppDEField" : {
+      "name" : "DATE",
+      "codeName" : "Date"
+    }
   }, {
     "id" : "field9",
     "dataType" : 25,
@@ -671,6 +678,39 @@
           },
           "allowEmpty" : true,
           "showCaption" : true
+        }, {
+          "caption" : "日期",
+          "codeName" : "date",
+          "dataType" : 5,
+          "detailStyle" : "DEFAULT",
+          "detailType" : "FORMITEM",
+          "enableCond" : 3,
+          "ignoreInput" : 0,
+          "itemWidth" : 230.0,
+          "labelPos" : "LEFT",
+          "labelWidth" : 130,
+          "name" : "date",
+          "noPrivDisplayMode" : 1,
+          "getPSAppDEField" : {
+            "name" : "DATE",
+            "codeName" : "Date"
+          },
+          "getPSEditor" : {
+            "dateTimeFormat" : "YYYY-MM-DD",
+            "editorParams" : {
+              "TIMEFMT" : "YYYY-MM-DD"
+            },
+            "editorType" : "DATEPICKEREX_NOTIME",
+            "editorWidth" : 100.0,
+            "name" : "date"
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "valueFormat" : "YYYY-DD",
+          "allowEmpty" : true,
+          "showCaption" : true
         } ],
         "getPSLayout" : {
           "columnCount" : 24,

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

+{
+  "codeName" : "Usr0815611479",
+  "controlType" : "PANEL",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSPANELS/Usr0815611479.json",
+  "layoutMode" : "TABLE_24COL",
+  "logicName" : "数据视图_卡片视图_卡片面板",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+  },
+  "getPSLayout" : {
+    "columnCount" : 24,
+    "layout" : "TABLE_24COL"
+  },
+  "getRootPSPanelItems" : [ {
+    "itemStyle" : "DEFAULT",
+    "itemType" : "CONTAINER",
+    "name" : "page_container",
+    "getPSLayout" : {
+      "columnCount" : 24,
+      "layout" : "TABLE_24COL"
+    },
+    "getPSLayoutPos" : {
+      "colMD" : 24,
+      "layout" : "TABLE_24COL"
+    }
+  } ],
+  "modelid" : "8EC16BD9-F4E3-42C5-9944-D983E327DB2E",
+  "modeltype" : "PSSYSVIEWPANEL"
+}
\ No newline at end of file

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

+{
+  "codeName" : "Usr0815727063",
+  "controlType" : "PANEL",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSPANELS/Usr0815727063.json",
+  "layoutMode" : "TABLE_24COL",
+  "logicName" : "卡片视图_卡片视图_卡片面板",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+  },
+  "getPSLayout" : {
+    "columnCount" : 24,
+    "layout" : "TABLE_24COL"
+  },
+  "getRootPSPanelItems" : [ {
+    "itemStyle" : "DEFAULT",
+    "itemType" : "CONTAINER",
+    "name" : "page_container",
+    "getPSLayout" : {
+      "columnCount" : 24,
+      "layout" : "TABLE_24COL"
+    },
+    "getPSLayoutPos" : {
+      "colMD" : 24,
+      "layout" : "TABLE_24COL"
+    }
+  } ],
+  "modelid" : "D63C91AF-7846-4F2A-8520-AA9DE8571FA0",
+  "modeltype" : "PSSYSVIEWPANEL"
+}
\ No newline at end of file

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

+{
+  "codeName" : "Usr0815581326",
+  "controlType" : "SEARCHFORM",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSSEARCHFORMS/Usr0815581326.json",
+  "hookEventNames" : [ "SEARCH", "LOAD", "SAVE" ],
+  "logicName" : "数据视图_搜索表单",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+  },
+  "getPSControlLogics" : [ {
+    "eventNames" : "SEARCH;LOAD;SAVE",
+    "logicTag" : "searchform",
+    "logicType" : "APPVIEWENGINE",
+    "name" : "engine_searchform",
+    "getPSAppViewEngine" : {
+      "modelref" : true,
+      "id" : "engine"
+    }
+  } ],
+  "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,
+  "modelid" : "3353DD28-81DF-49F6-AF99-1C2EFEF8D3C3",
+  "modeltype" : "PSDEFORM_SEARCHFORM"
+}
\ No newline at end of file

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

@@ -1134,6 +1134,13 @@
         "name" : "FIELD8",
         "codeName" : "Field8"
       }
+    }, {
+      "id" : "date",
+      "dataType" : 5,
+      "getPSAppDEField" : {
+        "name" : "DATE",
+        "codeName" : "Date"
+      }
     }, {
       "id" : "field9",
       "dataType" : 25,
@@ -1657,6 +1664,39 @@
             },
             "allowEmpty" : true,
             "showCaption" : true
+          }, {
+            "caption" : "日期",
+            "codeName" : "date",
+            "dataType" : 5,
+            "detailStyle" : "DEFAULT",
+            "detailType" : "FORMITEM",
+            "enableCond" : 3,
+            "ignoreInput" : 0,
+            "itemWidth" : 230.0,
+            "labelPos" : "LEFT",
+            "labelWidth" : 130,
+            "name" : "date",
+            "noPrivDisplayMode" : 1,
+            "getPSAppDEField" : {
+              "name" : "DATE",
+              "codeName" : "Date"
+            },
+            "getPSEditor" : {
+              "dateTimeFormat" : "YYYY-MM-DD",
+              "editorParams" : {
+                "TIMEFMT" : "YYYY-MM-DD"
+              },
+              "editorType" : "DATEPICKEREX_NOTIME",
+              "editorWidth" : 100.0,
+              "name" : "date"
+            },
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "valueFormat" : "YYYY-DD",
+            "allowEmpty" : true,
+            "showCaption" : true
           } ],
           "getPSLayout" : {
             "columnCount" : 24,

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

+{
+  "accUserMode" : 2,
+  "caption" : "书",
+  "codeName" : "bookUsr0815395468DataViewExpView",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr0815395468DataViewExpView.json",
+  "name" : "bookUsr0815395468DataViewExpView",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+  },
+  "getPSAppViewEngines" : [ {
+    "engineCat" : "VIEW",
+    "engineType" : "DataViewExpView",
+    "name" : "engine",
+    "getPSUIEngineParams" : [ {
+      "ctrlName" : "dataviewexpbar",
+      "name" : "DATAVIEWEXPBAR",
+      "paramType" : "CTRL"
+    } ]
+  } ],
+  "getPSAppViewLogics" : [ {
+    "logicTrigger" : "CUSTOM",
+    "logicType" : "SYSUILOGIC",
+    "name" : "newdata",
+    "getPSAppUILogic" : {
+      "actionAfterWizard" : "DEFAULT",
+      "logicType" : "PREDEFINED",
+      "name" : "新建数据",
+      "viewLogicType" : "APP_NEWDATA",
+      "batchAddOnly" : false,
+      "enableBatchAdd" : false,
+      "enableWizardAdd" : false
+    }
+  }, {
+    "logicTrigger" : "CUSTOM",
+    "logicType" : "SYSUILOGIC",
+    "name" : "opendata",
+    "getPSAppUILogic" : {
+      "logicType" : "PREDEFINED",
+      "name" : "打开数据",
+      "viewLogicType" : "APP_OPENDATA",
+      "editMode" : true
+    }
+  } ],
+  "getPSControls" : [ {
+    "codeName" : "Usr0815395468DataViewExpViewdataviewexpbar",
+    "controlType" : "DATAVIEWEXPBAR",
+    "hookEventNames" : [ "SELECTIONCHANGE", "LOAD", "ACTIVATED" ],
+    "name" : "dataviewexpbar",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+    },
+    "getPSControlHandler" : {
+      "enableDEFieldPrivilege" : false,
+      "id" : "dataviewexpbar"
+    },
+    "getPSControlLogics" : [ {
+      "eventNames" : "SELECTIONCHANGE;LOAD;ACTIVATED",
+      "logicTag" : "dataviewexpbar",
+      "logicType" : "APPVIEWENGINE",
+      "name" : "engine_dataviewexpbar",
+      "getPSAppViewEngine" : {
+        "modelref" : true,
+        "id" : "engine"
+      }
+    } ],
+    "getPSControlParam" : {
+      "autoLoad" : true,
+      "showBusyIndicator" : true,
+      "id" : "DATAVIEWEXPBAR"
+    },
+    "getPSControls" : [ {
+      "codeName" : "Usr0815508508",
+      "controlType" : "DATAVIEW",
+      "getCreatePSControlAction" : {
+        "modelref" : true,
+        "id" : "create"
+      },
+      "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSDATAVIEWS/Usr0815508508.json",
+      "getFetchPSControlAction" : {
+        "modelref" : true,
+        "id" : "fetch"
+      },
+      "getGetPSControlAction" : {
+        "modelref" : true,
+        "id" : "load"
+      },
+      "groupMode" : "NONE",
+      "hookEventNames" : [ "SELECTIONCHANGE", "LOAD" ],
+      "getItemPSLayoutPanel" : {
+        "codeName" : "Usr0815727063",
+        "controlType" : "PANEL",
+        "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSPANELS/Usr0815727063.json",
+        "layoutMode" : "TABLE_24COL",
+        "logicName" : "卡片视图_卡片视图_卡片面板",
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+        },
+        "getPSControlParam" : { },
+        "getPSLayout" : {
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getRootPSPanelItems" : [ {
+          "itemStyle" : "DEFAULT",
+          "itemType" : "CONTAINER",
+          "name" : "page_container",
+          "getPSLayout" : {
+            "columnCount" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          }
+        } ],
+        "name" : "itemlayoutpanel",
+        "modelid" : "D63C91AF-7846-4F2A-8520-AA9DE8571FA0",
+        "modeltype" : "PSSYSVIEWPANEL"
+      },
+      "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"
+          }
+        }, {
+          "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" : "SELECTIONCHANGE",
+        "logicTag" : "dataviewexpbar_dataview",
+        "logicType" : "CUSTOM",
+        "name" : "dataviewexpbar_selectionchange"
+      }, {
+        "eventNames" : "LOAD",
+        "logicTag" : "dataviewexpbar_dataview",
+        "logicType" : "CUSTOM",
+        "name" : "dataviewexpbar_load"
+      } ],
+      "getPSControlParam" : {
+        "autoLoad" : true,
+        "showBusyIndicator" : true,
+        "id" : "dataviewexpbar_dataview"
+      },
+      "getPSDEDataViewDataItems" : [ {
+        "dataType" : 25,
+        "name" : "srfkey",
+        "getPSAppDEField" : {
+          "name" : "BOOKID",
+          "codeName" : "BookId"
+        }
+      }, {
+        "dataType" : 25,
+        "name" : "srfmajortext",
+        "getPSAppDEField" : {
+          "name" : "BOOKNAME",
+          "codeName" : "BookName"
+        }
+      } ],
+      "pagingSize" : 1000,
+      "getRemovePSControlAction" : {
+        "modelref" : true,
+        "id" : "remove"
+      },
+      "getUpdatePSControlAction" : {
+        "modelref" : true,
+        "id" : "update"
+      },
+      "hasWFDataItems" : false,
+      "appendDEItems" : true,
+      "enableCardEdit" : false,
+      "enableCardEditGroup" : false,
+      "enableCardEditOrder" : false,
+      "enableCardNew" : false,
+      "enableGroup" : false,
+      "enablePagingBar" : false,
+      "noSort" : false,
+      "singleSelect" : false,
+      "name" : "dataviewexpbar_dataview",
+      "modelid" : "8C0CC153-FBB4-4696-9D12-25CAF311BF88",
+      "modeltype" : "PSDEDATAVIEW"
+    } ],
+    "xDataControlName" : "dataviewexpbar_dataview",
+    "enableCounter" : true,
+    "enableSearch" : false,
+    "showTitleBar" : true,
+    "modelid" : "63FA8F31-3A7D-456A-8ECC-360795483CB8_dataviewexpbar",
+    "modeltype" : "PSEXPBAR"
+  } ],
+  "getPSDEViewCodeName" : "Usr0815395468DataViewExpView",
+  "getPSDEViewId" : "4A896F18-F68A-4FEE-8AB1-E9C4D7269621",
+  "getPSViewLayoutPanel" : {
+    "codeName" : "Layoutpanel",
+    "controlStyle" : "APPDEDATAVIEWEXPVIEW",
+    "controlType" : "VIEWLAYOUTPANEL",
+    "name" : "layoutpanel",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+    },
+    "getPSControlParam" : { },
+    "layoutBodyOnly" : true,
+    "layoutPanel" : true,
+    "useDefaultLayout" : true
+  },
+  "sideBarLayout" : "LEFT",
+  "title" : "卡片视图",
+  "viewStyle" : "DEFAULT",
+  "viewType" : "DEDATAVIEWEXPVIEW",
+  "enableDP" : true,
+  "enableFilter" : false,
+  "enableQuickSearch" : true,
+  "showDataInfoBar" : true,
+  "modelid" : "63FA8F31-3A7D-456A-8ECC-360795483CB8",
+  "modeltype" : "PSAPPDEVIEW"
+}
\ No newline at end of file

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

@@ -31,12 +31,12 @@
       "tooltip" : "原材料"
     }, {
       "accUserMode" : 2,
-      "caption" : "书",
+      "caption" : "学员信息管理",
       "itemType" : "MENUITEM",
-      "name" : "menuitem2",
+      "name" : "menuitem3",
       "getPSAppFunc" : {
         "modelref" : true,
-        "id" : "AppFunc2"
+        "id" : "AppFunc3"
       },
       "getPSLayout" : {
         "columnCount" : 24,
@@ -46,15 +46,15 @@
         "colMD" : 24,
         "layout" : "TABLE_24COL"
       },
-      "tooltip" : "书"
+      "tooltip" : "学员信息管理"
     }, {
       "accUserMode" : 2,
-      "caption" : "学员信息管理",
+      "caption" : "手机",
       "itemType" : "MENUITEM",
-      "name" : "menuitem3",
+      "name" : "menuitem4",
       "getPSAppFunc" : {
         "modelref" : true,
-        "id" : "AppFunc3"
+        "id" : "AppFunc4"
       },
       "getPSLayout" : {
         "columnCount" : 24,
@@ -64,15 +64,20 @@
         "colMD" : 24,
         "layout" : "TABLE_24COL"
       },
-      "tooltip" : "学员信息管理"
+      "tooltip" : "手机"
     }, {
+      "accUserMode" : 0,
+      "caption" : "子菜单",
+      "itemType" : "MENUITEM",
+      "name" : "menuitem6",
+      "getPSAppMenuItems" : [ {
         "accUserMode" : 2,
-      "caption" : "手机",
+        "caption" : "书",
         "itemType" : "MENUITEM",
-      "name" : "menuitem4",
+        "name" : "menuitem2",
         "getPSAppFunc" : {
           "modelref" : true,
-        "id" : "AppFunc4"
+          "id" : "AppFunc2"
         },
         "getPSLayout" : {
           "columnCount" : 24,
@@ -82,7 +87,7 @@
           "colMD" : 24,
           "layout" : "TABLE_24COL"
         },
-      "tooltip" : "手机"
+        "tooltip" : "书"
       }, {
         "accUserMode" : 2,
         "caption" : "书籍类别",
@@ -102,6 +107,16 @@
         },
         "tooltip" : "书籍类别"
       } ],
+      "getPSLayout" : {
+        "columnCount" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "tooltip" : "子菜单"
+    } ],
     "getPSControlHandler" : {
       "enableDEFieldPrivilege" : false,
       "id" : "appmenu"

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

 {
   "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPLANS/ZH_CN.json",
   "language" : "ZH_CN",
-  "name" : "网页端-中文简体"
+  "name" : "中文简体"
 }
\ No newline at end of file

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

@@ -13,16 +13,6 @@
       "id" : "AppFunc"
     },
     "tooltip" : "原材料"
-  }, {
-    "accUserMode" : 2,
-    "caption" : "书",
-    "itemType" : "MENUITEM",
-    "name" : "menuitem2",
-    "getPSAppFunc" : {
-      "modelref" : true,
-      "id" : "AppFunc2"
-    },
-    "tooltip" : "书"
   }, {
     "accUserMode" : 2,
     "caption" : "学员信息管理",
@@ -43,6 +33,21 @@
       "id" : "AppFunc4"
     },
     "tooltip" : "手机"
+  }, {
+    "accUserMode" : 0,
+    "caption" : "子菜单",
+    "itemType" : "MENUITEM",
+    "name" : "menuitem6",
+    "getPSAppMenuItems" : [ {
+      "accUserMode" : 2,
+      "caption" : "书",
+      "itemType" : "MENUITEM",
+      "name" : "menuitem2",
+      "getPSAppFunc" : {
+        "modelref" : true,
+        "id" : "AppFunc2"
+      },
+      "tooltip" : "书"
     }, {
       "accUserMode" : 2,
       "caption" : "书籍类别",
@@ -54,6 +59,8 @@
       },
       "tooltip" : "书籍类别"
     } ],
+    "tooltip" : "子菜单"
+  } ],
   "enableCustomize" : false,
   "name" : "appindex",
   "modelid" : "6A3E233F-FB4A-493B-B3C2-1860D5502904",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSDBSCHEMES/DEFAULT.json

@@ -28,6 +28,12 @@
       "name" : "CREATEMAN",
       "stdDataType" : 25,
       "nullable" : true
+    }, {
+      "codeName" : "DATE",
+      "logicName" : "日期",
+      "name" : "DATE",
+      "stdDataType" : 5,
+      "nullable" : true
     }, {
       "codeName" : "DEPTID",
       "length" : 60,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json

@@ -551,22 +551,6 @@
     "path" : "PSSYSVALUERULES/ValueRule12.json"
   } ],
   "getAllPSSystemModules" : [ {
-    "codeName" : "common4",
-    "dynaModelFilePath" : "PSMODULES/common4.json",
-    "name" : "公共模块"
-  }, {
-    "codeName" : "common2",
-    "dynaModelFilePath" : "PSMODULES/common2.json",
-    "name" : "公共模块"
-  }, {
-    "codeName" : "common5",
-    "dynaModelFilePath" : "PSMODULES/common5.json",
-    "name" : "公共模块"
-  }, {
-    "codeName" : "common3",
-    "dynaModelFilePath" : "PSMODULES/common3.json",
-    "name" : "公共模块"
-  }, {
     "getAllPSDataEntities" : [ {
       "modelref" : true,
       "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"