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

app_Web/src/locale/lanres/entities/ibizsample0001/ibizsample0001_en_US.ts

@@ -247,7 +247,6 @@ export default {
 			formitem7: "文件上传(信息展示)", 
 			formitem8: "文件(支持拖拽)", 
 			formitem9: "磁盘文件", 
-			formitem1: "标签", 
 			updateman: "颜色", 
 			formitem11: "地址栏", 
 			formitem12: "格式化信息", 
@@ -267,9 +266,13 @@ export default {
 	},
 	main_grid: {
 		columns: {
-			ibizsample0001name: "名称",
-			updateman: "更新人",
-			updatedate: "更新时间",
+			ibizsample0001name: "标签（颜色）",
+			updateman: "标签（地址栏）",
+			updatedate: "标签（格式化信息）",
+			defgridcolumn: "标签（多久之前）",
+			defgridcolumn1: "多选穿梭框",
+			defgridcolumn2: "CRON表达式组件",
+			defgridcolumn3: "动态代码表国际化",
 		},
 		nodata:"",
 		uiactions: {

app_Web/src/locale/lanres/entities/ibizsample0001/ibizsample0001_zh_CN.ts

@@ -246,7 +246,6 @@ export default {
 			formitem7: "文件上传(信息展示)", 
 			formitem8: "文件(支持拖拽)", 
 			formitem9: "磁盘文件", 
-			formitem1: "标签", 
 			updateman: "颜色", 
 			formitem11: "地址栏", 
 			formitem12: "格式化信息", 
@@ -266,9 +265,13 @@ export default {
 	},
 	main_grid: {
 		columns: {
-			ibizsample0001name: "名称",
-			updateman: "更新人",
-			updatedate: "更新时间",
+			ibizsample0001name: "标签（颜色）",
+			updateman: "标签（地址栏）",
+			updatedate: "标签（格式化信息）",
+			defgridcolumn: "标签（多久之前）",
+			defgridcolumn1: "多选穿梭框",
+			defgridcolumn2: "CRON表达式组件",
+			defgridcolumn3: "动态代码表国际化",
 		},
 		nodata:"",
 		uiactions: {

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

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

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

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

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

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

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

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

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

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

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

@@ -1206,7 +1206,7 @@ export default class NewDefaultBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "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},
@@ -1216,7 +1216,7 @@ export default class NewDefaultBase extends Vue implements ControlInterface {
             "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000}
+            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

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

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

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

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

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

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

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

@@ -1206,7 +1206,7 @@ export default class UpdateDefaultBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "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},
@@ -1216,7 +1216,7 @@ export default class UpdateDefaultBase extends Vue implements ControlInterface {
             "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
             "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
             "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000}
+            "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

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

@@ -29,12 +29,14 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <span>{{row.ibizsample0001name}}</span>
+                        <template >
+            <codelist :value="row.ibizsample0001name" tag='SysOperator' codelistType='DYNAMIC' ></codelist>
+                        </template>
                     </template>
                 </el-table-column>
             </template>
             <template v-if="getColumnState('updateman')">
-                <el-table-column show-overflow-tooltip :prop="'updateman'" :label="$t('entities.ibizsample0001.main_grid.columns.updateman')" :width="150"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'updateman'" :label="$t('entities.ibizsample0001.main_grid.columns.updateman')" :width="150"  :align="'left'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.ibizsample0001.main_grid.columns.updateman')}}
@@ -42,7 +44,7 @@
                     </template>
                     <template v-slot="{row,column,$index}">
                         <template >
-            <codelist :value="row.updateman" tag='SysOperator' codelistType='DYNAMIC' ></codelist>
+            <app-span name='updateman' editorType="HTMLEDITOR" :value="row.updateman" dataType="HTMLTEXT" precision="0" ></app-span>
                         </template>
                     </template>
                 </el-table-column>
@@ -55,7 +57,57 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <app-format-data format="YYYY-MM-DD HH:mm:ss" :data="row.updatedate"></app-format-data>
+                        <app-format-data format="YYYY-MM-DD" :data="row.updatedate"></app-format-data>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('defgridcolumn')">
+                <el-table-column show-overflow-tooltip :prop="'defgridcolumn'" :label="$t('entities.ibizsample0001.main_grid.columns.defgridcolumn')" :width="100"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibizsample0001.main_grid.columns.defgridcolumn')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <template >
+            <app-span name='defgridcolumn' editorType="SPAN" :value="row.defgridcolumn" dataType="DATETIME" precision="0" ></app-span>
+                        </template>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('defgridcolumn1')">
+                <el-table-column show-overflow-tooltip :prop="'defgridcolumn1'" :label="$t('entities.ibizsample0001.main_grid.columns.defgridcolumn1')" :width="100"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibizsample0001.main_grid.columns.defgridcolumn1')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.defgridcolumn1}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('defgridcolumn2')">
+                <el-table-column show-overflow-tooltip :prop="'defgridcolumn2'" :label="$t('entities.ibizsample0001.main_grid.columns.defgridcolumn2')" :width="100"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibizsample0001.main_grid.columns.defgridcolumn2')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <app-format-data format="YYYY-MM-DD" :data="row.defgridcolumn2"></app-format-data>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('defgridcolumn3')">
+                <el-table-column show-overflow-tooltip :prop="'defgridcolumn3'" :label="$t('entities.ibizsample0001.main_grid.columns.defgridcolumn3')" :width="100"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibizsample0001.main_grid.columns.defgridcolumn3')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <app-format-data format="YYYY-MM-DD HH:mm:ss" :data="row.defgridcolumn3"></app-format-data>
                     </template>
                 </el-table-column>
             </template>
@@ -257,7 +309,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {string}
      * @memberof MainBase
      */  
-    public majorInfoColName:string = "IBIZsample0001name";
+    public majorInfoColName:string = "defgridcolumn1";
 
     /**
      * 界面UI服务对象
@@ -538,7 +590,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * 
      * @memberof MainBase
      */
-    public defaultUpdateItems:Array<any> =[];
+    public defaultUpdateItems:Array<any> =[,,,];
 
     /**
      * 选中行数据
@@ -618,7 +670,7 @@ export default class MainBase extends Vue implements ControlInterface {
     public allColumns: any[] = [
         {
             name: 'ibizsample0001name',
-            label: '名称',
+            label: '标签（颜色）',
             langtag: 'entities.ibizsample0001.main_grid.columns.ibizsample0001name',
             show: true,
             unit: 'PX',
@@ -627,7 +679,7 @@ export default class MainBase extends Vue implements ControlInterface {
         },
         {
             name: 'updateman',
-            label: '更新人',
+            label: '标签（地址栏）',
             langtag: 'entities.ibizsample0001.main_grid.columns.updateman',
             show: true,
             unit: 'PX',
@@ -636,13 +688,49 @@ export default class MainBase extends Vue implements ControlInterface {
         },
         {
             name: 'updatedate',
-            label: '更新时间',
+            label: '标签（格式化信息）',
             langtag: 'entities.ibizsample0001.main_grid.columns.updatedate',
             show: true,
             unit: 'PX',
             isEnableRowEdit: false,
             enableCond: 3 ,
         },
+        {
+            name: 'defgridcolumn',
+            label: '标签（多久之前）',
+            langtag: 'entities.ibizsample0001.main_grid.columns.defgridcolumn',
+            show: true,
+            unit: 'PX',
+            isEnableRowEdit: false,
+            enableCond: 3 ,
+        },
+        {
+            name: 'defgridcolumn1',
+            label: '多选穿梭框',
+            langtag: 'entities.ibizsample0001.main_grid.columns.defgridcolumn1',
+            show: true,
+            unit: 'PX',
+            isEnableRowEdit: false,
+            enableCond: 3 ,
+        },
+        {
+            name: 'defgridcolumn2',
+            label: 'CRON表达式组件',
+            langtag: 'entities.ibizsample0001.main_grid.columns.defgridcolumn2',
+            show: true,
+            unit: 'PX',
+            isEnableRowEdit: false,
+            enableCond: 3 ,
+        },
+        {
+            name: 'defgridcolumn3',
+            label: '动态代码表国际化',
+            langtag: 'entities.ibizsample0001.main_grid.columns.defgridcolumn3',
+            show: true,
+            unit: 'PX',
+            isEnableRowEdit: false,
+            enableCond: 3 ,
+        },
     ]
 
     /**
@@ -729,6 +817,9 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public getGridRowModel(){
         return {
+          IBIZsample0001name: new FormItemModel(),
+          updateman: new FormItemModel(),
+          defgridcolumn: new FormItemModel(),
           srfkey: new FormItemModel(),
         }
     }
@@ -749,6 +840,18 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public rules: any = {
+        IBIZsample0001name: [
+             { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '标签（颜色） 值不能为空', trigger: 'change' },
+            { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '标签（颜色） 值不能为空', trigger: 'blur' },
+        ],
+        updateman: [
+             { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '标签（地址栏） 值不能为空', trigger: 'change' },
+            { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '标签（地址栏） 值不能为空', trigger: 'blur' },
+        ],
+        defgridcolumn: [
+             { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '标签（多久之前） 值不能为空', trigger: 'change' },
+            { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '标签（多久之前） 值不能为空', trigger: 'blur' },
+        ],
         srfkey: [
              { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: 'IBIZSAMPLE0001标识 值不能为空', trigger: 'change' },
             { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: 'IBIZSAMPLE0001标识 值不能为空', trigger: 'blur' },
@@ -1124,7 +1227,7 @@ export default class MainBase extends Vue implements ControlInterface {
     public async formatExcelData(filterVal:any, jsonData:any) {
         let codelistColumns:Array<any> = [
             {
-                name: 'updateman',
+                name: 'ibizsample0001name',
                 srfkey: 'SysOperator',
                 codelistType : 'DYNAMIC',
                 renderMode: 'other',
@@ -1337,7 +1440,7 @@ export default class MainBase extends Vue implements ControlInterface {
     * @memberof MainBase
     */
     public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
-        let allColumns:Array<any> = ['IBIZsample0001name','updateman','updatedate'];
+        let allColumns:Array<any> = ['IBIZsample0001name','updateman','updatedate','defgridcolumn','defgridcolumn1','defgridcolumn2','defgridcolumn3'];
         if(row && row.children) {
             if(columnIndex == (this.isSingleSelect ? 0:1)) {
                 return [1, allColumns.length+1];
@@ -1420,6 +1523,10 @@ export default class MainBase extends Vue implements ControlInterface {
                 IBIZsample0001name:'',
                 updateman:'',
                 updatedate:'',
+                defgridcolumn:'',
+                defgridcolumn1:'',
+                defgridcolumn2:'',
+                defgridcolumn3:'',
                 children: children
             }
             groupTree.push(tree);
@@ -1450,6 +1557,10 @@ export default class MainBase extends Vue implements ControlInterface {
             IBIZsample0001name:'',
             updateman:'',
             updatedate:'',
+            defgridcolumn:'',
+            defgridcolumn1:'',
+            defgridcolumn2:'',
+            defgridcolumn3:'',
             children: child
         }
         if(child && child.length > 0){
@@ -1513,6 +1624,10 @@ export default class MainBase extends Vue implements ControlInterface {
                 IBIZsample0001name:'',
                 updateman:'',
                 updatedate:'',
+                defgridcolumn:'',
+                defgridcolumn1:'',
+                defgridcolumn2:'',
+                defgridcolumn3:'',
                 children: children,
             }
             groupTree.push(tree);

app_Web/src/widgets/ibizsample0001/main-grid/main-grid-model.ts

@@ -35,6 +35,7 @@ export default class MainModel {
           name: 'updateman',
           prop: 'updateman',
           dataType: 'TEXT',
+          isEditable:true
         },
         {
           name: 'ibizsample0001id',
@@ -46,6 +47,11 @@ export default class MainModel {
           prop: 'updatedate',
           dataType: 'DATETIME',
         },
+        {
+          name: 'field04',
+          prop: 'field04',
+          dataType: 'HTMLTEXT',
+        },
         {
           name: 'srfmajortext',
           prop: 'ibizsample0001name',
@@ -62,11 +68,21 @@ export default class MainModel {
           dataType: 'GUID',
           isEditable:true
         },
+        {
+          name: 'field08',
+          prop: 'field08',
+          dataType: 'DATETIME',
+        },
         {
           name: 'ibizsample0001name',
           prop: 'ibizsample0001name',
           dataType: 'TEXT',
         },
+        {
+          name: 'field09',
+          prop: 'field09',
+          dataType: 'DATE',
+        },
         {
           name: 'ibizsample0001',
           prop: 'ibizsample0001id',

app_Web/src/widgets/ibizsample0001/main5-form/main5-form-base.vue

@@ -46,13 +46,7 @@
 <i-col v-show="detailsModel.grouppanel2.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-group :uiService="appUIService" :data="transformData(data)" :manageContainerStatus="detailsModel.grouppanel2.manageContainerStatus"  :isManageContainer="detailsModel.grouppanel2.isManageContainer" @managecontainerclick="manageContainerClick('grouppanel2')" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel2.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.ibizsample0001.main5_form.details.grouppanel2')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
     <row>
-        <i-col v-show="detailsModel.formitem1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='formitem1' :itemRules="this.rules().formitem1" class='' :caption="$t('entities.ibizsample0001.main5_form.details.formitem1')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.formitem1.error" :isEmptyCaption="false" labelPos="LEFT">
-    <span v-html="data.formitem1"></span>
-</app-form-item>
-
-</i-col>
-<i-col v-show="detailsModel.updateman.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+        <i-col v-show="detailsModel.updateman.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='updateman' :itemRules="this.rules().updateman" class='' :caption="$t('entities.ibizsample0001.main5_form.details.updateman')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.updateman.error" :isEmptyCaption="false" labelPos="LEFT">
     
 <app-span name='updateman' :value="data.updateman" dataType="TEXT"     :precision="0"
@@ -82,7 +76,8 @@ dataType="HTMLTEXT"     :precision="0"
 <i-col v-show="detailsModel.formitem15.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='formitem15' :itemRules="this.rules().formitem15" class='' :caption="$t('entities.ibizsample0001.main5_form.details.formitem15')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.formitem15.error" :isEmptyCaption="false" labelPos="LEFT">
     
-<app-span name='formitem15' :value="data.formitem15" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style="">  
+<app-span name='formitem15' :value="data.formitem15" dataType="DATETIME" valueFormat="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"     :precision="0"
+:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style="">  
 </app-span>
 
 </app-form-item>
@@ -184,6 +179,7 @@ dataType="HTMLTEXT"     :precision="0"
     :localContext ='{ }' 
     :localParam ='{ }' 
     :disabled="detailsModel.formitem13.disabled"  
+    valueType="string"
     placeholder='请选择...' style="">
  </dropdown-list-dynamic>
 </app-form-item>
@@ -616,7 +612,6 @@ export default class Main5Base extends Vue implements ControlInterface {
         formitem7: null,
         formitem8: null,
         formitem9: null,
-        formitem1: null,
         updateman: null,
         formitem11: null,
         formitem12: null,
@@ -671,7 +666,7 @@ export default class Main5Base extends Vue implements ControlInterface {
      * @type {string}
      * @memberof Main5Base
      */
-    public majorMessageField: string = "";
+    public majorMessageField: string = "formitem3";
 
     /**
      * 值规则
@@ -694,12 +689,8 @@ export default class Main5Base extends Vue implements ControlInterface {
             { required: this.detailsModel.formitem8.required, type: 'string', message: '文件(支持拖拽) 值不能为空', trigger: 'blur' },
         ],
         formitem9: [
-            { required: this.detailsModel.formitem9.required, type: 'string', message: '磁盘文件 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.formitem9.required, type: 'string', message: '磁盘文件 值不能为空', trigger: 'blur' },
-        ],
-        formitem1: [
-            { required: this.detailsModel.formitem1.required, type: 'string', message: '标签 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.formitem1.required, type: 'string', message: '标签 值不能为空', trigger: 'blur' },
+            { required: this.detailsModel.formitem9.required, type: 'number', message: '磁盘文件 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.formitem9.required, type: 'number', message: '磁盘文件 值不能为空', trigger: 'blur' },
         ],
         updateman: [
             { required: this.detailsModel.updateman.required, type: 'string', message: '颜色 值不能为空', trigger: 'change' },
@@ -718,8 +709,8 @@ export default class Main5Base extends Vue implements ControlInterface {
             { required: this.detailsModel.formitem15.required, type: 'string', message: '多久之前 值不能为空', trigger: 'blur' },
         ],
         formitem5: [
-            { required: this.detailsModel.formitem5.required, type: 'string', message: '图片(信息展示) 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.formitem5.required, type: 'string', message: '图片(信息展示) 值不能为空', trigger: 'blur' },
+            { required: this.detailsModel.formitem5.required, type: 'number', message: '图片(信息展示) 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.formitem5.required, type: 'number', message: '图片(信息展示) 值不能为空', trigger: 'blur' },
         ],
         formitem6: [
             { required: this.detailsModel.formitem6.required, type: 'string', message: '图片(可旋转) 值不能为空', trigger: 'change' },
@@ -893,8 +884,6 @@ export default class Main5Base extends Vue implements ControlInterface {
         formitem8: new FormItemModel({ caption: '文件(支持拖拽)', detailType: 'FORMITEM', name: 'formitem8', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         formitem9: new FormItemModel({ caption: '磁盘文件', detailType: 'FORMITEM', name: 'formitem9', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
-, 
-        formitem1: new FormItemModel({ caption: '标签', detailType: 'FORMITEM', name: 'formitem1', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         updateman: new FormItemModel({ caption: '颜色', detailType: 'FORMITEM', name: 'updateman', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
@@ -1068,18 +1057,6 @@ export default class Main5Base extends Vue implements ControlInterface {
         this.formDataChange({ name: 'formitem9', newVal: newVal, oldVal: oldVal });
     }
 
-    /**
-     * 监控表单属性 formitem1 值
-     *
-     * @param {*} newVal
-     * @param {*} oldVal
-     * @memberof Main5Base
-     */
-    @Watch('data.formitem1')
-    onFormitem1Change(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'formitem1', newVal: newVal, oldVal: oldVal });
-    }
-
     /**
      * 监控表单属性 updateman 值
      *
@@ -1321,7 +1298,6 @@ export default class Main5Base extends Vue implements ControlInterface {
 
 
 
-
 
 
     }

app_Web/src/widgets/ibizsample0001/main5-form/main5-form-model.ts

@@ -57,23 +57,23 @@ export default class Main5Model {
       },
       {
         name: 'formitem2',
-        dataType:'FORMITEM',
+        prop: 'field19',
+        dataType: 'CURRENCY',
       },
       {
         name: 'formitem7',
-        dataType:'FORMITEM',
+        prop: 'field03',
+        dataType: 'LONGTEXT',
       },
       {
         name: 'formitem8',
-        dataType:'FORMITEM',
+        prop: 'field21',
+        dataType: 'DATETIME_BIRTHDAY',
       },
       {
         name: 'formitem9',
-        dataType:'FORMITEM',
-      },
-      {
-        name: 'formitem1',
-        dataType:'FORMITEM',
+        prop: 'field13',
+        dataType: 'NSCODELIST',
       },
       {
         name: 'updateman',
@@ -92,35 +92,43 @@ export default class Main5Model {
       },
       {
         name: 'formitem15',
-        dataType:'FORMITEM',
+        prop: 'updatedate',
+        dataType: 'DATETIME',
       },
       {
         name: 'formitem5',
-        dataType:'FORMITEM',
+        prop: 'field07',
+        dataType: 'DECIMAL',
       },
       {
         name: 'formitem6',
-        dataType:'FORMITEM',
+        prop: 'field22',
+        dataType: 'TEXT_EMAIL',
       },
       {
         name: 'formitem10',
-        dataType:'FORMITEM',
+        prop: 'field08',
+        dataType: 'DATETIME',
       },
       {
         name: 'formitem',
-        dataType:'FORMITEM',
+        prop: 'ibizsample0002name',
+        dataType: 'PICKUPTEXT',
       },
       {
         name: 'formitem3',
-        dataType:'FORMITEM',
+        prop: 'ibizsample0001name',
+        dataType: 'TEXT',
       },
       {
         name: 'formitem4',
-        dataType:'FORMITEM',
+        prop: 'field09',
+        dataType: 'DATE',
       },
       {
         name: 'formitem13',
-        dataType:'FORMITEM',
+        prop: 'field08',
+        dataType: 'DATETIME',
       },
       {
         name: 'formitem14',

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

@@ -9,15 +9,15 @@ public interface IBIZBOOKDataImport {
     @Mappings({
         @Mapping(target = "ibizbookid", source = "ibizbookid"),
         @Mapping(target = "createdate", source = "createdate"),
-        @Mapping(target = "press", source = "press"),
         @Mapping(target = "ibizbookname", source = "ibizbookname"),
-        @Mapping(target = "author", source = "author"),
         @Mapping(target = "updateman", source = "updateman"),
+        @Mapping(target = "updatedate", source = "updatedate"),
+        @Mapping(target = "type", source = "type"),
+        @Mapping(target = "press", source = "press"),
+        @Mapping(target = "author", source = "author"),
         @Mapping(target = "price", source = "price"),
         @Mapping(target = "booknumber", source = "booknumber"),
-        @Mapping(target = "updatedate", source = "updatedate"),
         @Mapping(target = "createman", source = "createman"),
-        @Mapping(target = "type", source = "type"),
     })
     @BeanMapping(ignoreByDefault = true)
     IBIZBOOK toDomain(IBIZBOOK entity);

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

@@ -8,10 +8,10 @@ import java.util.List;
 public interface IBIZOrderImport {
     @Mappings({
         @Mapping(target = "ibizorderid", source = "ibizorderid"),
-        @Mapping(target = "ibizordername", source = "ibizordername"),
         @Mapping(target = "ordertype", source = "ordertype"),
         @Mapping(target = "ordertime", source = "ordertime"),
         @Mapping(target = "orderuid", source = "orderuid"),
+        @Mapping(target = "ibizordername", source = "ibizordername"),
     })
     @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-477-2">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-479-2">
         <createTable tableName="T_IBIZBOOK">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -354,7 +354,7 @@
 
 
     <!--输出实体[IBIZSAMPLE0001]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizsample0001-169-14">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizsample0001-181-14">
         <createTable tableName="T_IBIZSAMPLE0001">
                 <column name="FIELD01" remarks="" type="VARCHAR(100)">
                 </column>
@@ -1108,7 +1108,7 @@
         <!--输出实体[IBIZQJ]外键关系 -->
         <!--输出实体[IBIZSAMPLE]外键关系 -->
         <!--输出实体[IBIZSAMPLE0001]外键关系 -->
-    <changeSet author="a_LAB01_df847bdfd" id="fk-ibizsample0001-169-39">
+    <changeSet author="a_LAB01_df847bdfd" id="fk-ibizsample0001-181-39">
        <addForeignKeyConstraint baseColumnNames="IBIZSAMPLE0002ID" baseTableName="T_IBIZSAMPLE0001" constraintName="DER1N_IBIZSAMPLE0001_IBIZSAMPL" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="IBIZSAMPLE0002ID" referencedTableName="T_IBIZSAMPLE0002" validate="true"/>
     </changeSet>
         <!--输出实体[IBIZSAMPLE0002]外键关系 -->

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

@@ -67,7 +67,7 @@
          </createView>
      </changeSet>
         <!--输出实体[IBIZSAMPLE0001]视图结构信息 runOnChange="true"  当视图发生变更时，通过liquibase强刷prod的视图，实现视图的同步-->
-     <changeSet author="a_LAB01_df847bdfd" id="view-ibizsample0001-169-13" runOnChange="true">
+     <changeSet author="a_LAB01_df847bdfd" id="view-ibizsample0001-181-13" runOnChange="true">
          <createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZSAMPLE0001">
                <![CDATA[ SELECT t1.[CREATEDATE], t1.[CREATEMAN], t1.[FIELD01], t1.[FIELD02], t1.[FIELD05], t1.[FIELD06], t1.[FIELD07], t1.[FIELD08], t1.[FIELD09], t1.[FIELD10], t1.[FIELD11], t1.[FIELD12], t1.[FIELD13], t1.[FIELD14], t1.[FIELD15], t1.[FIELD16], t1.[FIELD17], t1.[FIELD18], t1.[FIELD19], t1.[FIELD20], t1.[FIELD21], t1.[FIELD22], t1.[FIELD23], t1.[FIELD24], t1.[FIELD25], t1.[FIELD26], t1.[FIELD27], t1.[IBIZSAMPLE0001ID], t1.[IBIZSAMPLE0001NAME], t1.[UPDATEDATE], t1.[UPDATEMAN] FROM [T_IBIZSAMPLE0001] t1  ]]>
          </createView>