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

app_Web/src/components/app-date-range/app-date-range.scss

-.app-date-range{
-  display: block;
+
+// 带时间
+.app-date-range--datetime{
+  min-width: 333px;
 }
 
+// 不带时间
+.app-date-range--date{
+  min-width: 210px;
+}
\ No newline at end of file

app_Web/src/components/app-date-range/app-date-range.vue

 <template>
-    <date-picker></date-picker>
+  <date-picker
+    :class="['app-date-range', 'app-date-range--' + type]"
+    :type="rangeType"
+    :value="realVal"
+    :placeholder="placeholder"
+    :disabled="disabled"
+    transfer
+    @on-change="onChange"
+    @on-open-change="onOpenChange"
+  ></date-picker>
 </template>
 
 <script lang="ts">
-import { Vue, Component, Prop, Watch } from 'vue-property-decorator';
+import { Vue, Component, Prop, Watch } from "vue-property-decorator";
 @Component({})
 export default class AppDateRange extends Vue {
+  /**
+   * 是否禁用
+   *
+   * @type {string}
+   * @memberof AppDateRange
+   */
+  @Prop({ default: false }) public disabled?: boolean;
 
   /**
-     * 当前值
+   * placeholder
    *
-     * @type {*}
-     * @memberof AppSpan
+   * @type {string}
+   * @memberof AppDateRange
+   */
+  @Prop({ default: "请选择时间" }) public placeholder?: string;
+
+  /**
+   * 日期值格式化
+   *
+   * @type {string}
+   * @memberof AppDateRange
    */
-    @Prop() public value?: any;
+  @Prop() public valueFormat?: string;
 
   /**
    * 数据类型
    *
    * @type {string}
-     * @memberof AppSpan
+   * @memberof AppDateRange
    */
-    @Prop({default: 'datetime'}) public type?: 'datetime' | 'date';
+  @Prop({ default: "datetime" }) public type?: "datetime" | "date";
 
   /**
-     * 是否禁用
+   * 开始属性名称
    *
    * @type {string}
-     * @memberof AppSpan
+   * @memberof AppDateRange
    */
-    @Prop({default: false}) public disabled?: boolean;
+  @Prop() public startField?: string;
 
   /**
-     * 日期值格式化
+   * 结束属性名称
    *
    * @type {string}
-     * @memberof AppSpan
+   * @memberof AppDateRange
    */
-    @Prop() public valueFormat?: string;
+  @Prop() public endField?: string;
 
   /**
    * 传入表单数据
    *
    * @type {*}
-     * @memberof AppSpan
+   * @memberof AppDateRange
    */
   @Prop() public data?: any;
 
+  /**
+   * 实际组件维护的值
+   *
+   * @type {*}
+   * @memberof AppDateRange
+   */
+  public realVal: any[] = [];
+
+  /**
+   * 是否修改过数据
+   * @type {boolean}
+   * @memberof AppDateRange
+   */
+  public modified: boolean = false;
+
+  /**
+   * iview组件类型`
+   *
+   * @type {string}
+   * @memberof AppDateRange
+   */
+  get rangeType() {
+    switch (this.type) {
+      case "date":
+        return "daterange";
+      default:
+        return "datetimerange";
+    }
+  }
+
+  /**
+   * 生命周期
+   *
+   * @type {string}
+   * @memberof AppDateRange
+   */
+  created() {
+    if (!this.startField) {
+      this.$Notice.error({
+        title: this.$t("app.commonWords.wrong") as string,
+        desc: "没有配置开始属性",
+      });
+    }
+    if (!this.endField) {
+      this.$Notice.error({
+        title: this.$t("app.commonWords.wrong") as string,
+        desc: "没有配置结束属性",
+      });
+    }
+  }
+
   /**
    * 监控表单属性 data 值
    *
-     * @memberof AppSpan
+   * @memberof AppDateRange
    */
-    @Watch('data')
+  @Watch("data", { deep: true, immediate: true })
   onDataChange(newVal: any, oldVal: any) {
-        if(newVal !== oldVal){
-           console.log(newVal);
+    if (newVal && this.startField && this.endField) {
+      this.realVal = [newVal[this.startField], newVal[this.endField]];
+      this.modified = false;
+      console.log(this.realVal);
+    }
+  }
+
+  /**
+   * iview组件值变更事件（只更新realVal,不抛出）
+   *
+   * @memberof AppDateRange
+   */
+  onChange(values: any[]) {
+    this.realVal = values;
+    this.modified = true;
+    if(values[0]==='' && values[1] === ''){
+      //清空的情况，直接抛值，openChange会先触发，或不触发。
+      this.$emit("change", this.startField!, null);
+      this.$emit("change", this.endField!, null);
     }
   }
 
+  /**
+   * iview组件值关闭事件（如果数据有变更，则抛出change事件）
+   *
+   * @memberof AppDateRange
+   */
+  onOpenChange(isOpen: boolean) {
+    if (!isOpen && this.modified) {
+      const [start, end] = this.realVal;
+      this.$emit("change", this.startField!, start);
+      this.$emit("change", this.endField!, end);
+    }
+  }
 }
 </script>
 
-<style lang='scss'>
-@import './app-date-range.scss';
+<style lang="scss">
+@import "./app-date-range.scss";
 </style>

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

@@ -944,6 +944,8 @@ function getLocaleResource(){
         'MENUITEM.CAPTION.ITEMLAYOUTPANEL': 'Item Layout Panel',
         'MENUITEM.CAPTION.WORKBENCH': 'Work bench',
         'MENUITEM.CAPTION.VIEW': 'View',
+        'OTHER.BUTTONTSET': 'Test the multilingual button
+',
         'MENUITEM.CAPTION.WORKFLOW': 'Workflow',
         'MENUITEM.CAPTION.MULTIFORMROWRECORDS': 'Multiple Forms (row records)',
         'TBB.TOOLTIP.*.SAVE': 'Save',

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

@@ -822,6 +822,7 @@ function getLocaleResource(){
                 "empty": "",
             },
         },
+        'OTHER.BUTTONTSET': '测试多语言按钮',
         'MENUITEM.CAPTION.WORKBENCH': '工作台--',
         'PAGE.INDEX': 'R7-Vue-Demo',
     };

app_Web/src/widgets/ibizappeditor/default-searchform/default-searchform-base.vue

@@ -639,7 +639,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZAPPEDITORListView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZAPPEDITORGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -675,7 +675,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public async loadDraft(opt: any = {},mode?:string): Promise<any> {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZAPPEDITORListView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZAPPEDITORGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

app_Web/src/widgets/ibizbook/default-searchform/default-searchform-base.vue

@@ -712,7 +712,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCustomView_layout' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -748,7 +748,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public async loadDraft(opt: any = {},mode?:string): Promise<any> {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCustomView_layout' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

app_Web/src/widgets/ibizbook/guide-borrow-form-form/guide-borrow-form-form-base.vue

@@ -1378,7 +1378,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
      */
     public async load(opt: any = {}): Promise<any> {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsrWizardView_plugin' + (this.$t('app.formpage.notconfig.loadaction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -1429,7 +1429,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
      */
     public async loadDraft(opt: any = {}): Promise<any> {
         if (!this.loaddraftAction) {
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsrWizardView_plugin' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
             return;
         }
         const arg: any = { ...opt } ;
@@ -1499,7 +1499,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
         const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
         if(!action){
             let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsrWizardView_plugin' + (this.$t('app.formpage.notconfig.actionname') as string) });
             return;
         }
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1607,7 +1607,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
             const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
             if(!action){
                 let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsrWizardView_plugin' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg, { viewparams: this.viewparams });
@@ -1799,7 +1799,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
     public remove(opt:Array<any> = [],showResultInfo?: boolean): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
             if(!this.removeAction){
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsrWizardView_plugin' + (this.$t('app.formpage.notconfig.removeaction') as string) });
                 return;
             }
             const arg: any = opt[0];

app_Web/src/widgets/ibizbook/guide-return-form-form/guide-return-form-form-base.vue

@@ -1344,7 +1344,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
      */
     public async load(opt: any = {}): Promise<any> {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsrWizardView_plugin' + (this.$t('app.formpage.notconfig.loadaction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -1395,7 +1395,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
      */
     public async loadDraft(opt: any = {}): Promise<any> {
         if (!this.loaddraftAction) {
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsrWizardView_plugin' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
             return;
         }
         const arg: any = { ...opt } ;
@@ -1465,7 +1465,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
         const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
         if(!action){
             let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsrWizardView_plugin' + (this.$t('app.formpage.notconfig.actionname') as string) });
             return;
         }
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1573,7 +1573,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
             const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
             if(!action){
                 let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsrWizardView_plugin' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg, { viewparams: this.viewparams });
@@ -1765,7 +1765,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
     public remove(opt:Array<any> = [],showResultInfo?: boolean): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
             if(!this.removeAction){
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsrWizardView_plugin' + (this.$t('app.formpage.notconfig.removeaction') as string) });
                 return;
             }
             const arg: any = opt[0];

app_Web/src/widgets/ibizbook/inter-func-form-form/inter-func-form-form-base.vue

@@ -889,7 +889,7 @@ export default class InterFuncFormBase extends Vue implements ControlInterface {
     public detailsModel: any = {
         group1: new FormGroupPanelModel({ caption: '编辑表单内置功能', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, isControlledContent: false , uiActionGroup: { caption: '', langbase: 'entities.ibizbook.interfuncform_form', extractMode: 'ITEM', details: [] }, isManageContainer: false, showMoreModeItems: []  })
 , 
-        button1: new FormButtonModel({ caption: '打开文档', detailType: 'BUTTON', name: 'button1', visible: true, isShowCaption: true, form: this, isControlledContent: false ,disabled: false, uiaction: { type: 'DEUIACTION', 
+        button1: new FormButtonModel({ caption: '测试按钮', detailType: 'BUTTON', name: 'button1', visible: true, isShowCaption: true, form: this, isControlledContent: false ,disabled: false, uiaction: { type: 'DEUIACTION', 
  tag: 'openDocument',actiontarget: 'SINGLEKEY',noprivdisplaymode:1,dataaccaction:'OPEN_DOCUMENT',visabled: true,disabled: false} })
 , 
         grouppanel1: new FormGroupPanelModel({ caption: '分组面板', detailType: 'GROUPPANEL', name: 'grouppanel1', visible: true, isShowCaption: true, form: this, isControlledContent: false , uiActionGroup: { caption: '打开文档', langbase: 'entities.ibizbook.interfuncform_form', extractMode: 'ITEM', details: [{ name: 'grouppanel1_u010ffcf', caption: '打开文档',disabled: false, visabled: true, noprivdisplaymode:1,actiontarget: 'SINGLEKEY',dataaccaction: 'OPEN_DOCUMENT',uiactiontag: 'ibizbook_opendocument',isShowCaption:true,isShowIcon:true }, { name: 'grouppanel1_uee49d60', caption: '打开实体看板文档',disabled: false, visabled: true, noprivdisplaymode:2,actiontarget: 'NONE',dataaccaction: '',uiactiontag: 'ibizbook_openkanbandocument',isShowCaption:true,isShowIcon:true }] }, isManageContainer: false, showMoreModeItems: []  })
@@ -1486,7 +1486,7 @@ export default class InterFuncFormBase extends Vue implements ControlInterface {
 
 
 	/**
-	 * 表单 打开文档 事件
+	 * 表单 测试按钮 事件
 	 *
 	 * @memberof @memberof InterFuncFormBase
 	 */

app_Web/src/widgets/ibizbook/quicksearchform-searchform/quicksearchform-searchform-base.vue

 <template>
-    <i-form :model="this.data" class='app-search-form' ref='quicksearchform' style="">
+    <i-form :model="this.data" class='app-search-form' ref='searchform' style="">
   <input style="display:none;"/>
   <row>
     <i-col span="20" class="form-content">
@@ -516,7 +516,7 @@ export default class QUICKSEARCHFORMBase extends Vue implements ControlInterface
      * @memberof QUICKSEARCHFORMBase
      */
     public formValidateStatus(): boolean {
-        const form: any = this.$refs.quicksearchform;
+        const form: any = this.$refs.searchform;
         let validatestate: boolean = true;
         form.validate((valid: boolean) => {
             validatestate = valid ? true : false;
@@ -670,7 +670,7 @@ export default class QUICKSEARCHFORMBase extends Vue implements ControlInterface
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCalendarView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsrListView_plugin' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -706,7 +706,7 @@ export default class QUICKSEARCHFORMBase extends Vue implements ControlInterface
      */
     public async loadDraft(opt: any = {},mode?:string): Promise<any> {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCalendarView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsrListView_plugin' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

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

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

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSFORMS/InterFuncForm.json

@@ -707,7 +707,10 @@
       "name" : "grouppanel1",
       "getPSDEFormDetails" : [ {
         "actionType" : "UIACTION",
-        "caption" : "打开文档",
+        "getCapPSLanguageRes" : {
+          "lanResTag" : "OTHER.BUTTONTSET"
+        },
+        "caption" : "测试按钮",
         "codeName" : "button1",
         "detailStyle" : "DEFAULT",
         "detailType" : "BUTTON",
@@ -748,7 +751,7 @@
           "id" : "openDocument@IBIZBOOK"
         },
         "rTMOSFilePath" : "psdeformdetail_buttons/button1",
-        "tooltip" : "打开文档",
+        "tooltip" : "测试按钮",
         "showCaption" : true
       } ],
       "getPSLayout" : {

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

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

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

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

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

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

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

@@ -1229,7 +1229,10 @@
         "name" : "grouppanel1",
         "getPSDEFormDetails" : [ {
           "actionType" : "UIACTION",
-          "caption" : "打开文档",
+          "getCapPSLanguageRes" : {
+            "lanResTag" : "OTHER.BUTTONTSET"
+          },
+          "caption" : "测试按钮",
           "codeName" : "button1",
           "detailStyle" : "DEFAULT",
           "detailType" : "BUTTON",
@@ -1270,7 +1273,7 @@
             "id" : "openDocument@IBIZBOOK"
           },
           "rTMOSFilePath" : "psdeformdetail_buttons/button1",
-          "tooltip" : "打开文档",
+          "tooltip" : "测试按钮",
           "showCaption" : true
         } ],
         "getPSLayout" : {

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

@@ -937,7 +937,10 @@
         "name" : "grouppanel1",
         "getPSDEFormDetails" : [ {
           "actionType" : "UIACTION",
-          "caption" : "打开文档",
+          "getCapPSLanguageRes" : {
+            "lanResTag" : "OTHER.BUTTONTSET"
+          },
+          "caption" : "测试按钮",
           "codeName" : "button1",
           "detailStyle" : "DEFAULT",
           "detailType" : "BUTTON",
@@ -978,7 +981,7 @@
             "id" : "openDocument@IBIZBOOK"
           },
           "rTMOSFilePath" : "psdeformdetail_buttons/button1",
-          "tooltip" : "打开文档",
+          "tooltip" : "测试按钮",
           "showCaption" : true
         } ],
         "getPSLayout" : {

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

@@ -99,18 +99,6 @@
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
-    }, {
-      "caption" : "图书名称",
-      "codeName" : "ibizbookname",
-      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "ibizbookname",
-      "mOSFilePath" : "psdetreecols/ibizbookname",
-      "name" : "ibizbookname",
-      "rTMOSFilePath" : "psdetreecols/ibizbookname",
-      "width" : 50,
-      "widthUnit" : "px",
-      "enableExpand" : false,
-      "enableSort" : false
     }, {
       "caption" : "图书描述",
       "codeName" : "subtext",
@@ -123,6 +111,18 @@
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
+    }, {
+      "caption" : "图书名称",
+      "codeName" : "ibizbookname",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "ibizbookname",
+      "mOSFilePath" : "psdetreecols/ibizbookname",
+      "name" : "ibizbookname",
+      "rTMOSFilePath" : "psdetreecols/ibizbookname",
+      "width" : 50,
+      "widthUnit" : "px",
+      "enableExpand" : false,
+      "enableSort" : false
     } ],
     "getPSDETreeNodeRSs" : [ {
       "getChildPSDETreeNode" : {

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPLANS/EN.json

@@ -362,6 +362,9 @@
   }, {
     "content" : "View",
     "lanResTag" : "MENUITEM.CAPTION.VIEW"
+  }, {
+    "content" : "Test the multilingual button\n",
+    "lanResTag" : "OTHER.BUTTONTSET"
   }, {
     "content" : "Workflow",
     "lanResTag" : "MENUITEM.CAPTION.WORKFLOW"

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPLANS/ZH_CN.json

 {
   "getAllPSLanguageItems" : [ {
+    "content" : "测试多语言按钮",
+    "lanResTag" : "OTHER.BUTTONTSET"
+  }, {
     "content" : "工作台--",
     "lanResTag" : "MENUITEM.CAPTION.WORKBENCH"
   }, {

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

@@ -172,7 +172,7 @@
 
 
     <!--输出实体[IBIZBOOK]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-1310-7">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-1314-7">
         <createTable tableName="T_IBIZBOOK">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -528,7 +528,7 @@
 
 
     <!--输出实体[IBIZSAMPLE0001]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizsample0001-58-19">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizsample0001-65-19">
         <createTable tableName="T_IBIZSAMPLE0001">
                 <column name="FIELD01" remarks="" type="VARCHAR(100)">
                 </column>
@@ -1477,7 +1477,7 @@
         <!--输出实体[IBIZQJ]外键关系 -->
         <!--输出实体[IBIZSAMPLE]外键关系 -->
         <!--输出实体[IBIZSAMPLE0001]外键关系 -->
-    <changeSet author="a_LAB01_df847bdfd" id="fk-ibizsample0001-58-48">
+    <changeSet author="a_LAB01_df847bdfd" id="fk-ibizsample0001-65-48">
        <addForeignKeyConstraint baseColumnNames="IBIZSAMPLE0002ID" baseTableName="T_IBIZSAMPLE0001" constraintName="DER1N_IBIZSAMPLE0001_IBIZSAMPL" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="IBIZSAMPLE0002ID" referencedTableName="T_IBIZSAMPLE0002" validate="true"/>
     </changeSet>
         <!--输出实体[IBIZSAMPLE0002]外键关系 -->

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

@@ -67,7 +67,7 @@
          </createView>
      </changeSet>
         <!--输出实体[IBIZSAMPLE0001]视图结构信息 runOnChange="true"  当视图发生变更时，通过liquibase强刷prod的视图，实现视图的同步-->
-     <changeSet author="a_LAB01_df847bdfd" id="view-ibizsample0001-58-13" runOnChange="true">
+     <changeSet author="a_LAB01_df847bdfd" id="view-ibizsample0001-65-13" runOnChange="true">
          <createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZSAMPLE0001">
                <![CDATA[ SELECT t1.[CREATEDATE], t1.[CREATEMAN], t1.[FIELD01], t1.[FIELD02], t1.[FIELD05], t1.[FIELD06], t1.[FIELD07], t1.[FIELD08], t1.[FIELD09], t1.[FIELD10], t1.[FIELD11], t1.[FIELD12], t1.[FIELD13], t1.[FIELD14], t1.[FIELD15], t1.[FIELD16], t1.[FIELD17], t1.[FIELD18], t1.[FIELD19], t1.[FIELD20], t1.[FIELD21], t1.[FIELD22], t1.[FIELD23], t1.[FIELD24], t1.[FIELD25], t1.[FIELD26], t1.[FIELD27], t1.[IBIZSAMPLE0001ID], t1.[IBIZSAMPLE0001NAME], t1.[UPDATEDATE], t1.[UPDATEMAN] FROM [T_IBIZSAMPLE0001] t1  ]]>
          </createView>