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-base.vue

@@ -33,13 +33,13 @@
 </app-form-item>
 
 </i-col>
-<i-col v-show="detailsModel.press.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='press' :itemRules="this.rules().press" class='' :caption="$t('entities.ibizbook.rulesform_form.details.press')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.press.error" :isEmptyCaption="false" labelPos="LEFT">
+<i-col v-show="detailsModel.subtext.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='subtext' :itemRules="this.rules().subtext" class='' :caption="$t('entities.ibizbook.rulesform_form.details.subtext')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.subtext.error" :isEmptyCaption="false" labelPos="LEFT">
     <input-box 
-    v-model="data.press"  
+    v-model="data.subtext"  
     @enter="onEnter($event)"  
      unit=""  
-    :disabled="detailsModel.press.disabled" 
+    :disabled="detailsModel.subtext.disabled" 
     type='text' 
     style="">
 </input-box>
@@ -47,7 +47,29 @@
 </app-form-item>
 
 </i-col>
-<i-col v-show="detailsModel.price.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+<i-col v-show="detailsModel.icon.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='icon' :itemRules="this.rules().icon" class='' :caption="$t('entities.ibizbook.rulesform_form.details.icon')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.icon.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box 
+    v-model="data.icon"  
+    @enter="onEnter($event)"  
+     unit=""  
+    :disabled="detailsModel.icon.disabled" 
+    type='text' 
+    style="">
+</input-box>
+
+</app-form-item>
+
+</i-col>
+    
+    </row>
+</app-form-group>
+
+</i-col>
+<i-col v-show="detailsModel.grouppanel1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-group :uiService="appUIService" :data="transformData(data)" :manageContainerStatus="detailsModel.grouppanel1.manageContainerStatus"  :isManageContainer="detailsModel.grouppanel1.isManageContainer" @managecontainerclick="manageContainerClick('grouppanel1')" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.ibizbook.rulesform_form.details.grouppanel1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
+    <row>
+        <i-col v-show="detailsModel.price.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='price' :itemRules="this.rules().price" class='' :caption="$t('entities.ibizbook.rulesform_form.details.price')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.price.error" :isEmptyCaption="false" labelPos="LEFT">
     <input-box 
   v-model="data.price"  
@@ -77,27 +99,13 @@
 </app-form-item>
 
 </i-col>
-<i-col v-show="detailsModel.booknumber.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='booknumber' :itemRules="this.rules().booknumber" class='' :caption="$t('entities.ibizbook.rulesform_form.details.booknumber')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.booknumber.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box 
-    v-model="data.booknumber"  
-    @enter="onEnter($event)"  
-     unit=""  
-    :disabled="detailsModel.booknumber.disabled" 
-    type='number' 
-    style="">
-</input-box>
-
-</app-form-item>
-
-</i-col>
-<i-col v-show="detailsModel.subtext.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='subtext' :itemRules="this.rules().subtext" class='' :caption="$t('entities.ibizbook.rulesform_form.details.subtext')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.subtext.error" :isEmptyCaption="false" labelPos="LEFT">
+<i-col v-show="detailsModel.press.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='press' :itemRules="this.rules().press" class='' :caption="$t('entities.ibizbook.rulesform_form.details.press')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.press.error" :isEmptyCaption="false" labelPos="LEFT">
     <input-box 
-    v-model="data.subtext"  
+    v-model="data.press"  
     @enter="onEnter($event)"  
      unit=""  
-    :disabled="detailsModel.subtext.disabled" 
+    :disabled="detailsModel.press.disabled" 
     type='text' 
     style="">
 </input-box>
@@ -105,14 +113,14 @@
 </app-form-item>
 
 </i-col>
-<i-col v-show="detailsModel.icon.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='icon' :itemRules="this.rules().icon" class='' :caption="$t('entities.ibizbook.rulesform_form.details.icon')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.icon.error" :isEmptyCaption="false" labelPos="LEFT">
+<i-col v-show="detailsModel.booknumber.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='booknumber' :itemRules="this.rules().booknumber" class='' :caption="$t('entities.ibizbook.rulesform_form.details.booknumber')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.booknumber.error" :isEmptyCaption="false" labelPos="LEFT">
     <input-box 
