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

app_Web/public/assets/json/view-config.json

@@ -567,6 +567,14 @@
         "viewname": "IBIZUNIProductPickupGridView",
         "viewtag": "80c9ae9ed04e7107ed9fc93734a447d1"
     },
+    "ibizordertypeusr2editview": {
+        "title": "订单类型编辑视图",
+        "caption": "订单类型",
+        "viewtype": "DEEDITVIEW",
+        "viewmodule": "Sample",
+        "viewname": "IBIZOrderTypeUsr2EditView",
+        "viewtag": "82014278d03dfb22039740c03d2a461f"
+    },
     "ibizordersf1editview": {
         "title": "编辑表单新建默认值",
         "caption": "编辑表单新建默认值",

app_Web/src/locale/lanres/entities/ibizorder-type/ibizorder-type_en_US.ts

@@ -22,6 +22,10 @@ export default {
 			caption: "订单类型",
       		title: "订单类型选择表格视图",
 		},
+		usr2editview: {
+			caption: "订单类型",
+      		title: "订单类型编辑视图",
+		},
 	},
 	main_form: {
 		details: {
@@ -70,4 +74,6 @@ export default {
 			tip: "Save And Close Window",
 		},
 	},
+	usr2editviewtoolbar_toolbar: {
+	},
 };
\ No newline at end of file

app_Web/src/locale/lanres/entities/ibizorder-type/ibizorder-type_zh_CN.ts

@@ -21,6 +21,10 @@ export default {
 			caption: "订单类型",
       		title: "订单类型选择表格视图",
 		},
+		usr2editview: {
+			caption: "订单类型",
+      		title: "订单类型编辑视图",
+		},
 	},
 	main_form: {
 		details: {
@@ -69,4 +73,6 @@ export default {
 			tip: "保存并关闭",
 		},
 	},
+	usr2editviewtoolbar_toolbar: {
+	},
 };
\ No newline at end of file

app_Web/src/mock/viewconfig/viewconfig.ts

@@ -575,6 +575,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "IBIZUNIProductPickupGridView",
             "viewtag": "80c9ae9ed04e7107ed9fc93734a447d1"
         },
