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

app_Web/src/widgets/app/main-menu-appmenu/main-menu-appmenu-base.vue

@@ -2807,17 +2807,15 @@ export default class MainMenuBase extends Vue implements ControlInterface {
         const deResParameters: any[] = [];
         const parameters: any[] = [
             { pathName: 'ibizbooks', parameterName: 'ibizbook' },
+            { pathName: 'optionview', parameterName: 'optionview' },
         ];
-        const view = { 
-            viewname: 'ibizbookoption-view', 
-            title: (this.$t('entities.ibizbook.views.optionview.title') as any),
-            height: 800, 
-            width: 1000, 
-        };
-        const appmodal = this.$appmodal.openModal(view, JSON.parse(JSON.stringify(this.context)),viewparam);
-        appmodal.subscribe((result: any) => {
-            console.log(result);
-        });
+        const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
+        if(Object.is(this.$route.fullPath,path)){
+            return;
+        }
+        this.$nextTick(function(){
+            this.$router.push(path);
+        })
     }
     
     /**

app_Web/src/widgets/app/main-menu-appmenu/main-menu-appmenu-model.ts

@@ -3957,7 +3957,7 @@ export default class MainMenuModel {
         {
             appfunctag: 'AppFunc47',
             appfuncyype: 'APPVIEW',
-            openmode: 'POPUPMODAL',
+            openmode: '',
             codename: 'ibizbookoptionview',
             deResParameters: [],
             routepath: '/index/:index?/ibizbooks/:ibizbook?/optionview/:optionview?',

app_Web/src/widgets/ibizbook/expor-and-import-grid-grid/expor-and-import-grid-grid-base.vue

@@ -1183,17 +1183,17 @@ export default class ExporAndImportGridBase extends Vue implements ControlInterf
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
+            "SUBTEXT":{"headername":"图书描述","isuniqueitem":false,"name":"subtext","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "SAILSTATE":{"codelist":{"type":"STATIC","tag":"BookSailState","isnumber":false},"headername":"图书销售状态","isuniqueitem":false,"name":"sailstate","order":1000},
             "TAG":{"headername":"标签","isuniqueitem":false,"name":"tag","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},
             "BORROWWAY":{"codelist":{"type":"STATIC","tag":"CodeList25","isnumber":false},"headername":"借阅方式","isuniqueitem":false,"name":"borrowway","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":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "SUBTEXT":{"headername":"图书描述","isuniqueitem":false,"name":"subtext","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

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

@@ -1205,17 +1205,17 @@ export default class InternalFunc_2Base extends Vue implements ControlInterface
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
+            "SUBTEXT":{"headername":"图书描述","isuniqueitem":false,"name":"subtext","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "SAILSTATE":{"codelist":{"type":"STATIC","tag":"BookSailState","isnumber":false},"headername":"图书销售状态","isuniqueitem":false,"name":"sailstate","order":1000},
             "TAG":{"headername":"标签","isuniqueitem":false,"name":"tag","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},
             "BORROWWAY":{"codelist":{"type":"STATIC","tag":"CodeList25","isnumber":false},"headername":"借阅方式","isuniqueitem":false,"name":"borrowway","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":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "SUBTEXT":{"headername":"图书描述","isuniqueitem":false,"name":"subtext","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

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

@@ -1205,17 +1205,17 @@ export default class InternalFuncBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
+            "SUBTEXT":{"headername":"图书描述","isuniqueitem":false,"name":"subtext","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "SAILSTATE":{"codelist":{"type":"STATIC","tag":"BookSailState","isnumber":false},"headername":"图书销售状态","isuniqueitem":false,"name":"sailstate","order":1000},
             "TAG":{"headername":"标签","isuniqueitem":false,"name":"tag","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},
             "BORROWWAY":{"codelist":{"type":"STATIC","tag":"CodeList25","isnumber":false},"headername":"借阅方式","isuniqueitem":false,"name":"borrowway","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":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "SUBTEXT":{"headername":"图书描述","isuniqueitem":false,"name":"subtext","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

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

@@ -1085,17 +1085,17 @@ export default class Main2Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
+            "SUBTEXT":{"headername":"图书描述","isuniqueitem":false,"name":"subtext","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "SAILSTATE":{"codelist":{"type":"STATIC","tag":"BookSailState","isnumber":false},"headername":"图书销售状态","isuniqueitem":false,"name":"sailstate","order":1000},
             "TAG":{"headername":"标签","isuniqueitem":false,"name":"tag","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},
             "BORROWWAY":{"codelist":{"type":"STATIC","tag":"CodeList25","isnumber":false},"headername":"借阅方式","isuniqueitem":false,"name":"borrowway","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":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "SUBTEXT":{"headername":"图书描述","isuniqueitem":false,"name":"subtext","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

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

@@ -1085,17 +1085,17 @@ export default class Main3Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
+            "SUBTEXT":{"headername":"图书描述","isuniqueitem":false,"name":"subtext","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "SAILSTATE":{"codelist":{"type":"STATIC","tag":"BookSailState","isnumber":false},"headername":"图书销售状态","isuniqueitem":false,"name":"sailstate","order":1000},
             "TAG":{"headername":"标签","isuniqueitem":false,"name":"tag","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},
             "BORROWWAY":{"codelist":{"type":"STATIC","tag":"CodeList25","isnumber":false},"headername":"借阅方式","isuniqueitem":false,"name":"borrowway","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":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "SUBTEXT":{"headername":"图书描述","isuniqueitem":false,"name":"subtext","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

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

@@ -1076,17 +1076,17 @@ export default class Main4Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
+            "SUBTEXT":{"headername":"图书描述","isuniqueitem":false,"name":"subtext","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "SAILSTATE":{"codelist":{"type":"STATIC","tag":"BookSailState","isnumber":false},"headername":"图书销售状态","isuniqueitem":false,"name":"sailstate","order":1000},
             "TAG":{"headername":"标签","isuniqueitem":false,"name":"tag","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},
             "BORROWWAY":{"codelist":{"type":"STATIC","tag":"CodeList25","isnumber":false},"headername":"借阅方式","isuniqueitem":false,"name":"borrowway","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":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "SUBTEXT":{"headername":"图书描述","isuniqueitem":false,"name":"subtext","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

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

@@ -1092,17 +1092,17 @@ export default class Main5Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
+            "SUBTEXT":{"headername":"图书描述","isuniqueitem":false,"name":"subtext","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "SAILSTATE":{"codelist":{"type":"STATIC","tag":"BookSailState","isnumber":false},"headername":"图书销售状态","isuniqueitem":false,"name":"sailstate","order":1000},
             "TAG":{"headername":"标签","isuniqueitem":false,"name":"tag","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},
             "BORROWWAY":{"codelist":{"type":"STATIC","tag":"CodeList25","isnumber":false},"headername":"借阅方式","isuniqueitem":false,"name":"borrowway","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":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "SUBTEXT":{"headername":"图书描述","isuniqueitem":false,"name":"subtext","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

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

@@ -1291,17 +1291,17 @@ export default class Main6Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
+            "SUBTEXT":{"headername":"图书描述","isuniqueitem":false,"name":"subtext","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "SAILSTATE":{"codelist":{"type":"STATIC","tag":"BookSailState","isnumber":false},"headername":"图书销售状态","isuniqueitem":false,"name":"sailstate","order":1000},
             "TAG":{"headername":"标签","isuniqueitem":false,"name":"tag","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},
             "BORROWWAY":{"codelist":{"type":"STATIC","tag":"CodeList25","isnumber":false},"headername":"借阅方式","isuniqueitem":false,"name":"borrowway","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":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "SUBTEXT":{"headername":"图书描述","isuniqueitem":false,"name":"subtext","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

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

@@ -1162,17 +1162,17 @@ export default class Main7Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
+            "SUBTEXT":{"headername":"图书描述","isuniqueitem":false,"name":"subtext","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "SAILSTATE":{"codelist":{"type":"STATIC","tag":"BookSailState","isnumber":false},"headername":"图书销售状态","isuniqueitem":false,"name":"sailstate","order":1000},
             "TAG":{"headername":"标签","isuniqueitem":false,"name":"tag","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},
             "BORROWWAY":{"codelist":{"type":"STATIC","tag":"CodeList25","isnumber":false},"headername":"借阅方式","isuniqueitem":false,"name":"borrowway","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":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "SUBTEXT":{"headername":"图书描述","isuniqueitem":false,"name":"subtext","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

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

@@ -1210,17 +1210,17 @@ export default class NewDefaultBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
+            "SUBTEXT":{"headername":"图书描述","isuniqueitem":false,"name":"subtext","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "SAILSTATE":{"codelist":{"type":"STATIC","tag":"BookSailState","isnumber":false},"headername":"图书销售状态","isuniqueitem":false,"name":"sailstate","order":1000},
             "TAG":{"headername":"标签","isuniqueitem":false,"name":"tag","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},
             "BORROWWAY":{"codelist":{"type":"STATIC","tag":"CodeList25","isnumber":false},"headername":"借阅方式","isuniqueitem":false,"name":"borrowway","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":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "SUBTEXT":{"headername":"图书描述","isuniqueitem":false,"name":"subtext","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

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

@@ -1291,17 +1291,17 @@ export default class RowEditBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
+            "SUBTEXT":{"headername":"图书描述","isuniqueitem":false,"name":"subtext","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "SAILSTATE":{"codelist":{"type":"STATIC","tag":"BookSailState","isnumber":false},"headername":"图书销售状态","isuniqueitem":false,"name":"sailstate","order":1000},
             "TAG":{"headername":"标签","isuniqueitem":false,"name":"tag","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},
             "BORROWWAY":{"codelist":{"type":"STATIC","tag":"CodeList25","isnumber":false},"headername":"借阅方式","isuniqueitem":false,"name":"borrowway","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":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "SUBTEXT":{"headername":"图书描述","isuniqueitem":false,"name":"subtext","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

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

@@ -1187,17 +1187,17 @@ export default class RowRulesBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
+            "SUBTEXT":{"headername":"图书描述","isuniqueitem":false,"name":"subtext","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "SAILSTATE":{"codelist":{"type":"STATIC","tag":"BookSailState","isnumber":false},"headername":"图书销售状态","isuniqueitem":false,"name":"sailstate","order":1000},
             "TAG":{"headername":"标签","isuniqueitem":false,"name":"tag","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},
             "BORROWWAY":{"codelist":{"type":"STATIC","tag":"CodeList25","isnumber":false},"headername":"借阅方式","isuniqueitem":false,"name":"borrowway","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":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "SUBTEXT":{"headername":"图书描述","isuniqueitem":false,"name":"subtext","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

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

@@ -1210,17 +1210,17 @@ export default class UpdateDefaultBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
+            "SUBTEXT":{"headername":"图书描述","isuniqueitem":false,"name":"subtext","order":1000},
+            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "SAILSTATE":{"codelist":{"type":"STATIC","tag":"BookSailState","isnumber":false},"headername":"图书销售状态","isuniqueitem":false,"name":"sailstate","order":1000},
             "TAG":{"headername":"标签","isuniqueitem":false,"name":"tag","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},
             "BORROWWAY":{"codelist":{"type":"STATIC","tag":"CodeList25","isnumber":false},"headername":"借阅方式","isuniqueitem":false,"name":"borrowway","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":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "SUBTEXT":{"headername":"图书描述","isuniqueitem":false,"name":"subtext","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

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

@@ -1120,8 +1120,8 @@ export default class MainBase extends Vue implements ControlInterface {
             importData:{
             "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},
-            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000}
+            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
+            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

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

@@ -1036,8 +1036,8 @@ export default class Main2Base extends Vue implements ControlInterface {
             importData:{
             "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},
-            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000}
+            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
+            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

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

@@ -1072,8 +1072,8 @@ export default class UIPART_0015Base extends Vue implements ControlInterface {
             importData:{
             "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},
-            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000}
+            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
+            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

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

@@ -1195,8 +1195,8 @@ export default class UIPART_0017Base extends Vue implements ControlInterface {
             importData:{
             "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},
-            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000}
+            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
+            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

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

@@ -1127,8 +1127,8 @@ export default class UIPART_0018Base extends Vue implements ControlInterface {
             importData:{
             "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},
-            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000}
+            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
+            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

config.xml

@@ -37,11 +37,6 @@
 	  git clone -b master $para2 demosys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd demosys/
-      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>

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 51001
+EXPOSE 8080
 
 ADD demo-app-web.jar /demo-app-web.jar

demo-app/demo-app-web/src/main/docker/demo-app-web.yaml

@@ -3,24 +3,9 @@ services:
   demo-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/demo-app-web:latest
     ports:
-      - "51001:51001"
+      - "8080:8080"
     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:

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 = "subtext", source = "subtext"),
+        @Mapping(target = "ibizbookname", source = "ibizbookname"),
+        @Mapping(target = "sailstate", source = "sailstate"),
         @Mapping(target = "tag", source = "tag"),
         @Mapping(target = "borrowway", source = "borrowway"),
         @Mapping(target = "press", source = "press"),
-        @Mapping(target = "type", source = "type"),
         @Mapping(target = "author", source = "author"),
+        @Mapping(target = "type", source = "type"),
         @Mapping(target = "price", source = "price"),
         @Mapping(target = "booknumber", source = "booknumber"),
-        @Mapping(target = "subtext", source = "subtext"),
-        @Mapping(target = "ibizbookname", source = "ibizbookname"),
-        @Mapping(target = "sailstate", source = "sailstate"),
     })
     @BeanMapping(ignoreByDefault = true)
     IBIZBOOK toDomain(IBIZBOOK entity);

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

@@ -172,7 +172,7 @@
 
 
     <!--输出实体[IBIZBOOK]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-1127-7">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-1129-7">
         <createTable tableName="T_IBIZBOOK">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>