-    v-model="data.icon"  
+    v-model="data.booknumber"  
     @enter="onEnter($event)"  
      unit=""  
-    :disabled="detailsModel.icon.disabled" 
-    type='text' 
+    :disabled="detailsModel.booknumber.disabled" 
+    type='number' 
     style="">
 </input-box>
 
@@ -533,15 +541,15 @@ export default class RulesFormBase extends Vue implements ControlInterface {
         srfuf: null,
         srfdeid: null,
         srfsourcekey: null,
-        ibizbookid: null,
         ibizbookname: null,
+        ibizbookid: null,
         author: null,
-        press: null,
+        subtext: null,
+        icon: null,
         price: null,
         type: null,
+        press: null,
         booknumber: null,
-        subtext: null,
-        icon: null,
         lendouttime: null,
         returntime: null,
         ibizbook:null,
@@ -601,14 +609,18 @@ export default class RulesFormBase extends Vue implements ControlInterface {
             { pattern: /[A-Z]+/, message: '内容必须由26个英文字母的大写组成的字符串', trigger: 'change' },
         ],
         author: [
-            { required: this.detailsModel.author.required, type: 'string', message: '系统值规则 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.author.required, type: 'string', message: '系统值规则 值不能为空', trigger: 'blur' },
+            { required: this.detailsModel.author.required, type: 'string', message: '包含大写字母 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.author.required, type: 'string', message: '包含大写字母 值不能为空', trigger: 'blur' },
         ],
-        press: [
-            { required: this.detailsModel.press.required, type: 'string', message: '右包含 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.press.required, type: 'string', message: '右包含 值不能为空', trigger: 'blur' },
-            {validator:(rule:any, value:any)=>{return this.verifyDeRules("press").isPast},message: this.verifyDeRules("press").infoMessage, trigger: 'change' },
-            {validator:(rule:any, value:any)=>{return this.verifyDeRules("press").isPast},message: this.verifyDeRules("press").infoMessage, trigger: 'blur' },
+        subtext: [
+            { required: this.detailsModel.subtext.required, type: 'string', message: '包含小写字母 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.subtext.required, type: 'string', message: '包含小写字母 值不能为空', trigger: 'blur' },
+            { pattern: /[A-Za-z]+/, message: '内容必须为26个英文字母组成的字符串', trigger: 'change' },
+        ],
+        icon: [
+            { required: this.detailsModel.icon.required, type: 'string', message: '正则式 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.icon.required, type: 'string', message: '正则式 值不能为空', trigger: 'blur' },
+            { pattern: /[^\\\/\:\*\?\"\<\>\|]+(\[^\\\/\:\*\?\"\<\>\|]+)*/, message: '内容不能包括/、\、?、*、<、>、:', trigger: 'change' },
         ],
         price: [
             { required: this.detailsModel.price.required, type: 'number', message: '数值范围 值不能为空', trigger: 'change' },
@@ -622,29 +634,27 @@ export default class RulesFormBase extends Vue implements ControlInterface {
             {validator:(rule:any, value:any)=>{return this.verifyDeRules("type").isPast},message: this.verifyDeRules("type").infoMessage, trigger: 'change' },
             {validator:(rule:any, value:any)=>{return this.verifyDeRules("type").isPast},message: this.verifyDeRules("type").infoMessage, trigger: 'blur' },
         ],
+        press: [
+            { required: this.detailsModel.press.required, type: 'string', message: '右包含 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.press.required, type: 'string', message: '右包含 值不能为空', trigger: 'blur' },
+            {validator:(rule:any, value:any)=>{return this.verifyDeRules("press").isPast},message: this.verifyDeRules("press").infoMessage, trigger: 'change' },
+            {validator:(rule:any, value:any)=>{return this.verifyDeRules("press").isPast},message: this.verifyDeRules("press").infoMessage, trigger: 'blur' },
+        ],
         booknumber: [
             { required: this.detailsModel.booknumber.required, type: 'number', message: '左包含 值不能为空', trigger: 'change' },
             { required: this.detailsModel.booknumber.required, type: 'number', message: '左包含 值不能为空', trigger: 'blur' },
             {validator:(rule:any, value:any)=>{return this.verifyDeRules("booknumber").isPast},message: this.verifyDeRules("booknumber").infoMessage, trigger: 'change' },
             {validator:(rule:any, value:any)=>{return this.verifyDeRules("booknumber").isPast},message: this.verifyDeRules("booknumber").infoMessage, trigger: 'blur' },
         ],
-        subtext: [
-            { required: this.detailsModel.subtext.required, type: 'string', message: '常规条件 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.subtext.required, type: 'string', message: '常规条件 值不能为空', trigger: 'blur' },
-            { pattern: /[A-Za-z]+/, message: '内容必须为26个英文字母组成的字符串', trigger: 'change' },
-        ],
-        icon: [
-            { required: this.detailsModel.icon.required, type: 'string', message: '正则式 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.icon.required, type: 'string', message: '正则式 值不能为空', trigger: 'blur' },
-            { pattern: /[^\\\/\:\*\?\"\<\>\|]+(\[^\\\/\:\*\?\"\<\>\|]+)*/, message: '内容不能包括/、\、?、*、<、>、:', trigger: 'change' },
-        ],
         lendouttime: [
-            { required: this.detailsModel.lendouttime.required, type: 'string', message: '借出日期 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.lendouttime.required, type: 'string', message: '借出日期 值不能为空', trigger: 'blur' },
+            { required: this.detailsModel.lendouttime.required, type: 'string', message: '大于当前时间 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.lendouttime.required, type: 'string', message: '大于当前时间 值不能为空', trigger: 'blur' },
+            {validator:(rule:any, value:any)=>{return this.verifyDeRules("lendouttime").isPast},message: this.verifyDeRules("lendouttime").infoMessage, trigger: 'change' },
+            {validator:(rule:any, value:any)=>{return this.verifyDeRules("lendouttime").isPast},message: this.verifyDeRules("lendouttime").infoMessage, trigger: 'blur' },
         ],
         returntime: [
-            { required: this.detailsModel.returntime.required, type: 'string', message: '大于借出日期 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.returntime.required, type: 'string', message: '大于借出日期 值不能为空', trigger: 'blur' },
+            { required: this.detailsModel.returntime.required, type: 'string', message: '规则组 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.returntime.required, type: 'string', message: '规则组 值不能为空', trigger: 'blur' },
             {validator:(rule:any, value:any)=>{return this.verifyDeRules("returntime").isPast},message: this.verifyDeRules("returntime").infoMessage, trigger: 'change' },
             {validator:(rule:any, value:any)=>{return this.verifyDeRules("returntime").isPast},message: this.verifyDeRules("returntime").infoMessage, trigger: 'blur' },
         ],
@@ -658,6 +668,17 @@ 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",
@@ -688,30 +709,30 @@ export default class RulesFormBase extends Vue implements ControlInterface {
                         ]
                   },
                 ],
-                type:[
+                price:[
                   {
-                      type:"STRINGLENGTH",
+                      type:"VALUERANGE2",
                       condOP:"",
-                      ruleInfo:"内容长度必须大于[0]且小于等于[6]", 
+                      ruleInfo:"数值必须大于[0.0]且小于等于[100.0]", 
                       isKeyCond:false,
                       isNotMode:false,
-                      maxValue:6,
+                      maxValue:100,
                       minValue:0,
-                      deName:"type",
+                      deName:"price",
                       isIncludeMaxValue:true,
                       isIncludeMinValue:false,
                   },
                 ],
-                price:[
+                type:[
                   {
-                      type:"VALUERANGE2",
+                      type:"STRINGLENGTH",
                       condOP:"",
-                      ruleInfo:"数值必须大于[0.0]且小于等于[100.0]", 
+                      ruleInfo:"内容长度必须大于[0]且小于等于[6]", 
                       isKeyCond:false,
                       isNotMode:false,
-                      maxValue:100,
+                      maxValue:6,
                       minValue:0,
-                      deName:"price",
+                      deName:"type",
                       isIncludeMaxValue:true,
                       isIncludeMinValue:false,
                   },
@@ -719,10 +740,10 @@ export default class RulesFormBase extends Vue implements ControlInterface {
                 booknumber:[
                   {
                       type:"SIMPLE",
-                      condOP:"GT",
+                      condOP:"LEFTLIKE",
                       ruleInfo:"", 
                       isKeyCond:false,
-                      paramValue:"0",
+                      paramValue:"1",
                       isNotMode:false,
                       deName:"booknumber",
                   },
@@ -833,7 +854,9 @@ export default class RulesFormBase extends Vue implements ControlInterface {
      * @memberof RulesFormBase
      */
     public detailsModel: any = {
-        group1: new FormGroupPanelModel({ caption: '编辑表单值规则', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, isControlledContent: false , uiActionGroup: { caption: '', langbase: 'entities.ibizbook.rulesform_form', extractMode: 'ITEM', details: [] }, isManageContainer: false, showMoreModeItems: []  })
+        group1: new FormGroupPanelModel({ caption: '系统值规则', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, isControlledContent: false , uiActionGroup: { caption: '', langbase: 'entities.ibizbook.rulesform_form', extractMode: 'ITEM', details: [] }, isManageContainer: false, showMoreModeItems: []  })
+, 
+        grouppanel1: new FormGroupPanelModel({ caption: '属性值规则', detailType: 'GROUPPANEL', name: 'grouppanel1', visible: true, isShowCaption: true, form: this, isControlledContent: false , uiActionGroup: { caption: '', langbase: 'entities.ibizbook.rulesform_form', extractMode: 'ITEM', details: [] }, isManageContainer: false, showMoreModeItems: []  })
 , 
         formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this, isControlledContent: false  })
 , 
@@ -852,28 +875,28 @@ export default class RulesFormBase extends Vue implements ControlInterface {
         srfdeid: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfdeid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        ibizbookname: new FormItemModel({ caption: '非空', detailType: 'FORMITEM', name: 'ibizbookname', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:true, disabled: false, enableCond: 3 })
 , 
         ibizbookid: new FormItemModel({ caption: '图书标识', detailType: 'FORMITEM', name: 'ibizbookid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
-        ibizbookname: new FormItemModel({ caption: '非空', detailType: 'FORMITEM', name: 'ibizbookname', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:true, disabled: false, enableCond: 3 })
+        author: new FormItemModel({ caption: '包含大写字母', detailType: 'FORMITEM', name: 'author', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
-        author: new FormItemModel({ caption: '系统值规则', detailType: 'FORMITEM', name: 'author', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+        subtext: new FormItemModel({ caption: '包含小写字母', detailType: 'FORMITEM', name: 'subtext', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
-        press: new FormItemModel({ caption: '右包含', detailType: 'FORMITEM', name: 'press', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+        icon: new FormItemModel({ caption: '正则式', detailType: 'FORMITEM', name: 'icon', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         price: new FormItemModel({ caption: '数值范围', detailType: 'FORMITEM', name: 'price', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         type: new FormItemModel({ caption: '字符长度', detailType: 'FORMITEM', name: 'type', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
-        booknumber: new FormItemModel({ caption: '左包含', detailType: 'FORMITEM', name: 'booknumber', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
-, 
-        subtext: new FormItemModel({ caption: '常规条件', detailType: 'FORMITEM', name: 'subtext', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+        press: new FormItemModel({ caption: '右包含', detailType: 'FORMITEM', name: 'press', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
-        icon: new FormItemModel({ caption: '正则式', detailType: 'FORMITEM', name: 'icon', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+        booknumber: new FormItemModel({ caption: '左包含', detailType: 'FORMITEM', name: 'booknumber', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
-        lendouttime: new FormItemModel({ caption: '借出日期', detailType: 'FORMITEM', name: 'lendouttime', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:true, disabled: false, enableCond: 3 })
+        lendouttime: new FormItemModel({ caption: '大于当前时间', detailType: 'FORMITEM', name: 'lendouttime', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:true, disabled: false, enableCond: 3 })
 , 
-        returntime: new FormItemModel({ caption: '大于借出日期', detailType: 'FORMITEM', name: 'returntime', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:true, disabled: false, enableCond: 3 })
+        returntime: new FormItemModel({ caption: '规则组', detailType: 'FORMITEM', name: 'returntime', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:true, disabled: false, enableCond: 3 })
 , 
     };
 
@@ -974,27 +997,27 @@ export default class RulesFormBase extends Vue implements ControlInterface {
     }
 
     /**
-     * 监控表单属性 ibizbookid 值
+     * 监控表单属性 ibizbookname 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof RulesFormBase
      */
-    @Watch('data.ibizbookid')
-    onIbizbookidChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'ibizbookid', newVal: newVal, oldVal: oldVal });
+    @Watch('data.ibizbookname')
+    onIbizbooknameChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'ibizbookname', newVal: newVal, oldVal: oldVal });
     }
 
     /**
-     * 监控表单属性 ibizbookname 值
+     * 监控表单属性 ibizbookid 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof RulesFormBase
      */
-    @Watch('data.ibizbookname')
-    onIbizbooknameChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'ibizbookname', newVal: newVal, oldVal: oldVal });
+    @Watch('data.ibizbookid')
+    onIbizbookidChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'ibizbookid', newVal: newVal, oldVal: oldVal });
     }
 
     /**
@@ -1010,75 +1033,75 @@ export default class RulesFormBase extends Vue implements ControlInterface {
     }
 
     /**
-     * 监控表单属性 press 值
+     * 监控表单属性 subtext 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof RulesFormBase
      */
-    @Watch('data.press')
-    onPressChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'press', newVal: newVal, oldVal: oldVal });
+    @Watch('data.subtext')
+    onSubtextChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'subtext', newVal: newVal, oldVal: oldVal });
     }
 
     /**
-     * 监控表单属性 price 值
+     * 监控表单属性 icon 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof RulesFormBase
      */
-    @Watch('data.price')
-    onPriceChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'price', newVal: newVal, oldVal: oldVal });
+    @Watch('data.icon')
+    onIconChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'icon', newVal: newVal, oldVal: oldVal });
     }
 
     /**
-     * 监控表单属性 type 值
+     * 监控表单属性 price 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof RulesFormBase
      */
-    @Watch('data.type')
-    onTypeChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'type', newVal: newVal, oldVal: oldVal });
+    @Watch('data.price')
+    onPriceChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'price', newVal: newVal, oldVal: oldVal });
     }
 
     /**
-     * 监控表单属性 booknumber 值
+     * 监控表单属性 type 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof RulesFormBase
      */
-    @Watch('data.booknumber')
-    onBooknumberChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'booknumber', newVal: newVal, oldVal: oldVal });
+    @Watch('data.type')
+    onTypeChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'type', newVal: newVal, oldVal: oldVal });
     }
 
     /**
-     * 监控表单属性 subtext 值
+     * 监控表单属性 press 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof RulesFormBase
      */
-    @Watch('data.subtext')
-    onSubtextChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'subtext', newVal: newVal, oldVal: oldVal });
+    @Watch('data.press')
+    onPressChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'press', newVal: newVal, oldVal: oldVal });
     }
 
     /**
-     * 监控表单属性 icon 值
+     * 监控表单属性 booknumber 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof RulesFormBase
      */
-    @Watch('data.icon')
-    onIconChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'icon', newVal: newVal, oldVal: oldVal });
+    @Watch('data.booknumber')
+    onBooknumberChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'booknumber', newVal: newVal, oldVal: oldVal });
     }
 
     /**
@@ -1178,6 +1201,7 @@ export default class RulesFormBase extends Vue implements ControlInterface {
 
 
 
+
 
 
     }

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);
+        }
     }
 }