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

app_Web/public/assets/json/view-message-group.json

@@ -32,6 +32,9 @@
 "VMGroup7":[
 {"tag":"ViewMsg7","position":"TOP","type":"ERROR"}
 ],
+"VMGroup24":[
+{"tag":"ViewMsg23","position":"TOP","type":"ERROR"}
+],
 "VMGroup23":[
 {"tag":"ViewMsg22","position":"TOP","type":"ERROR"}
 ],

app_Web/src/locale/lanres/entities/ibizbook/ibizbook_en_US.ts

@@ -628,6 +628,98 @@ export default {
 			tip: "Remove {0}",
 		},
 	},
+	usr2calendarviewcalendar_quicktoolbar_toolbar: {
+		tbitem3: {
+			caption: "New",
+			tip: "New",
+		},
+		deuiaction2: {
+			caption: "Save",
+			tip: "Save",
+		},
+		tbitem4: {
+			caption: "Edit",
+			tip: "Edit {0}",
+		},
+		tbitem6: {
+			caption: "Copy",
+			tip: "Copy {0}",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "Remove",
+			tip: "Remove {0}",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		deuiaction1: {
+			caption: "导入",
+			tip: "导入",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem16: {
+			caption: "其它",
+			tip: "其它",
+		},
+		tbitem21: {
+			caption: "Export Data Model",
+			tip: "导出数据模型",
+		},
+	},
+	usr2calendarviewcalendar_batchtoolbar_toolbar: {
+		tbitem3: {
+			caption: "New",
+			tip: "New",
+		},
+		deuiaction2: {
+			caption: "Save",
+			tip: "Save",
+		},
+		tbitem4: {
+			caption: "Edit",
+			tip: "Edit {0}",
+		},
+		tbitem6: {
+			caption: "Copy",
+			tip: "Copy {0}",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "Remove",
+			tip: "Remove {0}",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		deuiaction1: {
+			caption: "导入",
+			tip: "导入",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem16: {
+			caption: "其它",
+			tip: "其它",
+		},
+		tbitem21: {
+			caption: "Export Data Model",
+			tip: "导出数据模型",
+		},
+	},
 	autogrouplistviewtoolbar_toolbar: {
 	},
 	updatedefaultgridviewtoolbar_toolbar: {
@@ -956,6 +1048,19 @@ export default {
 	ibizbooktimeline_calendar: {
 		nodata:"",
 		uiactions: {
+        new: "New",
+        save: "Save",
+        edit: "Edit",
+        copy: "Copy",
+        togglefilter: "Filter",
+        togglerowedit: "行编辑",
+        newrow: "新建行",
+        remove: "Remove",
+        exportexcel: "Export",
+        importexcel: "导入",
+        print: "Print",
+        exportmodel: "Export Data Model",
+        import: "数据导入",
 		},
 	},
 	ibizbookmonth_calendar: {

app_Web/src/locale/lanres/entities/ibizbook/ibizbook_zh_CN.ts

@@ -627,6 +627,98 @@ export default {
 			tip: "删除",
 		},
 	},
+	usr2calendarviewcalendar_quicktoolbar_toolbar: {
+		tbitem3: {
+			caption: "新建",
+			tip: "新建",
+		},
+		deuiaction2: {
+			caption: "保存",
+			tip: "保存",
+		},
+		tbitem4: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		tbitem6: {
+			caption: "拷贝",
+			tip: "拷贝",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "删除",
+			tip: "删除",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		deuiaction1: {
+			caption: "导入",
+			tip: "导入",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem16: {
+			caption: "其它",
+			tip: "其它",
+		},
+		tbitem21: {
+			caption: "导出数据模型",
+			tip: "导出数据模型",
+		},
+	},
+	usr2calendarviewcalendar_batchtoolbar_toolbar: {
+		tbitem3: {
+			caption: "新建",
+			tip: "新建",
+		},
+		deuiaction2: {
+			caption: "保存",
+			tip: "保存",
+		},
+		tbitem4: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		tbitem6: {
+			caption: "拷贝",
+			tip: "拷贝",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "删除",
+			tip: "删除",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		deuiaction1: {
+			caption: "导入",
+			tip: "导入",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem16: {
+			caption: "其它",
+			tip: "其它",
+		},
+		tbitem21: {
+			caption: "导出数据模型",
+			tip: "导出数据模型",
+		},
+	},
 	autogrouplistviewtoolbar_toolbar: {
 	},
 	updatedefaultgridviewtoolbar_toolbar: {
@@ -955,6 +1047,19 @@ export default {
 	ibizbooktimeline_calendar: {
 		nodata:"",
 		uiactions: {
+			new: "新建",
+			save: "保存",
+			edit: "编辑",
+			copy: "拷贝",
+			togglefilter: "过滤",
+			togglerowedit: "行编辑",
+			newrow: "新建行",
+			remove: "删除",
+			exportexcel: "导出",
+			importexcel: "导入",
+			print: "打印",
+			exportmodel: "导出数据模型",
+			import: "数据导入",
 		},
 	},
 	ibizbookmonth_calendar: {

app_Web/src/message/message-service-register.ts

@@ -43,6 +43,7 @@ export class MessageServiceRegister {
         this.allMessageService.set('ViewMsg22', () => import('@/message/view-msg22/view-msg22-message'));
         this.allMessageService.set('ViewMsg2', () => import('@/message/view-msg2/view-msg2-message'));
         this.allMessageService.set('ViewMsg10', () => import('@/message/view-msg10/view-msg10-message'));
+        this.allMessageService.set('ViewMsg23', () => import('@/message/view-msg23/view-msg23-message'));
         this.allMessageService.set('ViewMsg7', () => import('@/message/view-msg7/view-msg7-message'));
         this.allMessageService.set('DataViewDar', () => import('@/message/data-view-dar/data-view-dar-message'));
         this.allMessageService.set('ViewMsg17', () => import('@/message/view-msg17/view-msg17-message'));

app_Web/src/message/view-msg23/view-msg23-message-base.ts

+import ViewMessageService from '../view-message-service';
+/**
+ * 表单动态空输入视图消息服务对象基类
+ *
+ * @export
+ * @class ViewMsg23MessageServiceBase
+ */
+export default class ViewMsg23MessageServiceBase extends ViewMessageService {
+
+
+    /**
+     * Creates an instance of  ViewMsg23MessageServiceBase.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  ViewMsg23MessageServiceBase
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+    /**
+     * 初始化基础参数
+     * 
+     * @memberof ViewMsg23MessageServiceBase
+     */
+    public initBasicParam(){
+        this.id = "3109196C-82EC-4A49-9867-9F949CF22A32";
+        this.name = "表单动态空输入";
+        this.codename = "ViewMsg23";
+        this.title = "";
+        this.content = "表单动态空输入：开关打开时，关闭必填";
+        this.closeMode = 0;
+        this.position = "TOP";
+        this.type = "error";
+        this.isEnableRemove = false;
+        this.order = 1;
+        this.dynamicMode = "STATIC";
+        this.hasMessageTemp = false;
+        this.messageType = "TEXT";
+    }
+
+    /**
+     * 转化消息模板标题和内容
+     *      
+     * @target {*} target 返回目标数据
+     * @param {*} context 应用上下文
+     * @param {*} viewparam 视图参数
+     * @param {*} item 源数据
+     * 
+     * @memberof ViewMsg23MessageServiceBase
+     */
+    public translateMessageTemp(target:any,context:any,viewparam:any,item?:any){
+        if(this.hasMessageTemp && Object.is(this.messageType,"HTML")){
+            Object.assign(target,{title:``});
+            Object.assign(target,{content:``});
+        }
+        if(this.hasMessageTemp && Object.is(this.messageType,"TEXT")){
+            Object.assign(target,{title:""});
+            Object.assign(target,{content:""});
+        }
+    }
+
+}
\ No newline at end of file

app_Web/src/message/view-msg23/view-msg23-message.ts

+import ViewMsg23MessageServiceBase from './view-msg23-message-base';
+
+/**
+ * 表单动态空输入视图消息服务对象
+ *
+ * @export
+ * @class ViewMsg23MessageService
+ */
+export default class ViewMsg23MessageService extends ViewMsg23MessageServiceBase {
+
+    /**
+     * Creates an instance of  ViewMsg23MessageService.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  ViewMsg23MessageService
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+}
\ No newline at end of file

app_Web/src/mock/viewconfig/viewconfig.ts

@@ -1247,6 +1247,9 @@ mock.onGet('./assets/json/view-message-group.json').reply((config: any) => {
         "VMGroup7":[
         {"tag":"ViewMsg7","position":"TOP","type":"ERROR"}
         ],
+        "VMGroup24":[
+        {"tag":"ViewMsg23","position":"TOP","type":"ERROR"}
+        ],
         "VMGroup23":[
         {"tag":"ViewMsg22","position":"TOP","type":"ERROR"}
         ],

app_Web/src/pages/sample/ibizbookcalendar-view/ibizbookcalendar-view-base.vue

@@ -11,6 +11,42 @@
         </div>
         <div class='content-container'>
 
+<div style="margin-bottom:6px;">
+    <div class="quick-search-container">
+    <view_quicksearchform 
+    :viewState="viewState"  
+    :viewparams="viewparams" 
+    :context="context" 
+    :showBusyIndicator="true"
+    v-show="true"
+    loaddraftAction="FilterGetDraft"
+    loadAction="FilterGet"
+@valuechange="quickFormValueChange"
+    @search="searchform_search($event)"  
+    @load="searchform_load($event)"  
+    name="quicksearchform"  
+    ref='quicksearchform' 
+    @closeview="closeView($event)">
+</view_quicksearchform>
+    </div>
+    <div class='pull-right'>
+    </div>
+</div>
+<view_searchform 
+    :viewState="viewState"  
+    :viewparams="viewparams" 
+    :context="context" 
+    :showBusyIndicator="true"
+    v-show="isExpandSearchForm"
+    loaddraftAction="FilterGetDraft"
+    loadAction="FilterGet"
+
+    @search="searchform_search($event)"  
+    @load="searchform_load($event)"  
+    name="searchform"  
+    ref='searchform' 
+    @closeview="closeView($event)">
+</view_searchform>
         <div class='view-body-messages'>
         </div>
 <view_calendar 
@@ -202,6 +238,8 @@ export default class IBIZBOOKCalendarViewBase extends Vue {
      * @memberof IBIZBOOKCalendarViewBase
      */
     public containerModel: any = {
+        view_quicksearchform: { name: 'quicksearchform', type: 'SEARCHFORM' },
+        view_searchform: { name: 'searchform', type: 'SEARCHFORM' },
         view_calendar: { name: 'calendar', type: 'CALENDAR' },
     };
 
@@ -730,6 +768,23 @@ export default class IBIZBOOKCalendarViewBase extends Vue {
 
 
 
+    /**
+     * 快速搜索栏数据对象
+     *
+     * @memberof IBIZBOOKCalendarViewBase
+     */
+    public quickFormData:any;
+
+    /**
+     * 快速搜索栏值变化
+     *
+     * @memberof IBIZBOOKCalendarViewBase
+     */
+    public quickFormValueChange($event:any){
+        this.quickFormData = $event;
+        this.onSearch($event);
+    }
+
 }
 </script>
 

app_Web/src/pages/sample/ibizbookcalendar-view/ibizbookcalendar-view.vue

@@ -2,9 +2,13 @@
 import { Component } from 'vue-property-decorator';
 import IBIZBOOKCalendarViewBase from './ibizbookcalendar-view-base.vue';
 
+import view_quicksearchform from '@widgets/ibizbook/quicksearchform-searchform/quicksearchform-searchform.vue';
+import view_searchform from '@widgets/ibizbook/default-searchform/default-searchform.vue';
 import view_calendar from '@widgets/ibizbook/ibizbookmonth-calendar/ibizbookmonth-calendar.vue';
 @Component({
     components: {
+        view_quicksearchform, 
+        view_searchform, 
         view_calendar, 
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {

app_Web/src/pages/sample/ibizorder-f9-edit-view/ibizorder-f9-edit-view-base.vue

@@ -8,10 +8,10 @@
 </div>
 
         <div class='view-top-messages'>
-        </div>
+        <app-alert-group position='TOP' :context="context" :viewparam="viewparams" infoGroup='VMGroup24' viewname='ibizorderf9editview'></app-alert-group>        </div>
         <div class="content-container">
         <div class='view-body-messages'>
-        </div>
+        <app-alert-group position='BODY' :context="context" :viewparam="viewparams" infoGroup='VMGroup24' viewname='ibizorderf9editview'></app-alert-group>        </div>
         <view_form 
             :viewState="viewState"  
             :viewparams="viewparams" 
@@ -36,7 +36,7 @@
         </view_form>
         </div>
         <div class='view-bottom-messages'>
-        </div>
+        <app-alert-group position='BOTTOM' :context="context" :viewparam="viewparams" infoGroup='VMGroup24' viewname='ibizorderf9editview'></app-alert-group>        </div>
     </card>
 </div>
 </template>

app_Web/src/widgets/ibizbook/ibizbookmonth-calendar/ibizbookmonth-calendar-model.ts

@@ -22,6 +22,17 @@ export default class IBIZBOOKMONTHModel {
 	 */
 	public getDataItems(): any[] {
      let dataItems: any = [
+      {
+        name: 'n_ibizbookname_like',
+        prop: 'n_ibizbookname_like',
+        dataType: 'QUERYPARAM'
+      },
+      {
+        name: 'n_price_gtandeq',
+        prop: 'n_price_gtandeq',
+        dataType: 'QUERYPARAM'
+      },
+
           // 前端新增修改标识，新增为"0",修改为"1"或未设值
           {
             name: 'srffrontuf',

app_Web/src/widgets/ibizbook/ibizbooktimeline-calendar/ibizbooktimeline-calendar.less

 // this is less
+.deepskyblueToolBar {color:white !important;background-color:#108cee !important;}
 @import '~@fullcalendar/core/main.css';
 @import '~@fullcalendar/daygrid/main.css';
 @import '~@fullcalendar/timegrid/main.css';

app_Web/src/widgets/ibizbook/internal-func-grid/internal-func-grid-base.vue

@@ -1068,16 +1068,16 @@ export default class InternalFuncBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }

app_Web/src/widgets/ibizbook/main2-grid/main2-grid-base.vue

@@ -1079,16 +1079,16 @@ export default class Main2Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }

app_Web/src/widgets/ibizbook/main3-grid/main3-grid-base.vue

@@ -1079,16 +1079,16 @@ export default class Main3Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }

app_Web/src/widgets/ibizbook/main4-grid/main4-grid-base.vue

@@ -1070,16 +1070,16 @@ export default class Main4Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }

app_Web/src/widgets/ibizbook/main5-grid/main5-grid-base.vue

@@ -1086,16 +1086,16 @@ export default class Main5Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }

app_Web/src/widgets/ibizbook/new-default-grid/new-default-grid-base.vue

@@ -1206,16 +1206,16 @@ export default class NewDefaultBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }

app_Web/src/widgets/ibizbook/row-edit-grid/row-edit-grid-base.vue

@@ -1281,16 +1281,16 @@ export default class RowEditBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }

app_Web/src/widgets/ibizbook/row-rules-grid/row-rules-grid-base.vue

@@ -1236,16 +1236,16 @@ export default class RowRulesBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }

app_Web/src/widgets/ibizbook/update-default-grid/update-default-grid-base.vue

@@ -1206,16 +1206,16 @@ export default class UpdateDefaultBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
             }
         }

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

@@ -1070,9 +1070,9 @@ export default class MainBase extends Vue implements ControlInterface {
             serviceName:'ibizorder',
             appDeLogicName:'订单',
             importData:{
-            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
             "ORDERTYPE":{"codelist":{"type":"DYNAMIC","tag":"ORDERTYPE","isnumber":false},"headername":"订单类型","isuniqueitem":false,"name":"ordertype","order":1000},
             "ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000},
+            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
             "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
             }
         }

app_Web/src/widgets/ibizorder/uipart-0010-form/uipart-0010-form-base.vue

@@ -2,7 +2,7 @@
     <i-form :model="this.data" class='app-form' ref='form'  id='ibizorder_uipart_0010' style="" @on-validate="formItemValidate">
     <input style="display:none;" />
     <row >
-            <i-col v-show="detailsModel.group1.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }">
+            <i-col v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-group :uiService="appUIService" :data="transformData(data)" :manageContainerStatus="detailsModel.group1.manageContainerStatus"  :isManageContainer="detailsModel.group1.isManageContainer" @managecontainerclick="manageContainerClick('group1')" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.ibizorder.uipart_0010_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
     <row>
         <i-col v-show="detailsModel.orderuid.visible" :style="{}"  :sm="{ span: 6, offset: 0 }" :md="{ span: 6, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 12, offset: 0 }">

app_Web/src/widgets/ibizorder/uipart-0015-grid/uipart-0015-grid-base.vue

@@ -1066,9 +1066,9 @@ export default class UIPART_0015Base extends Vue implements ControlInterface {
             serviceName:'ibizorder',
             appDeLogicName:'订单',
             importData:{
-            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
             "ORDERTYPE":{"codelist":{"type":"DYNAMIC","tag":"ORDERTYPE","isnumber":false},"headername":"订单类型","isuniqueitem":false,"name":"ordertype","order":1000},
             "ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000},
+            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
             "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
             }
         }

app_Web/src/widgets/ibizorder/uipart-0017-grid/uipart-0017-grid-base.vue

@@ -1189,9 +1189,9 @@ export default class UIPART_0017Base extends Vue implements ControlInterface {
             serviceName:'ibizorder',
             appDeLogicName:'订单',
             importData:{
-            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
             "ORDERTYPE":{"codelist":{"type":"DYNAMIC","tag":"ORDERTYPE","isnumber":false},"headername":"订单类型","isuniqueitem":false,"name":"ordertype","order":1000},
             "ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000},
+            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
             "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
             }
         }

app_Web/src/widgets/ibizorder/uipart-0018-grid/uipart-0018-grid-base.vue

@@ -1121,9 +1121,9 @@ export default class UIPART_0018Base extends Vue implements ControlInterface {
             serviceName:'ibizorder',
             appDeLogicName:'订单',
             importData:{
-            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
             "ORDERTYPE":{"codelist":{"type":"DYNAMIC","tag":"ORDERTYPE","isnumber":false},"headername":"订单类型","isuniqueitem":false,"name":"ordertype","order":1000},
             "ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000},
+            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
             "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
             }
         }

demo-core/src/main/java/cn/ibizlab/core/sample/mapping/IBIZBOOKDataImport.java

@@ -8,16 +8,16 @@ import java.util.List;
 public interface IBIZBOOKDataImport {
     @Mappings({
         @Mapping(target = "ibizbookid", source = "ibizbookid"),
-        @Mapping(target = "ibizbookname", source = "ibizbookname"),
-        @Mapping(target = "updateman", source = "updateman"),
+        @Mapping(target = "updatedate", source = "updatedate"),
         @Mapping(target = "press", source = "press"),
         @Mapping(target = "author", source = "author"),
         @Mapping(target = "price", source = "price"),
-        @Mapping(target = "updatedate", source = "updatedate"),
         @Mapping(target = "booknumber", source = "booknumber"),
-        @Mapping(target = "createman", source = "createman"),
         @Mapping(target = "type", source = "type"),
+        @Mapping(target = "createman", source = "createman"),
         @Mapping(target = "createdate", source = "createdate"),
+        @Mapping(target = "ibizbookname", source = "ibizbookname"),
+        @Mapping(target = "updateman", source = "updateman"),
     })
     @BeanMapping(ignoreByDefault = true)
     IBIZBOOK toDomain(IBIZBOOK entity);

demo-core/src/main/java/cn/ibizlab/core/sample/mapping/IBIZOrderImport.java

@@ -8,10 +8,10 @@ import java.util.List;
 public interface IBIZOrderImport {
     @Mappings({
         @Mapping(target = "ibizorderid", source = "ibizorderid"),
-        @Mapping(target = "ibizordername", source = "ibizordername"),
+        @Mapping(target = "orderuid", source = "orderuid"),
         @Mapping(target = "ordertype", source = "ordertype"),
+        @Mapping(target = "ibizordername", source = "ibizordername"),
         @Mapping(target = "ordertime", source = "ordertime"),
-        @Mapping(target = "orderuid", source = "orderuid"),
     })
     @BeanMapping(ignoreByDefault = true)
     IBIZOrder toDomain(IBIZOrder entity);

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

@@ -28,7 +28,7 @@
 
 
     <!--输出实体[IBIZBOOK]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-358-2">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-360-2">
         <createTable tableName="T_IBIZBOOK">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -172,7 +172,7 @@
 
 
     <!--输出实体[IBIZORDER]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizorder-121-9">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizorder-137-9">
         <createTable tableName="T_IBIZORDER">
                 <column name="TP" remarks="" type="TEXT(1048576)">
                 </column>
@@ -222,7 +222,7 @@
 
 
     <!--输出实体[IBIZORDERDETAIL]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizorderdetail-19-10">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizorderdetail-21-10">
         <createTable tableName="T_IBIZORDERDETAIL">
                 <column name="IBIZORDERDETAILNAME" remarks="" type="VARCHAR(200)">
                 </column>

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

@@ -37,13 +37,13 @@
          </createView>
      </changeSet>
         <!--输出实体[IBIZORDER]视图结构信息 runOnChange="true"  当视图发生变更时，通过liquibase强刷prod的视图，实现视图的同步-->
-     <changeSet author="a_LAB01_df847bdfd" id="view-ibizorder-121-8" runOnChange="true">
+     <changeSet author="a_LAB01_df847bdfd" id="view-ibizorder-137-8" runOnChange="true">
          <createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZORDER">
                <![CDATA[ SELECT t1.[AMOUNT], t1.[CREATEDATE], t1.[CREATEMAN], t1.[DETAILNUM], t1.[IBIZCUSTOMERID], t11.[IBIZCUSTOMERNAME], t1.[IBIZORDERID], t1.[IBIZORDERNAME], t1.[MEMO], t1.[ORDERSTATE], t1.[ORDERTIME], t1.[ORDERTYPE], t1.[ORDERUID], t1.[UPDATEDATE], t1.[UPDATEMAN], t1.[WFINSTANCEID], t1.[WFSTATE], t1.[WFSTEP] FROM [T_IBIZORDER] t1  LEFT JOIN T_IBIZCUSTOMER t11 ON t1.IBIZCUSTOMERID = t11.IBIZCUSTOMERID  ]]>
          </createView>
      </changeSet>
         <!--输出实体[IBIZORDERDETAIL]视图结构信息 runOnChange="true"  当视图发生变更时，通过liquibase强刷prod的视图，实现视图的同步-->
-     <changeSet author="a_LAB01_df847bdfd" id="view-ibizorderdetail-19-9" runOnChange="true">
+     <changeSet author="a_LAB01_df847bdfd" id="view-ibizorderdetail-21-9" runOnChange="true">
          <createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZORDERDETAIL">
                <![CDATA[ SELECT t1.[QUANTITY]*t11.[UNITPRICE] AS [AMOUNT], t1.[CREATEDATE], t1.[CREATEMAN], t1.[IBIZORDERDETAILA], t1.[IBIZORDERDETAILID], t1.[IBIZORDERDETAILNAME], t1.[IBIZORDERID], t21.[IBIZORDERNAME], t1.[IBIZUNIPRODUCTID], t11.[IBIZUNIPRODUCTNAME], t21.[ORDERUID], t1.[QUANTITY], t11.[UNIT], t11.[UNITPRICE], t1.[UPDATEDATE], t1.[UPDATEMAN] FROM [T_IBIZORDERDETAIL] t1  LEFT JOIN T_IBIZUNIPRODUCT t11 ON t1.IBIZUNIPRODUCTID = t11.IBIZUNIPRODUCTID  LEFT JOIN T_IBIZORDER t21 ON t1.IBIZORDERID = t21.IBIZORDERID  ]]>
          </createView>