ShineKOT 部署微服务应用 [后台服务，演示应用]

d121d9d6 · ibizdev · a2a2f173 · d121d9d6 · d121d9d6 · d121d9d6
--- a/app_Web/src/locale/lanres/entities/ibizappview/ibizappview_en_US.ts
+++ b/app_Web/src/locale/lanres/entities/ibizappview/ibizappview_en_US.ts
@@ -70,8 +70,8 @@ export default {
 	viewlist_list: {
 		nodata:"",
 		uiactions: {
-        ibizappview_openinstance: "打开示例",
        ibizappview_opendocument: "打开文档",
+        ibizappview_openinstance: "打开示例",
 		},
 	},
 	viewchart_chart: {

--- a/app_Web/src/locale/lanres/entities/ibizappview/ibizappview_zh_CN.ts
+++ b/app_Web/src/locale/lanres/entities/ibizappview/ibizappview_zh_CN.ts
@@ -69,8 +69,8 @@ export default {
 	viewlist_list: {
 		nodata:"",
 		uiactions: {
-			ibizappview_openinstance: "打开示例",
 			ibizappview_opendocument: "打开文档",
+			ibizappview_openinstance: "打开示例",
 		},
 	},
 	viewchart_chart: {

--- a/app_Web/src/widgets/ibizappview/view-list-list/view-list-list-base.vue
+++ b/app_Web/src/widgets/ibizappview/view-list-list/view-list-list-base.vue
@@ -148,7 +148,7 @@ export default class ViewListBase extends Vue implements ControlInterface {
     * @param {*} [$event]
     * @memberof 
     */
-    public list_operation_ued88b09_click(params: any = {}, tag?: any, $event?: any) {
+    public list_operation_u59112f7_click(params: any = {}, tag?: any, $event?: any) {
        // 取数
        let datas: any[] = [];
        let xData: any = null;
@@ -165,7 +165,7 @@ export default class ViewListBase extends Vue implements ControlInterface {
        }
        // 界面行为
        const curUIService:IBIZAPPVIEWUIService  = new IBIZAPPVIEWUIService();
-        curUIService.IBIZAPPVIEW_openInstance(datas,contextJO, paramJO,  $event, xData,this,"IBIZAPPVIEW");
+        curUIService.IBIZAPPVIEW_openDocument(datas,contextJO, paramJO,  $event, xData,this,"IBIZAPPVIEW");
    }

    /**
@@ -176,7 +176,7 @@ export default class ViewListBase extends Vue implements ControlInterface {
     * @param {*} [$event]
     * @memberof 
     */
-    public list_operation_u59112f7_click(params: any = {}, tag?: any, $event?: any) {
+    public list_operation_ued88b09_click(params: any = {}, tag?: any, $event?: any) {
        // 取数
        let datas: any[] = [];
        let xData: any = null;
@@ -193,7 +193,7 @@ export default class ViewListBase extends Vue implements ControlInterface {
        }
        // 界面行为
        const curUIService:IBIZAPPVIEWUIService  = new IBIZAPPVIEWUIService();
-        curUIService.IBIZAPPVIEW_openDocument(datas,contextJO, paramJO,  $event, xData,this,"IBIZAPPVIEW");
+        curUIService.IBIZAPPVIEW_openInstance(datas,contextJO, paramJO,  $event, xData,this,"IBIZAPPVIEW");
    }


@@ -865,8 +865,8 @@ export default class ViewListBase extends Vue implements ControlInterface {
     * @memberof ViewListBase
     */ 
    public actionModel:any ={
-         "openInstance":{name:"openInstance",icon:"",caption:"打开示例",disabled: false, visabled: true,noprivdisplaymode:2,dataaccaction: "", actiontarget: "SINGLEKEY"},
         "openDocument":{name:"openDocument",icon:"",caption:"打开文档",disabled: false, visabled: true,noprivdisplaymode:2,dataaccaction: "", actiontarget: "SINGLEKEY"},
+         "openInstance":{name:"openInstance",icon:"",caption:"打开示例",disabled: false, visabled: true,noprivdisplaymode:2,dataaccaction: "", actiontarget: "SINGLEKEY"},
    };

    /**
@@ -879,12 +879,12 @@ export default class ViewListBase extends Vue implements ControlInterface {
     */
 	public uiAction(data: any, tag: any, $event: any) {
        $event.stopPropagation();
-        if(Object.is('openInstance', tag)) {
-            this.list_operation_ued88b09_click(data, tag, $event);
-        }
        if(Object.is('openDocument', tag)) {
            this.list_operation_u59112f7_click(data, tag, $event);
        }
+        if(Object.is('openInstance', tag)) {
+            this.list_operation_ued88b09_click(data, tag, $event);
+        }
    }

 }

--- a/app_Web/src/widgets/ibizbook/gridexpbar-grid-grid/gridexpbar-grid-grid-base.vue
+++ b/app_Web/src/widgets/ibizbook/gridexpbar-grid-grid/gridexpbar-grid-grid-base.vue
@@ -930,17 +930,17 @@ export default class Gridexpbar_gridBase extends Vue implements ControlInterface
            serviceName:'ibizbook',
            appDeLogicName:'图书',
            importData:{
-            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000}
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000}
            }
        }
        if(Object.keys(importDataModel).length == 0){

--- a/app_Web/src/widgets/ibizbook/internal-func-grid/internal-func-grid-base.vue
+++ b/app_Web/src/widgets/ibizbook/internal-func-grid/internal-func-grid-base.vue
@@ -1201,17 +1201,17 @@ export default class InternalFuncBase extends Vue implements ControlInterface {
            serviceName:'ibizbook',
            appDeLogicName:'图书',
            importData:{
-            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000}
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000}
            }
        }
        if(Object.keys(importDataModel).length == 0){

--- a/app_Web/src/widgets/ibizbook/main2-grid/main2-grid-base.vue
+++ b/app_Web/src/widgets/ibizbook/main2-grid/main2-grid-base.vue
@@ -1081,17 +1081,17 @@ export default class Main2Base extends Vue implements ControlInterface {
            serviceName:'ibizbook',
            appDeLogicName:'图书',
            importData:{
-            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000}
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000}
            }
        }
        if(Object.keys(importDataModel).length == 0){

--- a/app_Web/src/widgets/ibizbook/main3-grid/main3-grid-base.vue
+++ b/app_Web/src/widgets/ibizbook/main3-grid/main3-grid-base.vue
@@ -1081,17 +1081,17 @@ export default class Main3Base extends Vue implements ControlInterface {
            serviceName:'ibizbook',
            appDeLogicName:'图书',
            importData:{
-            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000}
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000}
            }
        }
        if(Object.keys(importDataModel).length == 0){

--- a/app_Web/src/widgets/ibizbook/main4-grid/main4-grid-base.vue
+++ b/app_Web/src/widgets/ibizbook/main4-grid/main4-grid-base.vue
@@ -1072,17 +1072,17 @@ export default class Main4Base extends Vue implements ControlInterface {
            serviceName:'ibizbook',
            appDeLogicName:'图书',
            importData:{
-            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000}
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000}
            }
        }
        if(Object.keys(importDataModel).length == 0){

--- a/app_Web/src/widgets/ibizbook/main5-grid/main5-grid-base.vue
+++ b/app_Web/src/widgets/ibizbook/main5-grid/main5-grid-base.vue
@@ -1088,17 +1088,17 @@ export default class Main5Base extends Vue implements ControlInterface {
            serviceName:'ibizbook',
            appDeLogicName:'图书',
            importData:{
-            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000}
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000}
            }
        }
        if(Object.keys(importDataModel).length == 0){

--- a/app_Web/src/widgets/ibizbook/main6-grid/main6-grid-base.vue
+++ b/app_Web/src/widgets/ibizbook/main6-grid/main6-grid-base.vue
@@ -1287,17 +1287,17 @@ export default class Main6Base extends Vue implements ControlInterface {
            serviceName:'ibizbook',
            appDeLogicName:'图书',
            importData:{
-            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000}
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000}
            }
        }
        if(Object.keys(importDataModel).length == 0){

--- a/app_Web/src/widgets/ibizbook/main7-grid/main7-grid-base.vue
+++ b/app_Web/src/widgets/ibizbook/main7-grid/main7-grid-base.vue
@@ -1158,17 +1158,17 @@ export default class Main7Base extends Vue implements ControlInterface {
            serviceName:'ibizbook',
            appDeLogicName:'图书',
            importData:{
-            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000}
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000}
            }
        }
        if(Object.keys(importDataModel).length == 0){

--- a/app_Web/src/widgets/ibizbook/new-default-grid/new-default-grid-base.vue
+++ b/app_Web/src/widgets/ibizbook/new-default-grid/new-default-grid-base.vue
@@ -1206,17 +1206,17 @@ export default class NewDefaultBase extends Vue implements ControlInterface {
            serviceName:'ibizbook',
            appDeLogicName:'图书',
            importData:{
-            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000}
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000}
            }
        }
        if(Object.keys(importDataModel).length == 0){

--- a/app_Web/src/widgets/ibizbook/row-edit-grid/row-edit-grid-base.vue
+++ b/app_Web/src/widgets/ibizbook/row-edit-grid/row-edit-grid-base.vue
@@ -1287,17 +1287,17 @@ export default class RowEditBase extends Vue implements ControlInterface {
            serviceName:'ibizbook',
            appDeLogicName:'图书',
            importData:{
-            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000}
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000}
            }
        }
        if(Object.keys(importDataModel).length == 0){

--- a/app_Web/src/widgets/ibizbook/row-rules-grid/row-rules-grid-base.vue
+++ b/app_Web/src/widgets/ibizbook/row-rules-grid/row-rules-grid-base.vue
@@ -1183,17 +1183,17 @@ export default class RowRulesBase extends Vue implements ControlInterface {
            serviceName:'ibizbook',
            appDeLogicName:'图书',
            importData:{
-            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000}
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000}
            }
        }
        if(Object.keys(importDataModel).length == 0){

--- a/app_Web/src/widgets/ibizbook/tree-table-treegridex/tree-table-treegridex-base.vue
+++ b/app_Web/src/widgets/ibizbook/tree-table-treegridex/tree-table-treegridex-base.vue
@@ -15,6 +15,11 @@
        <template slot="empty">
            {{$t('entities.ibizbook.treetable_treegridex.nodata')}}
        </template>
+        <el-table-column show-overflow-tooltip prop="subtext" label="图书描述" :width="50"  :align="''">
+        <template v-slot="{ row }">
+            <span>{{ getColumnValue(row, 'subtext') }}</span>
+        </template>
+        </el-table-column>
        <el-table-column show-overflow-tooltip prop="ibizbookname" label="图书名称" :width="50"  :align="''">
        <template v-slot="{ row }">
            <span>{{ getColumnValue(row, 'ibizbookname') }}</span>
@@ -25,11 +30,6 @@
            <span>{{ getColumnValue(row, 'author') }}</span>
        </template>
        </el-table-column>
-        <el-table-column show-overflow-tooltip prop="subtext" label="图书描述" :width="50"  :align="''">
-        <template v-slot="{ row }">
-            <span>{{ getColumnValue(row, 'subtext') }}</span>
-        </template>
-        </el-table-column>
    </el-table>
 </template>


--- a/app_Web/src/widgets/ibizbook/update-default-grid/update-default-grid-base.vue
+++ b/app_Web/src/widgets/ibizbook/update-default-grid/update-default-grid-base.vue
@@ -1206,17 +1206,17 @@ export default class UpdateDefaultBase extends Vue implements ControlInterface {
            serviceName:'ibizbook',
            appDeLogicName:'图书',
            importData:{
-            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000}
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000}
            }
        }
        if(Object.keys(importDataModel).length == 0){

--- a/app_Web/src/widgets/ibizbook/usr-gantt/usr-gantt-base.vue
+++ b/app_Web/src/widgets/ibizbook/usr-gantt/usr-gantt-base.vue
@@ -237,14 +237,6 @@ export default class UsrBase extends Vue implements ControlInterface {
            },
            labelField: 'text',
            columns: [
-                {
-                    label: '归还日期',
-                    value: 'returntime',
-                    render: (task: any) => {
-                        return this.getColumnValue(task, 'returntime')
-                    },
-                    width: 200,
-                },
                {
                    label: '图书名称',
                    value: 'ibizbookname',
@@ -261,6 +253,14 @@ export default class UsrBase extends Vue implements ControlInterface {
                    },
                    width: 200,
                },
+                {
+                    label: '归还日期',
+                    value: 'returntime',
+                    render: (task: any) => {
+                        return this.getColumnValue(task, 'returntime')
+                    },
+                    width: 200,
+                },
                {
                    label: '作者',
                    value: 'author',

--- a/app_Web/src/widgets/ibizorder/main-grid/main-grid-base.vue
+++ b/app_Web/src/widgets/ibizorder/main-grid/main-grid-base.vue
@@ -1114,10 +1114,10 @@ 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},
-            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
+            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000},
+            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000}
            }
        }
        if(Object.keys(importDataModel).length == 0){

--- a/app_Web/src/widgets/ibizorder/main2-grid/main2-grid-base.vue
+++ b/app_Web/src/widgets/ibizorder/main2-grid/main2-grid-base.vue
@@ -1030,10 +1030,10 @@ export default class Main2Base 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},
-            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
+            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000},
+            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000}
            }
        }
        if(Object.keys(importDataModel).length == 0){

--- a/app_Web/src/widgets/ibizorder/uipart-0015-grid/uipart-0015-grid-base.vue
+++ b/app_Web/src/widgets/ibizorder/uipart-0015-grid/uipart-0015-grid-base.vue
@@ -1066,10 +1066,10 @@ 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},
-            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
+            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000},
+            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000}
            }
        }
        if(Object.keys(importDataModel).length == 0){

--- a/app_Web/src/widgets/ibizorder/uipart-0017-grid/uipart-0017-grid-base.vue
+++ b/app_Web/src/widgets/ibizorder/uipart-0017-grid/uipart-0017-grid-base.vue
@@ -1189,10 +1189,10 @@ 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},
-            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
+            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000},
+            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000}
            }
        }
        if(Object.keys(importDataModel).length == 0){

--- a/app_Web/src/widgets/ibizorder/uipart-0018-grid/uipart-0018-grid-base.vue
+++ b/app_Web/src/widgets/ibizorder/uipart-0018-grid/uipart-0018-grid-base.vue
@@ -1121,10 +1121,10 @@ 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},
-            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
+            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000},
+            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000}
            }
        }
        if(Object.keys(importDataModel).length == 0){

--- a/config.xml
+++ b/config.xml
@@ -37,11 +37,11 @@
 	  git clone -b master $para2 demosys/
      export NODE_OPTIONS=--max-old-space-size=4096
      cd demosys/
-      mvn clean package -Pdemoapi
-      cd demo-provider/demo-provider-demoapi
-      mvn -Pdemoapi docker:build
-      mvn -Pdemoapi docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/demo-provider-demoapi.yaml iBizDemo --with-registry-auth      
+      mvn clean package -Pweb
+      cd demo-app/demo-app-web
+      mvn -Pweb docker:build
+      mvn -Pweb docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/demo-app-web.yaml iBizDemo --with-registry-auth
      </command>
    </hudson.tasks.Shell>
  </builders>

--- a/demo-app/demo-app-web/src/main/docker/Dockerfile
+++ b/demo-app/demo-app-web/src/main/docker/Dockerfile
@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
    sleep ${IBIZ_SLEEP} && \
    java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /demo-app-web.jar

-EXPOSE 8080
+EXPOSE 51001

 ADD demo-app-web.jar /demo-app-web.jar
--- a/demo-app/demo-app-web/src/main/docker/demo-app-web.yaml
+++ b/demo-app/demo-app-web/src/main/docker/demo-app-web.yaml
@@ -3,9 +3,24 @@ services:
  demo-app-web:
    image: registry.cn-shanghai.aliyuncs.com/ibizsys/demo-app-web:latest
    ports:
-      - "8080:8080"
+      - "51001:51001"
    networks:
      - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
+      - SERVER_PORT=51001
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
+      - SPRING_REDIS_HOST=172.16.240.110
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_LAB01_df847bdfd
+      - SPRING_DATASOURCE_PASSWORD=3d6@460A
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_df847bdfd?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_df847bdfd
+      - NACOS=172.16.240.110:8848
+      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
+      - SEATA_ENABLED=true
    deploy:
      resources:
           limits:

--- a/demo-provider/demo-provider-demoapi/src/main/docker/Dockerfile
+++ b/demo-provider/demo-provider-demoapi/src/main/docker/Dockerfile
@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
    sleep ${IBIZ_SLEEP} && \
    java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /demo-provider-demoapi.jar

-EXPOSE 51000
+EXPOSE 8081

 ADD demo-provider-demoapi.jar /demo-provider-demoapi.jar
--- a/demo-provider/demo-provider-demoapi/src/main/docker/demo-provider-demoapi.yaml
+++ b/demo-provider/demo-provider-demoapi/src/main/docker/demo-provider-demoapi.yaml
@@ -3,24 +3,9 @@ services:
  demo-provider-demoapi:
    image: registry.cn-shanghai.aliyuncs.com/ibizsys/demo-provider-demoapi:latest
    ports:
-      - "51000:51000"
+      - "8081:8081"
    networks:
      - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=51000
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-      - SPRING_REDIS_HOST=172.16.240.110
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_df847bdfd
-      - SPRING_DATASOURCE_PASSWORD=3d6@460A
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_df847bdfd?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_df847bdfd
-      - NACOS=172.16.240.110:8848
-      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
-      - SEATA_ENABLED=true
    deploy:
      resources:
           limits: