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

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

@@ -174,7 +174,8 @@ export default {
 	},
 	rulesform_form: {
 		details: {
-			group1: "编辑表单值规则", 
+			group1: "系统值规则", 
+			grouppanel1: "属性值规则", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
@@ -184,17 +185,17 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			ibizbookid: "图书标识", 
 			ibizbookname: "非空", 
-			author: "系统值规则", 
-			press: "右包含", 
+			ibizbookid: "图书标识", 
+			author: "包含大写字母", 
+			subtext: "包含小写字母", 
+			icon: "正则式", 
 			price: "数值范围", 
 			type: "字符长度", 
+			press: "右包含", 
 			booknumber: "左包含", 
-			subtext: "常规条件", 
-			icon: "正则式", 
-			lendouttime: "借出日期", 
-			returntime: "大于借出日期", 
+			lendouttime: "大于当前时间", 
+			returntime: "规则组", 
 		},
 		uiactions: {
 		},

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

@@ -173,7 +173,8 @@ export default {
 	},
 	rulesform_form: {
 		details: {
-			group1: "编辑表单值规则", 
+			group1: "系统值规则", 
+			grouppanel1: "属性值规则", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
@@ -183,17 +184,17 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			ibizbookid: "图书标识", 
 			ibizbookname: "非空", 
-			author: "系统值规则", 
-			press: "右包含", 
+			ibizbookid: "图书标识", 
+			author: "包含大写字母", 
+			subtext: "包含小写字母", 
+			icon: "正则式", 
 			price: "数值范围", 
 			type: "字符长度", 
+			press: "右包含", 
 			booknumber: "左包含", 
-			subtext: "常规条件", 
-			icon: "正则式", 
-			lendouttime: "借出日期", 
-			returntime: "大于借出日期", 
+			lendouttime: "大于当前时间", 
+			returntime: "规则组", 
 		},
 		uiactions: {
 		},

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

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

@@ -904,10 +904,10 @@ export default class RowRulesBase extends Vue implements ControlInterface {
                 booknumber:[
                   {
                       type:"SIMPLE",
-                      condOP:"GT",
+                      condOP:"LEFTLIKE",
                       ruleInfo:"", 
                       isKeyCond:false,
-                      paramValue:"0",
+                      paramValue:"1",
                       isNotMode:false,
                       deName:"booknumber",
                   },
@@ -1236,17 +1236,17 @@ export default class RowRulesBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
             "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},
             "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
-            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
+            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/rules-form-form/rules-form-form-model.ts

@@ -55,24 +55,29 @@ export default class RulesFormModel {
       {
         name: 'srfsourcekey',
       },
+      {
+        name: 'ibizbookname',
+        prop: 'ibizbookname',
+        dataType: 'TEXT',
+      },
       {
         name: 'ibizbookid',
         prop: 'ibizbookid',
         dataType: 'GUID',
       },
       {
-        name: 'ibizbookname',
-        prop: 'ibizbookname',
+        name: 'author',
+        prop: 'author',
         dataType: 'TEXT',
       },
       {
-        name: 'author',
-        prop: 'author',
+        name: 'subtext',
+        prop: 'subtext',
         dataType: 'TEXT',
       },
       {
-        name: 'press',
-        prop: 'press',
+        name: 'icon',
+        prop: 'icon',
         dataType: 'TEXT',
       },
       {
@@ -86,19 +91,14 @@ export default class RulesFormModel {
         dataType: 'TEXT',
       },
       {
-        name: 'booknumber',
-        prop: 'booknumber',
-        dataType: 'INT',
-      },
-      {
-        name: 'subtext',
-        prop: 'subtext',
+        name: 'press',
+        prop: 'press',
         dataType: 'TEXT',
       },
       {
-        name: 'icon',
-        prop: 'icon',
-        dataType: 'TEXT',
+        name: 'booknumber',
+        prop: 'booknumber',
+        dataType: 'INT',
       },
       {
         name: 'lendouttime',

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

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

@@ -249,7 +249,7 @@ export default class UsrBase extends Vue implements ControlInterface {
                     label: '出版社',
                     value: 'press',
                     render: (task: any) => {
-                        return task['text']
+                        return this.getColumnValue(task, 'press')
                     },
                     width: 200,
                 },

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

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

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:{
+            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000},
             "ORDERTYPE":{"codelist":{"type":"DYNAMIC","tag":"ORDERTYPE","isnumber":false},"headername":"订单类型","isuniqueitem":false,"name":"ordertype","order":1000},
             "ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000},
-            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
-            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
+            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

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:{
+            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000},
             "ORDERTYPE":{"codelist":{"type":"DYNAMIC","tag":"ORDERTYPE","isnumber":false},"headername":"订单类型","isuniqueitem":false,"name":"ordertype","order":1000},
             "ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000},
-            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
-            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
+            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

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:{
+            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000},
             "ORDERTYPE":{"codelist":{"type":"DYNAMIC","tag":"ORDERTYPE","isnumber":false},"headername":"订单类型","isuniqueitem":false,"name":"ordertype","order":1000},
             "ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000},
-            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
-            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
+            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

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

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

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

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

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

demo-core/src/main/resources/sysmodel/DemoSys.json

@@ -9,6 +9,8 @@
     "table_name":"T_IBIZACCOUNT",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"UPDATEDATE" ,
@@ -158,6 +160,8 @@
     "table_name":"T_IBIZBOOK",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"CREATEMAN" ,
@@ -386,6 +390,8 @@
     "table_name":"T_IBIZCPU",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"CREATEDATE" ,
@@ -577,6 +583,8 @@
     "table_name":"T_IBIZCUSTOM",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"CREATEMAN" ,
@@ -682,6 +690,8 @@
     "table_name":"T_IBIZCUSTOMER",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"CREATEMAN" ,
@@ -847,6 +857,8 @@
     "table_name":"",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"IBIZCUSTOMERID" ,
@@ -970,6 +982,8 @@
     "table_name":"T_IBIZCUSTOMER",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"UPDATEDATE" ,
@@ -1132,6 +1146,8 @@
     "table_name":"T_IBIZHARDWARE",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"UNIT" ,
@@ -1325,6 +1341,8 @@
     "table_name":"T_IBIZORDER",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"TP" ,
@@ -1673,6 +1691,8 @@
     "table_name":"T_IBIZORDERDETAIL",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"IBIZORDERDETAILNAME" ,
@@ -1956,6 +1976,8 @@
     "table_name":"T_IBIZORDERTYPE",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"ENABLE" ,
@@ -2076,6 +2098,8 @@
     "table_name":"T_IBIZQJ",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"UPDATEDATE" ,
@@ -2207,6 +2231,8 @@
     "table_name":"T_IBIZSAMPLE",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"CREATEDATE" ,
@@ -2579,6 +2605,8 @@
     "table_name":"T_IBIZSAMPLE0001",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"FIELD01" ,
@@ -3086,6 +3114,8 @@
     "table_name":"T_IBIZSAMPLE0002",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"DE" ,
@@ -3224,6 +3254,8 @@
     "table_name":"T_IBIZSAMPLE0003",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"IBIZSAMPLE0003NAME" ,
@@ -3411,6 +3443,8 @@
     "table_name":"T_IBIZSAMPLE0004",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"MEMO" ,
@@ -3644,6 +3678,8 @@
     "table_name":"T_IBIZSAMPLE0005",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"JE" ,
@@ -3877,6 +3913,8 @@
     "table_name":"T_IBIZSAMPLE0006",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"YWSTATE" ,
@@ -4129,6 +4167,8 @@
     "table_name":"T_IBIZSAMPLE0007",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"UPDATEDATE" ,
@@ -4401,6 +4441,8 @@
     "table_name":"T_IBIZSAMPLE0008",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"WFSTEP" ,
@@ -4592,6 +4634,8 @@
     "table_name":"T_IBIZSAMPLE0009",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"UPDATEDATE" ,
@@ -4791,6 +4835,8 @@
     "table_name":"T_IBIZSAMPLE0010",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"ORDERTYPE" ,
@@ -4958,6 +5004,8 @@
     "table_name":"T_IBIZSAMPLE0011",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"UPDATEMAN" ,
@@ -5209,6 +5257,8 @@
     "table_name":"T_IBIZSAMPLE0012",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"CREATEDATE" ,
@@ -5376,6 +5426,8 @@
     "table_name":"T_IBIZSAMPLE0013",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"UPDATEMAN" ,
@@ -5627,6 +5679,8 @@
     "table_name":"T_IBIZSAMPLE0014",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"IBIZSAMPLE0014NAME" ,
@@ -5794,6 +5848,8 @@
     "table_name":"T_IBIZSAMPLE0015",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"CREATEDATE" ,
@@ -5933,6 +5989,8 @@
     "table_name":"T_IBIZSAMPLE0016",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"CREATEMAN" ,
@@ -6122,6 +6180,8 @@
     "table_name":"T_IBIZSAMPLE0017",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"ORDERUID" ,
@@ -6309,6 +6369,8 @@
     "table_name":"T_IBIZSAMPLE0018",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"CREATEMAN" ,
@@ -6455,6 +6517,8 @@
     "table_name":"T_IBIZSAMPLE0019",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"UPDATEDATE" ,
@@ -6566,6 +6630,8 @@
     "table_name":"T_IBIZSAMPLE0020",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"IBIZSAMPLE0020NAME" ,
@@ -6713,6 +6779,8 @@
     "table_name":"T_IBIZSOFTWARESUIT",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"CREATEMAN" ,
@@ -6824,6 +6892,8 @@
     "table_name":"T_IBIZSTORAGE",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"IBIZSTORAGEID" ,
@@ -7015,6 +7085,8 @@
     "table_name":"t_supplier",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"DELETEFLAG" ,
@@ -7159,6 +7231,8 @@
     "table_name":"T_IBIZUNIPRODUCT",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"UNITPRICE" ,
@@ -7336,6 +7410,8 @@
     "table_name":"T_IBIZVIEWMSG",
     "system_id":"DemoSys",
     "system_name":"DemoSys",
+    "module_id":"Sample",
+    "module_name":"示例",
     "fields":[
     {
     "fieldname":"IBIZVIEWMSGID" ,

demo-util/src/main/java/cn/ibizlab/util/domain/DTOBase.java

 package cn.ibizlab.util.domain;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+import cn.ibizlab.util.helper.DEFieldCacheMap;
+import org.springframework.cglib.beans.BeanMap;
+import org.springframework.data.annotation.Transient;
+import org.springframework.util.StringUtils;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import lombok.Data;
 
 @Data
 public class DTOBase implements Serializable {
@@ -73,9 +77,44 @@ public class DTOBase implements Serializable {
         return extensionparams;
     }
 
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @Transient
+    private BeanMap map;
+
+    private BeanMap getMap()
+    {
+        if(map==null) {
+            map=BeanMap.create(this);
+        }
+        return  map;
+    }
+
+    public Object get(String field) {
+        String fieldRealName= DEFieldCacheMap.getFieldRealName(this.getClass(),field);
+        if(!StringUtils.isEmpty(fieldRealName)) {
+            return getMap().get(fieldRealName);
+        }
+        else {
+            return this.extensionparams.get(field.toLowerCase());
+        }
+    }
+
     @JsonAnySetter
-    public void set(String name, Object value) {
-        extensionparams.put(name.toLowerCase(), value);
+    public void set(String field, Object value) {
+        field=field.toLowerCase();
+        String fieldRealName=DEFieldCacheMap.getFieldRealName(this.getClass(),field);
+        if(!StringUtils.isEmpty(fieldRealName)) {
+            if (value == null) {
+                getMap().put(fieldRealName, null);
+            }
+            else {
+                getMap().put(fieldRealName, DEFieldCacheMap.fieldValueOf(this.getClass(), fieldRealName, value));
+            }
+        }
+        else {
+            this.extensionparams.put(field.toLowerCase(),value);
+        }
     }
 }