+        "ibizordertypeusr2editview": {
+            "title": "订单类型编辑视图",
+            "caption": "订单类型",
+            "viewtype": "DEEDITVIEW",
+            "viewmodule": "Sample",
+            "viewname": "IBIZOrderTypeUsr2EditView",
+            "viewtag": "82014278d03dfb22039740c03d2a461f"
+        },
         "ibizordersf1editview": {
             "title": "编辑表单新建默认值",
             "caption": "编辑表单新建默认值",

app_Web/src/pages/sample/index/page-register.ts

@@ -131,7 +131,6 @@ export const PageComponents = {
         Vue.component('ibizorder-sf7-edit-view', () => import('@pages/sample/ibizorder-sf7-edit-view/ibizorder-sf7-edit-view.vue'));
         Vue.component('ibizbookedit-view', () => import('@pages/sample/ibizbookedit-view/ibizbookedit-view.vue'));
         Vue.component('ibizsample0001-sf5-edit-view', () => import('@pages/sample/ibizsample0001-sf5-edit-view/ibizsample0001-sf5-edit-view.vue'));
-        Vue.component('ibizorder-type-edit-view', () => import('@pages/sample/ibizorder-type-edit-view/ibizorder-type-edit-view.vue'));
         Vue.component('ibizbookgroup-by-codelist-list-view', () => import('@pages/sample/ibizbookgroup-by-codelist-list-view/ibizbookgroup-by-codelist-list-view.vue'));
         Vue.component('ibizbookhas-panel-kan-ban-view', () => import('@pages/sample/ibizbookhas-panel-kan-ban-view/ibizbookhas-panel-kan-ban-view.vue'));
         Vue.component('ibizorder-radar-chart-view', () => import('@pages/sample/ibizorder-radar-chart-view/ibizorder-radar-chart-view.vue'));

app_Web/src/pages/sample/index/router.ts

@@ -1929,20 +1929,6 @@ const router = new Router({
                     },
                     component: () => import('@pages/sample/ibizsample0001-sf5-edit-view/ibizsample0001-sf5-edit-view.vue'),
                 },
-                {
-                    path: 'ibizordertypes/:ibizordertype?/editview/:editview?',
-                    meta: {
-                        caption: 'entities.ibizordertype.views.editview.caption',
-                        info:'',
-                        parameters: [
-                            { pathName: 'index', parameterName: 'index' },
-                            { pathName: 'ibizordertypes', parameterName: 'ibizordertype' },
-                            { pathName: 'editview', parameterName: 'editview' },
-                        ],
-                        requireAuth: true,
-                    },
-                    component: () => import('@pages/sample/ibizorder-type-edit-view/ibizorder-type-edit-view.vue'),
-                },
                 {
                     path: 'ibizbooks/:ibizbook?/groupbycodelistlistview/:groupbycodelistlistview?',
                     meta: {
@@ -2425,19 +2411,6 @@ const router = new Router({
         },
         component: () => import('@pages/sample/ibizbookgroup-by-codelist-kan-ban-view/ibizbookgroup-by-codelist-kan-ban-view.vue'),
     },
-    {
-        path: '/ibizordertypes/:ibizordertype?/editview/:editview?',
-        meta: {
-            caption: 'entities.ibizordertype.views.editview.caption',
-            info:'',
-            parameters: [
-                { pathName: 'ibizordertypes', parameterName: 'ibizordertype' },
-                { pathName: 'editview', parameterName: 'editview' },
-            ],
-            requireAuth: true,
-        },
-        component: () => import('@pages/sample/ibizorder-type-edit-view/ibizorder-type-edit-view.vue'),
-    },
     {
         path: '/ibizorders/:ibizorder?/odsp_d20_wfgridview/:odsp_d20_wfgridview?',
         meta: {

app_Web/src/store/modules/view-action/state.ts

@@ -216,7 +216,6 @@ export const viewstate: any = {
                 '41d3da0d37fb0135ace813f1ba06bd39',
                 'b1256beac1e95915b675893c61559b59',
                 'b8ae19200ec9d4e8e588bc31e3f9bcb4',
-                '30bdd460e697c4d94453109875060ec4',
                 '09663b7a4e3dce70524d1b64e02b5e2d',
                 'edca8ee67304eb78c02bbfb9e4cb11bb',
                 'e2a1c9cb077cd2c74f2f2b914fb1db84',
@@ -346,15 +345,6 @@ export const viewstate: any = {
                 'b3429ecc4d89a02bc5f5279f1bd7f620',
             ],
         },
-        {
-            viewtag: '30bdd460e697c4d94453109875060ec4',
-            viewmodule: 'Sample',
-            viewname: 'IBIZOrderTypeEditView',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-            ],
-        },
         {
             viewtag: '3561860a1fae5554621b47824d1d3abc',
             viewmodule: 'Sample',

app_Web/src/uiservice/ibizorder-type/ibizorder-type-ui-service-base.ts

@@ -99,6 +99,7 @@ export default class IBIZOrderTypeUIServiceBase extends UIService {
         this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'ibizordertypes',component:'ibizorder-type-pickup-view'});
         this.allViewMap.set(':',{viewname:'editview',srfappde:'ibizordertypes',component:'ibizorder-type-edit-view'});
         this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'ibizordertypes',component:'ibizorder-type-pickup-grid-view'});
+        this.allViewMap.set(':',{viewname:'usr2editview',srfappde:'ibizordertypes',component:'ibizorder-type-usr2-edit-view'});
     }
 
     /**

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

@@ -2461,8 +2461,8 @@ export default class MainMenuBase extends Vue implements ControlInterface {
         Object.assign(viewparam, {});
         const deResParameters: any[] = [];
         const parameters: any[] = [
-            { pathName: 'ibizordertypes', parameterName: 'ibizordertype' },
-            { pathName: 'editview', parameterName: 'editview' },
+            { pathName: 'ibizorders', parameterName: 'ibizorder' },
+            { pathName: 'usr2editview', parameterName: 'usr2editview' },
         ];
         const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
         if(Object.is(this.$route.fullPath,path)){

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

@@ -1068,17 +1068,17 @@ export default class InternalFuncBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","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},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000}
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

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

@@ -1079,17 +1079,17 @@ export default class Main2Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","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},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000}
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

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

@@ -1079,17 +1079,17 @@ export default class Main3Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","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},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000}
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

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

@@ -1070,17 +1070,17 @@ export default class Main4Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","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},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000}
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

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

@@ -1086,17 +1086,17 @@ export default class Main5Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","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},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000}
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

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:{
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","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},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000}
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

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

@@ -1281,17 +1281,17 @@ export default class RowEditBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","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},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000}
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

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

@@ -1236,17 +1236,17 @@ export default class RowRulesBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","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},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000}
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/rules-form-form/rules-form-form-base.vue

@@ -668,17 +668,6 @@ export default class RulesFormBase extends Vue implements ControlInterface {
      * @memberof RulesFormBase
      */
     public deRules:any = {
-                lendouttime:[
-                  {
-                      type:"SIMPLE",
-                      condOP:"GTANDEQ",
-                      ruleInfo:"需要大于等于当前时间", 
-                      isKeyCond:false,
-                      paramType:"CURTIME",
-                      isNotMode:false,
-                      deName:"lendouttime",
-                  },
-                ],
                 returntime:[
                   {
                       type:"GROUP",
@@ -709,6 +698,17 @@ export default class RulesFormBase extends Vue implements ControlInterface {
                         ]
                   },
                 ],
+                lendouttime:[
+                  {
+                      type:"SIMPLE",
+                      condOP:"GTANDEQ",
+                      ruleInfo:"需要大于等于当前时间", 
+                      isKeyCond:false,
+                      paramType:"CURTIME",
+                      isNotMode:false,
+                      deName:"lendouttime",
+                  },
+                ],
                 type:[
                   {
                       type:"STRINGLENGTH",

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:{
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","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},
             "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
-            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000}
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/usr-gantt/usr-gantt-base.vue

@@ -238,42 +238,42 @@ export default class UsrBase extends Vue implements ControlInterface {
             labelField: 'text',
             columns: [
                 {
-                    label: '图书名称',
-                    value: 'ibizbookname',
+                    label: '作者',
+                    value: 'author',
                     render: (task: any) => {
-                        return this.getColumnValue(task, 'ibizbookname')
+                        return this.getColumnValue(task, 'author')
                     },
                     width: 200,
                 },
                 {
-                    label: '出版社',
-                    value: 'press',
+                    label: '借出日期',
+                    value: 'lendouttime',
                     render: (task: any) => {
-                        return this.getColumnValue(task, 'press')
+                        return this.getColumnValue(task, 'lendouttime')
                     },
                     width: 200,
                 },
                 {
-                    label: '作者',
-                    value: 'author',
+                    label: '归还日期',
+                    value: 'returntime',
                     render: (task: any) => {
-                        return this.getColumnValue(task, 'author')
+                        return this.getColumnValue(task, 'returntime')
                     },
                     width: 200,
                 },
                 {
-                    label: '借出日期',
-                    value: 'lendouttime',
+                    label: '图书名称',
+                    value: 'ibizbookname',
                     render: (task: any) => {
-                        return this.getColumnValue(task, 'lendouttime')
+                        return this.getColumnValue(task, 'ibizbookname')
                     },
                     width: 200,
                 },
                 {
-                    label: '归还日期',
-                    value: 'returntime',
+                    label: '出版社',
+                    value: 'press',
                     render: (task: any) => {
-                        return this.getColumnValue(task, 'returntime')
+                        return this.getColumnValue(task, 'press')
                     },
                     width: 200,
                 },

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

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

@@ -250,7 +250,7 @@
 
 
     <!--输出实体[IBIZORDERTYPE]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizordertype-7-11">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizordertype-9-11">
         <createTable tableName="T_IBIZORDERTYPE">
                 <column name="ENABLE" remarks="" type="INT">
                 </column>

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

@@ -49,7 +49,7 @@
          </createView>
      </changeSet>
         <!--输出实体[IBIZORDERTYPE]视图结构信息 runOnChange="true"  当视图发生变更时，通过liquibase强刷prod的视图，实现视图的同步-->
-     <changeSet author="a_LAB01_df847bdfd" id="view-ibizordertype-7-10" runOnChange="true">
+     <changeSet author="a_LAB01_df847bdfd" id="view-ibizordertype-9-10" runOnChange="true">
          <createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZORDERTYPE">
                <![CDATA[ SELECT t1.[CREATEDATE], t1.[CREATEMAN], t1.[ENABLE], t1.[IBIZORDERTYPEID], t1.[IBIZORDERTYPENAME], t1.[UPDATEDATE], t1.[UPDATEMAN] FROM [T_IBIZORDERTYPE] t1  ]]>
          </createView>