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

aecd5924 · ibizdev · 54b27c89 · aecd5924 · aecd5924 · aecd5924
--- a/app_Web/src/locale/lanres/entities/ibizsample0001/ibizsample0001_en_US.ts
+++ b/app_Web/src/locale/lanres/entities/ibizsample0001/ibizsample0001_en_US.ts
@@ -36,6 +36,10 @@ export default {
    ibizsample0002id: "首页图表数据源标识",
    ibizsample0002name: "示例实体02名称",
    color: "颜色",
+    ip: "IP地址",
+    address: "地址信息",
+    longitude: "经度",
+    latitude: "纬度",
  },
 	views: {
 		sf5editview: {
@@ -207,7 +211,13 @@ export default {
 	},
 	main5_form: {
 		details: {
-			group1: "示例实体01基本信息", 
+			group1: "用户自定义", 
+			grouppanel1: "文件控件", 
+			grouppanel2: "标签", 
+			grouppanel3: "图片控件", 
+			grouppanel4: "HTML编辑器", 
+			grouppanel5: "下拉列表框", 
+			grouppanel6: "数据选择", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
@@ -217,18 +227,22 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			formitem1: "标签", 
-			formitem: "HTML编辑框", 
-			formitem3: "多选穿梭框", 
-			formitem4: "	CRON表达式组件", 
 			formitem2: "用户自定义", 
-			formitem5: "图片(信息展示)", 
 			formitem7: "文件上传(信息展示)", 
 			formitem8: "文件(支持拖拽)", 
-			formitem6: "图片(可旋转)", 
 			formitem9: "磁盘文件", 
-			formitem10: "磁盘图片", 
+			formitem1: "标签", 
 			updateman: "标签(颜色)", 
+			formitem11: "标签（地址栏）", 
+			formitem12: "标签（格式化信息）", 
+			formitem5: "图片(信息展示)", 
+			formitem6: "图片(可旋转)", 
+			formitem10: "磁盘图片", 
+			formitem: "HTML编辑框", 
+			formitem3: "多选穿梭框", 
+			formitem4: "	CRON表达式组件", 
+			formitem13: "动态代码表国际化", 
+			formitem14: "地图定位", 
 			ibizsample0001id: "IBIZSAMPLE0001标识", 
 		},
 		uiactions: {

--- a/app_Web/src/locale/lanres/entities/ibizsample0001/ibizsample0001_zh_CN.ts
+++ b/app_Web/src/locale/lanres/entities/ibizsample0001/ibizsample0001_zh_CN.ts
@@ -35,6 +35,10 @@ export default {
    ibizsample0002id: "首页图表数据源标识",
    ibizsample0002name: "示例实体02名称",
    color: "颜色",
+    ip: "IP地址",
+    address: "地址信息",
+    longitude: "经度",
+    latitude: "纬度",
  },
 	views: {
 		sf5editview: {
@@ -206,7 +210,13 @@ export default {
 	},
 	main5_form: {
 		details: {
-			group1: "示例实体01基本信息", 
+			group1: "用户自定义", 
+			grouppanel1: "文件控件", 
+			grouppanel2: "标签", 
+			grouppanel3: "图片控件", 
+			grouppanel4: "HTML编辑器", 
+			grouppanel5: "下拉列表框", 
+			grouppanel6: "数据选择", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
@@ -216,18 +226,22 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			formitem1: "标签", 
-			formitem: "HTML编辑框", 
-			formitem3: "多选穿梭框", 
-			formitem4: "	CRON表达式组件", 
 			formitem2: "用户自定义", 
-			formitem5: "图片(信息展示)", 
 			formitem7: "文件上传(信息展示)", 
 			formitem8: "文件(支持拖拽)", 
-			formitem6: "图片(可旋转)", 
 			formitem9: "磁盘文件", 
-			formitem10: "磁盘图片", 
+			formitem1: "标签", 
 			updateman: "标签(颜色)", 
+			formitem11: "标签（地址栏）", 
+			formitem12: "标签（格式化信息）", 
+			formitem5: "图片(信息展示)", 
+			formitem6: "图片(可旋转)", 
+			formitem10: "磁盘图片", 
+			formitem: "HTML编辑框", 
+			formitem3: "多选穿梭框", 
+			formitem4: "	CRON表达式组件", 
+			formitem13: "动态代码表国际化", 
+			formitem14: "地图定位", 
 			ibizsample0001id: "IBIZSAMPLE0001标识", 
 		},
 		uiactions: {

--- a/app_Web/src/widgets/ibizbook/internal-func-grid/internal-func-grid-base.vue
+++ b/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},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","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},
-            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
-            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","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}
            }
        }
        if(Object.keys(importDataModel).length == 0){

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

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

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

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

--- a/app_Web/src/widgets/ibizbook/new-default-grid/new-default-grid-base.vue
+++ b/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},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","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},
-            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
-            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","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}
            }
        }
        if(Object.keys(importDataModel).length == 0){

--- a/app_Web/src/widgets/ibizbook/row-edit-grid/row-edit-grid-base.vue
+++ b/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},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","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},
-            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
-            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","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}
            }
        }
        if(Object.keys(importDataModel).length == 0){

--- a/app_Web/src/widgets/ibizbook/row-rules-grid/row-rules-grid-base.vue
+++ b/app_Web/src/widgets/ibizbook/row-rules-grid/row-rules-grid-base.vue
@@ -1236,17 +1236,17 @@ export default class RowRulesBase extends Vue implements ControlInterface {
            serviceName:'ibizbook',
            appDeLogicName:'图书',
            importData:{
+            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","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},
-            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
-            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","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}
            }
        }
        if(Object.keys(importDataModel).length == 0){

--- a/app_Web/src/widgets/ibizbook/rules-form-form/rules-form-form-base.vue
+++ b/app_Web/src/widgets/ibizbook/rules-form-form/rules-form-form-base.vue
@@ -709,30 +709,30 @@ export default class RulesFormBase extends Vue implements ControlInterface {
                        ]
                  },
                ],
-                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,
                  },
                ],
-                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,
                  },

--- a/app_Web/src/widgets/ibizbook/update-default-grid/update-default-grid-base.vue
+++ b/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},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","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},
-            "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
-            "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
-            "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","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}
            }
        }
        if(Object.keys(importDataModel).length == 0){

--- a/app_Web/src/widgets/ibizorder/main-grid/main-grid-base.vue
+++ b/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:{
-            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
+            "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},
-            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
+            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000}
            }
        }
        if(Object.keys(importDataModel).length == 0){

--- a/app_Web/src/widgets/ibizorder/uipart-0015-grid/uipart-0015-grid-base.vue
+++ b/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:{
-            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
+            "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},
-            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
+            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000}
            }
        }
        if(Object.keys(importDataModel).length == 0){

--- a/app_Web/src/widgets/ibizorder/uipart-0017-grid/uipart-0017-grid-base.vue
+++ b/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:{
-            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
+            "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},
-            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
+            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000}
            }
        }
        if(Object.keys(importDataModel).length == 0){

--- a/app_Web/src/widgets/ibizorder/uipart-0018-grid/uipart-0018-grid-base.vue
+++ b/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:{
-            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
+            "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},
-            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
+            "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000}
            }
        }
        if(Object.keys(importDataModel).length == 0){

--- a/app_Web/src/widgets/ibizsample0001/main4-form/main4-form-model.ts
+++ b/app_Web/src/widgets/ibizsample0001/main4-form/main4-form-model.ts
@@ -86,7 +86,8 @@ export default class Main4Model {
      },
      {
        name: 'f5',
-        dataType:'FORMITEM',
+        prop: 'ip',
+        dataType: 'TEXT',
      },
      {
        name: 'f6',

--- a/app_Web/src/widgets/ibizsample0001/main5-form/main5-form-base.vue
+++ b/app_Web/src/widgets/ibizsample0001/main5-form/main5-form-base.vue
@@ -5,76 +5,97 @@
            <i-col v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
    <app-form-group :uiService="appUIService" :data="transformData(data)" :manageContainerStatus="detailsModel.group1.manageContainerStatus"  :isManageContainer="detailsModel.group1.isManageContainer" @managecontainerclick="manageContainerClick('group1')" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.ibizsample0001.main5_form.details.group1')" :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>
+        <i-col v-show="detailsModel.formitem2.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='formitem2' :itemRules="this.rules().formitem2" class='' :caption="$t('entities.ibizsample0001.main5_form.details.formitem2')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.formitem2.error" :isEmptyCaption="false" labelPos="LEFT">
+    <avue-custom-form :isSubForm="false" :isParseString="false" :isFormData="false"  v-model="data.formitem2" :formData="data"  :formState="formState"></avue-custom-form>
 </app-form-item>

 </i-col>
-<i-col v-show="detailsModel.formitem.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='formitem' :itemRules="this.rules().formitem" class='' :caption="$t('entities.ibizsample0001.main5_form.details.formitem')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.formitem.error" :isEmptyCaption="false" labelPos="LEFT">
-    <span v-html="data.formitem"></span>
+    
+    </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.ibizsample0001.main5_form.details.grouppanel1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
+    <row>
+        <i-col v-show="detailsModel.formitem7.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='formitem7' :itemRules="this.rules().formitem7" class='' :caption="$t('entities.ibizsample0001.main5_form.details.formitem7')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.formitem7.error" :isEmptyCaption="false" labelPos="LEFT">
+    <app-upload-file-info name='formitem7' :value="data.formitem7" style=""></app-upload-file-info>
 </app-form-item>

 </i-col>
-<i-col v-show="detailsModel.formitem3.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='formitem3' :itemRules="this.rules().formitem3" class='' :caption="$t('entities.ibizsample0001.main5_form.details.formitem3')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.formitem3.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-transfer
-    v-model="data.formitem3"
-    :data="data"
-    :context="context"
-    :viewparams="viewparams"
-    :localContext ='{ }' 
-    :localParam ='{ }' 
-    :disabled="detailsModel.formitem3.disabled"  
-    placeholder='请选择...' style="" />
+<i-col v-show="detailsModel.formitem8.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='formitem8' :itemRules="this.rules().formitem8" class='' :caption="$t('entities.ibizsample0001.main5_form.details.formitem8')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.formitem8.error" :isEmptyCaption="false" labelPos="LEFT">
+    <app-file-upload  :isdrag="true" :formState="formState"  :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange" :data="JSON.stringify(this.data)" name='formitem8' :value="data.formitem8" :disabled="detailsModel.formitem8.disabled" :uploadparams='{}' :exportparams='{}' style="overflow: auto;"></app-file-upload>
 </app-form-item>

 </i-col>
-<i-col v-show="detailsModel.formitem4.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='formitem4' :itemRules="this.rules().formitem4" class='' :caption="$t('entities.ibizsample0001.main5_form.details.formitem4')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.formitem4.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<cron-editor
-    :disabled="detailsModel.formitem4.disabled"
-    placeholder='请选择...' />
+<i-col v-show="detailsModel.formitem9.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='formitem9' :itemRules="this.rules().formitem9" class='' :caption="$t('entities.ibizsample0001.main5_form.details.formitem9')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.formitem9.error" :isEmptyCaption="false" labelPos="LEFT">
+    <app-file-upload :formState="formState" :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange" :data="JSON.stringify(this.data)" name='formitem9' :value="data.formitem9" :disabled="detailsModel.formitem9.disabled" :uploadparams='{}' :exportparams='{}'  style="overflow: auto;"></app-file-upload>
+
 </app-form-item>

 </i-col>
-<i-col v-show="detailsModel.formitem2.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='formitem2' :itemRules="this.rules().formitem2" class='' :caption="$t('entities.ibizsample0001.main5_form.details.formitem2')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.formitem2.error" :isEmptyCaption="false" labelPos="LEFT">
-    <avue-custom-form :isSubForm="false" :isParseString="false" :isFormData="false"  v-model="data.formitem2" :formData="data"  :formState="formState"></avue-custom-form>
+    
+    </row>
+</app-form-group>
+
+</i-col>
+<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.formitem5.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='formitem5' :itemRules="this.rules().formitem5" class='' :caption="$t('entities.ibizsample0001.main5_form.details.formitem5')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.formitem5.error" :isEmptyCaption="false" labelPos="LEFT">
-     <app-image-preview :formState="formState" name='formitem5' :value="data.formitem5" style=""></app-image-preview>
+<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"
+:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style="">  
+</app-span>
+
 </app-form-item>

 </i-col>
-<i-col v-show="detailsModel.formitem7.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='formitem7' :itemRules="this.rules().formitem7" class='' :caption="$t('entities.ibizsample0001.main5_form.details.formitem7')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.formitem7.error" :isEmptyCaption="false" labelPos="LEFT">
-    <app-upload-file-info name='formitem7' :value="data.formitem7" style=""></app-upload-file-info>
+<i-col v-show="detailsModel.formitem11.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='formitem11' :itemRules="this.rules().formitem11" class='' :caption="$t('entities.ibizsample0001.main5_form.details.formitem11')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.formitem11.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+<app-span name='formitem11' :value="data.formitem11"   editorType="ADDRESSPICKUP"
+dataType="HTMLTEXT"     :precision="0"
+:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style="">  
+</app-span>
+
 </app-form-item>

 </i-col>
-<i-col v-show="detailsModel.formitem8.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='formitem8' :itemRules="this.rules().formitem8" class='' :caption="$t('entities.ibizsample0001.main5_form.details.formitem8')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.formitem8.error" :isEmptyCaption="false" labelPos="LEFT">
-    <app-file-upload  :isdrag="true" :formState="formState"  :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange" :data="JSON.stringify(this.data)" name='formitem8' :value="data.formitem8" :disabled="detailsModel.formitem8.disabled" :uploadparams='{}' :exportparams='{}' style="overflow: auto;"></app-file-upload>
+<i-col v-show="detailsModel.formitem12.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='formitem12' :itemRules="this.rules().formitem12" class='' :caption="$t('entities.ibizsample0001.main5_form.details.formitem12')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.formitem12.error" :isEmptyCaption="false" labelPos="LEFT">
+    <span v-html="data.formitem12"></span>
 </app-form-item>

 </i-col>
-<i-col v-show="detailsModel.formitem6.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='formitem6' :itemRules="this.rules().formitem6" class='' :caption="$t('entities.ibizsample0001.main5_form.details.formitem6')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.formitem6.error" :isEmptyCaption="false" labelPos="LEFT">
-     <app-image-romate :formState="formState" :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange" :data="this.data" name='formitem6' :disabled="detailsModel.formitem6.disabled" style=""></app-image-romate>
+    
+    </row>
+</app-form-group>

+</i-col>
+<i-col v-show="detailsModel.grouppanel3.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-group :uiService="appUIService" :data="transformData(data)" :manageContainerStatus="detailsModel.grouppanel3.manageContainerStatus"  :isManageContainer="detailsModel.grouppanel3.isManageContainer" @managecontainerclick="manageContainerClick('grouppanel3')" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel3.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.ibizsample0001.main5_form.details.grouppanel3')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
+    <row>
+        <i-col v-show="detailsModel.formitem5.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='formitem5' :itemRules="this.rules().formitem5" class='' :caption="$t('entities.ibizsample0001.main5_form.details.formitem5')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.formitem5.error" :isEmptyCaption="false" labelPos="LEFT">
+     <app-image-preview :formState="formState" name='formitem5' :value="data.formitem5" style=""></app-image-preview>
 </app-form-item>

 </i-col>
-<i-col v-show="detailsModel.formitem9.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='formitem9' :itemRules="this.rules().formitem9" class='' :caption="$t('entities.ibizsample0001.main5_form.details.formitem9')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.formitem9.error" :isEmptyCaption="false" labelPos="LEFT">
-    <app-file-upload :formState="formState" :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange" :data="JSON.stringify(this.data)" name='formitem9' :value="data.formitem9" :disabled="detailsModel.formitem9.disabled" :uploadparams='{}' :exportparams='{}'  style="overflow: auto;"></app-file-upload>
+<i-col v-show="detailsModel.formitem6.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='formitem6' :itemRules="this.rules().formitem6" class='' :caption="$t('entities.ibizsample0001.main5_form.details.formitem6')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.formitem6.error" :isEmptyCaption="false" labelPos="LEFT">
+     <app-image-romate :formState="formState" :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange" :data="this.data" name='formitem6' :disabled="detailsModel.formitem6.disabled" style=""></app-image-romate>

 </app-form-item>

@@ -97,13 +118,88 @@
 </app-form-item>

 </i-col>
-<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"
-:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style="">  
-</app-span>
+    </row>
+</app-form-group>
+
+</i-col>
+<i-col v-show="detailsModel.grouppanel4.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-group :uiService="appUIService" :data="transformData(data)" :manageContainerStatus="detailsModel.grouppanel4.manageContainerStatus"  :isManageContainer="detailsModel.grouppanel4.isManageContainer" @managecontainerclick="manageContainerClick('grouppanel4')" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel4.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.ibizsample0001.main5_form.details.grouppanel4')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
+    <row>
+        <i-col v-show="detailsModel.formitem.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='formitem' :itemRules="this.rules().formitem" class='' :caption="$t('entities.ibizsample0001.main5_form.details.formitem')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.formitem.error" :isEmptyCaption="false" labelPos="LEFT">
+    <span v-html="data.formitem"></span>
+</app-form-item>
+
+</i-col>
+    
+    </row>
+</app-form-group>
+
+</i-col>
+<i-col v-show="detailsModel.grouppanel5.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-group :uiService="appUIService" :data="transformData(data)" :manageContainerStatus="detailsModel.grouppanel5.manageContainerStatus"  :isManageContainer="detailsModel.grouppanel5.isManageContainer" @managecontainerclick="manageContainerClick('grouppanel5')" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel5.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.ibizsample0001.main5_form.details.grouppanel5')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
+    <row>
+        <i-col v-show="detailsModel.formitem3.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='formitem3' :itemRules="this.rules().formitem3" class='' :caption="$t('entities.ibizsample0001.main5_form.details.formitem3')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.formitem3.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+<app-transfer
+    v-model="data.formitem3"
+    :data="data"
+    :context="context"
+    :viewparams="viewparams"
+    :localContext ='{ }' 
+    :localParam ='{ }' 
+    :disabled="detailsModel.formitem3.disabled"  
+    placeholder='请选择...' style="" />
+</app-form-item>

+</i-col>
+<i-col v-show="detailsModel.formitem4.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='formitem4' :itemRules="this.rules().formitem4" class='' :caption="$t('entities.ibizsample0001.main5_form.details.formitem4')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.formitem4.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+<cron-editor
+    :disabled="detailsModel.formitem4.disabled"
+    placeholder='请选择...' />
+</app-form-item>
+
+</i-col>
+<i-col v-show="detailsModel.formitem13.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='formitem13' :itemRules="this.rules().formitem13" class='' :caption="$t('entities.ibizsample0001.main5_form.details.formitem13')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.formitem13.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+ <dropdown-list-dynamic 
+    v-model="data.formitem13" 
+    :data="data" 
+    :context="context"
+    :viewparams="viewparams"
+    :localContext ='{ }' 
+    :localParam ='{ }' 
+    :disabled="detailsModel.formitem13.disabled"  
+    placeholder='请选择...' style="">
+ </dropdown-list-dynamic>
+</app-form-item>
+
+</i-col>
+    
+    </row>
+</app-form-group>
+
+</i-col>
+<i-col v-show="detailsModel.grouppanel6.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-group :uiService="appUIService" :data="transformData(data)" :manageContainerStatus="detailsModel.grouppanel6.manageContainerStatus"  :isManageContainer="detailsModel.grouppanel6.isManageContainer" @managecontainerclick="manageContainerClick('grouppanel6')" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel6.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.ibizsample0001.main5_form.details.grouppanel6')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
+    <row>
+        <i-col v-show="detailsModel.formitem14.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='formitem14' :itemRules="this.rules().formitem14" class='' :caption="$t('entities.ibizsample0001.main5_form.details.formitem14')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.formitem14.error" :isEmptyCaption="false" labelPos="LEFT">
+    <app-map-position 
+    name="formitem14"
+    v-model="data.formitem14" 
+    :data="data" 
+    :formState="formState"
+    mode="address"
+    longitude="longitude"
+    latitude="latitude"
+    @itemChange="(val1, val2) => { onFormItemValueChange(val1); onFormItemValueChange(val2); }"
+/>
 </app-form-item>

 </i-col>
@@ -507,18 +603,22 @@ export default class Main5Base extends Vue implements ControlInterface {
        srfuf: null,
        srfdeid: null,
        srfsourcekey: null,
-        formitem1: null,
-        formitem: null,
-        formitem3: null,
-        formitem4: null,
        formitem2: null,
-        formitem5: null,
        formitem7: null,
        formitem8: null,
-        formitem6: null,
        formitem9: null,
-        formitem10: null,
+        formitem1: null,
        updateman: null,
+        formitem11: null,
+        formitem12: null,
+        formitem5: null,
+        formitem6: null,
+        formitem10: null,
+        formitem: null,
+        formitem3: null,
+        formitem4: null,
+        formitem13: null,
+        formitem14: null,
        ibizsample0001id: null,
        ibizsample0001:null,
    };
@@ -571,30 +671,10 @@ export default class Main5Base extends Vue implements ControlInterface {
     */
    public rules() :any {
    return {
-        formitem1: [
-            { required: this.detailsModel.formitem1.required, type: 'string', message: '标签 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.formitem1.required, type: 'string', message: '标签 值不能为空', trigger: 'blur' },
-        ],
-        formitem: [
-            { required: this.detailsModel.formitem.required, type: 'string', message: 'HTML编辑框 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.formitem.required, type: 'string', message: 'HTML编辑框 值不能为空', trigger: 'blur' },
-        ],
-        formitem3: [
-            { required: this.detailsModel.formitem3.required, type: 'string', message: '多选穿梭框 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.formitem3.required, type: 'string', message: '多选穿梭框 值不能为空', trigger: 'blur' },
-        ],
-        formitem4: [
-            { required: this.detailsModel.formitem4.required, type: 'string', message: '	CRON表达式组件 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.formitem4.required, type: 'string', message: '	CRON表达式组件 值不能为空', trigger: 'blur' },
-        ],
        formitem2: [
            { required: this.detailsModel.formitem2.required, type: 'string', message: '用户自定义 值不能为空', trigger: 'change' },
            { required: this.detailsModel.formitem2.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' },
-        ],
        formitem7: [
            { required: this.detailsModel.formitem7.required, type: 'string', message: '文件上传(信息展示) 值不能为空', trigger: 'change' },
            { required: this.detailsModel.formitem7.required, type: 'string', message: '文件上传(信息展示) 值不能为空', trigger: 'blur' },
@@ -603,22 +683,58 @@ export default class Main5Base extends Vue implements ControlInterface {
            { required: this.detailsModel.formitem8.required, type: 'string', message: '文件(支持拖拽) 值不能为空', trigger: 'change' },
            { required: this.detailsModel.formitem8.required, type: 'string', message: '文件(支持拖拽) 值不能为空', trigger: 'blur' },
        ],
-        formitem6: [
-            { required: this.detailsModel.formitem6.required, type: 'string', message: '图片(可旋转) 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.formitem6.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' },
        ],
-        formitem10: [
-            { required: this.detailsModel.formitem10.required, type: 'string', message: '磁盘图片 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.formitem10.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' },
        ],
        updateman: [
            { required: this.detailsModel.updateman.required, type: 'string', message: '标签(颜色) 值不能为空', trigger: 'change' },
            { required: this.detailsModel.updateman.required, type: 'string', message: '标签(颜色) 值不能为空', trigger: 'blur' },
        ],
+        formitem11: [
+            { required: this.detailsModel.formitem11.required, type: 'string', message: '标签（地址栏） 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.formitem11.required, type: 'string', message: '标签（地址栏） 值不能为空', trigger: 'blur' },
+        ],
+        formitem12: [
+            { required: this.detailsModel.formitem12.required, type: 'string', message: '标签（格式化信息） 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.formitem12.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' },
+        ],
+        formitem6: [
+            { required: this.detailsModel.formitem6.required, type: 'string', message: '图片(可旋转) 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.formitem6.required, type: 'string', message: '图片(可旋转) 值不能为空', trigger: 'blur' },
+        ],
+        formitem10: [
+            { required: this.detailsModel.formitem10.required, type: 'string', message: '磁盘图片 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.formitem10.required, type: 'string', message: '磁盘图片 值不能为空', trigger: 'blur' },
+        ],
+        formitem: [
+            { required: this.detailsModel.formitem.required, type: 'string', message: 'HTML编辑框 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.formitem.required, type: 'string', message: 'HTML编辑框 值不能为空', trigger: 'blur' },
+        ],
+        formitem3: [
+            { required: this.detailsModel.formitem3.required, type: 'string', message: '多选穿梭框 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.formitem3.required, type: 'string', message: '多选穿梭框 值不能为空', trigger: 'blur' },
+        ],
+        formitem4: [
+            { required: this.detailsModel.formitem4.required, type: 'string', message: '	CRON表达式组件 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.formitem4.required, type: 'string', message: '	CRON表达式组件 值不能为空', trigger: 'blur' },
+        ],
+        formitem13: [
+            { required: this.detailsModel.formitem13.required, type: 'string', message: '动态代码表国际化 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.formitem13.required, type: 'string', message: '动态代码表国际化 值不能为空', trigger: 'blur' },
+        ],
+        formitem14: [
+            { required: this.detailsModel.formitem14.required, type: 'string', message: '地图定位 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.formitem14.required, type: 'string', message: '地图定位 值不能为空', trigger: 'blur' },
+        ],
        }
    }

@@ -724,7 +840,19 @@ export default class Main5Base extends Vue implements ControlInterface {
     * @memberof Main5Base
     */
    public detailsModel: any = {
-        group1: new FormGroupPanelModel({ caption: '示例实体01基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, isControlledContent: false , uiActionGroup: { caption: '', langbase: 'entities.ibizsample0001.main5_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.ibizsample0001.main5_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.ibizsample0001.main5_form', extractMode: 'ITEM', details: [] }, isManageContainer: false, showMoreModeItems: []  })
+, 
+        grouppanel2: new FormGroupPanelModel({ caption: '标签', detailType: 'GROUPPANEL', name: 'grouppanel2', visible: true, isShowCaption: true, form: this, isControlledContent: false , uiActionGroup: { caption: '', langbase: 'entities.ibizsample0001.main5_form', extractMode: 'ITEM', details: [] }, isManageContainer: false, showMoreModeItems: []  })
+, 
+        grouppanel3: new FormGroupPanelModel({ caption: '图片控件', detailType: 'GROUPPANEL', name: 'grouppanel3', visible: true, isShowCaption: true, form: this, isControlledContent: false , uiActionGroup: { caption: '', langbase: 'entities.ibizsample0001.main5_form', extractMode: 'ITEM', details: [] }, isManageContainer: false, showMoreModeItems: []  })
+, 
+        grouppanel4: new FormGroupPanelModel({ caption: 'HTML编辑器', detailType: 'GROUPPANEL', name: 'grouppanel4', visible: true, isShowCaption: true, form: this, isControlledContent: false , uiActionGroup: { caption: '', langbase: 'entities.ibizsample0001.main5_form', extractMode: 'ITEM', details: [] }, isManageContainer: false, showMoreModeItems: []  })
+, 
+        grouppanel5: new FormGroupPanelModel({ caption: '下拉列表框', detailType: 'GROUPPANEL', name: 'grouppanel5', visible: true, isShowCaption: true, form: this, isControlledContent: false , uiActionGroup: { caption: '', langbase: 'entities.ibizsample0001.main5_form', extractMode: 'ITEM', details: [] }, isManageContainer: false, showMoreModeItems: []  })
+, 
+        grouppanel6: new FormGroupPanelModel({ caption: '数据选择', detailType: 'GROUPPANEL', name: 'grouppanel6', visible: true, isShowCaption: true, form: this, isControlledContent: false , uiActionGroup: { caption: '', langbase: 'entities.ibizsample0001.main5_form', extractMode: 'ITEM', details: [] }, isManageContainer: false, showMoreModeItems: []  })
 , 
        formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this, isControlledContent: false  })
 , 
@@ -744,29 +872,37 @@ export default class Main5Base extends Vue implements ControlInterface {
 , 
        srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', 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 })
+        formitem2: new FormItemModel({ caption: '用户自定义', detailType: 'FORMITEM', name: 'formitem2', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
-        formitem: new FormItemModel({ caption: 'HTML编辑框', detailType: 'FORMITEM', name: 'formitem', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+        formitem7: new FormItemModel({ caption: '文件上传(信息展示)', detailType: 'FORMITEM', name: 'formitem7', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
-        formitem3: new FormItemModel({ caption: '多选穿梭框', detailType: 'FORMITEM', name: 'formitem3', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+        formitem8: new FormItemModel({ caption: '文件(支持拖拽)', detailType: 'FORMITEM', name: 'formitem8', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
-        formitem4: new FormItemModel({ caption: '	CRON表达式组件', detailType: 'FORMITEM', name: 'formitem4', 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 })
 , 
-        formitem2: new FormItemModel({ caption: '用户自定义', detailType: 'FORMITEM', name: 'formitem2', 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 })
 , 
-        formitem5: new FormItemModel({ caption: '图片(信息展示)', detailType: 'FORMITEM', name: 'formitem5', 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 })
 , 
-        formitem7: new FormItemModel({ caption: '文件上传(信息展示)', detailType: 'FORMITEM', name: 'formitem7', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+        formitem11: new FormItemModel({ caption: '标签（地址栏）', detailType: 'FORMITEM', name: 'formitem11', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
-        formitem8: new FormItemModel({ caption: '文件(支持拖拽)', detailType: 'FORMITEM', name: 'formitem8', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+        formitem12: new FormItemModel({ caption: '标签（格式化信息）', detailType: 'FORMITEM', name: 'formitem12', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
-        formitem6: new FormItemModel({ caption: '图片(可旋转)', detailType: 'FORMITEM', name: 'formitem6', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+        formitem5: new FormItemModel({ caption: '图片(信息展示)', detailType: 'FORMITEM', name: 'formitem5', 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 })
+        formitem6: new FormItemModel({ caption: '图片(可旋转)', detailType: 'FORMITEM', name: 'formitem6', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
        formitem10: new FormItemModel({ caption: '磁盘图片', detailType: 'FORMITEM', name: 'formitem10', 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 })
+        formitem: new FormItemModel({ caption: 'HTML编辑框', detailType: 'FORMITEM', name: 'formitem', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        formitem3: new FormItemModel({ caption: '多选穿梭框', detailType: 'FORMITEM', name: 'formitem3', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        formitem4: new FormItemModel({ caption: '	CRON表达式组件', detailType: 'FORMITEM', name: 'formitem4', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        formitem13: new FormItemModel({ caption: '动态代码表国际化', detailType: 'FORMITEM', name: 'formitem13', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        formitem14: new FormItemModel({ caption: '地图定位', detailType: 'FORMITEM', name: 'formitem14', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
        ibizsample0001id: new FormItemModel({ caption: 'IBIZSAMPLE0001标识', detailType: 'FORMITEM', name: 'ibizsample0001id', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
@@ -869,123 +1005,123 @@ export default class Main5Base extends Vue implements ControlInterface {
    }

    /**
-     * 监控表单属性 formitem1 值
+     * 监控表单属性 formitem2 值
     *
     * @param {*} newVal
     * @param {*} oldVal
     * @memberof Main5Base
     */
-    @Watch('data.formitem1')
-    onFormitem1Change(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'formitem1', newVal: newVal, oldVal: oldVal });
+    @Watch('data.formitem2')
+    onFormitem2Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'formitem2', newVal: newVal, oldVal: oldVal });
    }

    /**
-     * 监控表单属性 formitem 值
+     * 监控表单属性 formitem7 值
     *
     * @param {*} newVal
     * @param {*} oldVal
     * @memberof Main5Base
     */
-    @Watch('data.formitem')
-    onFormitemChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'formitem', newVal: newVal, oldVal: oldVal });
+    @Watch('data.formitem7')
+    onFormitem7Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'formitem7', newVal: newVal, oldVal: oldVal });
    }

    /**
-     * 监控表单属性 formitem3 值
+     * 监控表单属性 formitem8 值
     *
     * @param {*} newVal
     * @param {*} oldVal
     * @memberof Main5Base
     */
-    @Watch('data.formitem3')
-    onFormitem3Change(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'formitem3', newVal: newVal, oldVal: oldVal });
+    @Watch('data.formitem8')
+    onFormitem8Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'formitem8', newVal: newVal, oldVal: oldVal });
    }

    /**
-     * 监控表单属性 formitem4 值
+     * 监控表单属性 formitem9 值
     *
     * @param {*} newVal
     * @param {*} oldVal
     * @memberof Main5Base
     */
-    @Watch('data.formitem4')
-    onFormitem4Change(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'formitem4', newVal: newVal, oldVal: oldVal });
+    @Watch('data.formitem9')
+    onFormitem9Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'formitem9', newVal: newVal, oldVal: oldVal });
    }

    /**
-     * 监控表单属性 formitem2 值
+     * 监控表单属性 formitem1 值
     *
     * @param {*} newVal
     * @param {*} oldVal
     * @memberof Main5Base
     */
-    @Watch('data.formitem2')
-    onFormitem2Change(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'formitem2', newVal: newVal, oldVal: oldVal });
+    @Watch('data.formitem1')
+    onFormitem1Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'formitem1', newVal: newVal, oldVal: oldVal });
    }

    /**
-     * 监控表单属性 formitem5 值
+     * 监控表单属性 updateman 值
     *
     * @param {*} newVal
     * @param {*} oldVal
     * @memberof Main5Base
     */
-    @Watch('data.formitem5')
-    onFormitem5Change(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'formitem5', newVal: newVal, oldVal: oldVal });
+    @Watch('data.updateman')
+    onUpdatemanChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'updateman', newVal: newVal, oldVal: oldVal });
    }

    /**
-     * 监控表单属性 formitem7 值
+     * 监控表单属性 formitem11 值
     *
     * @param {*} newVal
     * @param {*} oldVal
     * @memberof Main5Base
     */
-    @Watch('data.formitem7')
-    onFormitem7Change(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'formitem7', newVal: newVal, oldVal: oldVal });
+    @Watch('data.formitem11')
+    onFormitem11Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'formitem11', newVal: newVal, oldVal: oldVal });
    }

    /**
-     * 监控表单属性 formitem8 值
+     * 监控表单属性 formitem12 值
     *
     * @param {*} newVal
     * @param {*} oldVal
     * @memberof Main5Base
     */
-    @Watch('data.formitem8')
-    onFormitem8Change(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'formitem8', newVal: newVal, oldVal: oldVal });
+    @Watch('data.formitem12')
+    onFormitem12Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'formitem12', newVal: newVal, oldVal: oldVal });
    }

    /**
-     * 监控表单属性 formitem6 值
+     * 监控表单属性 formitem5 值
     *
     * @param {*} newVal
     * @param {*} oldVal
     * @memberof Main5Base
     */
-    @Watch('data.formitem6')
-    onFormitem6Change(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'formitem6', newVal: newVal, oldVal: oldVal });
+    @Watch('data.formitem5')
+    onFormitem5Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'formitem5', newVal: newVal, oldVal: oldVal });
    }

    /**
-     * 监控表单属性 formitem9 值
+     * 监控表单属性 formitem6 值
     *
     * @param {*} newVal
     * @param {*} oldVal
     * @memberof Main5Base
     */
-    @Watch('data.formitem9')
-    onFormitem9Change(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'formitem9', newVal: newVal, oldVal: oldVal });
+    @Watch('data.formitem6')
+    onFormitem6Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'formitem6', newVal: newVal, oldVal: oldVal });
    }

    /**
@@ -1001,15 +1137,63 @@ export default class Main5Base extends Vue implements ControlInterface {
    }

    /**
-     * 监控表单属性 updateman 值
+     * 监控表单属性 formitem 值
     *
     * @param {*} newVal
     * @param {*} oldVal
     * @memberof Main5Base
     */
-    @Watch('data.updateman')
-    onUpdatemanChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'updateman', newVal: newVal, oldVal: oldVal });
+    @Watch('data.formitem')
+    onFormitemChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'formitem', newVal: newVal, oldVal: oldVal });
+    }
+
+    /**
+     * 监控表单属性 formitem3 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof Main5Base
+     */
+    @Watch('data.formitem3')
+    onFormitem3Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'formitem3', newVal: newVal, oldVal: oldVal });
+    }
+
+    /**
+     * 监控表单属性 formitem4 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof Main5Base
+     */
+    @Watch('data.formitem4')
+    onFormitem4Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'formitem4', newVal: newVal, oldVal: oldVal });
+    }
+
+    /**
+     * 监控表单属性 formitem13 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof Main5Base
+     */
+    @Watch('data.formitem13')
+    onFormitem13Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'formitem13', newVal: newVal, oldVal: oldVal });
+    }
+
+    /**
+     * 监控表单属性 formitem14 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof Main5Base
+     */
+    @Watch('data.formitem14')
+    onFormitem14Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'formitem14', newVal: newVal, oldVal: oldVal });
    }

    /**
@@ -1090,6 +1274,16 @@ export default class Main5Base extends Vue implements ControlInterface {



+
+
+
+
+
+
+
+
+
+




--- a/app_Web/src/widgets/ibizsample0001/main5-form/main5-form-model.ts
+++ b/app_Web/src/widgets/ibizsample0001/main5-form/main5-form-model.ts
@@ -56,53 +56,71 @@ export default class Main5Model {
        name: 'srfsourcekey',
      },
      {
-        name: 'formitem1',
+        name: 'formitem2',
        dataType:'FORMITEM',
      },
      {
-        name: 'formitem',
+        name: 'formitem7',
        dataType:'FORMITEM',
      },
      {
-        name: 'formitem3',
+        name: 'formitem8',
        dataType:'FORMITEM',
      },
      {
-        name: 'formitem4',
+        name: 'formitem9',
        dataType:'FORMITEM',
      },
      {
-        name: 'formitem2',
+        name: 'formitem1',
        dataType:'FORMITEM',
      },
+      {
+        name: 'updateman',
+        prop: 'color',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'formitem11',
+        prop: 'field04',
+        dataType: 'HTMLTEXT',
+      },
+      {
+        name: 'formitem12',
+        prop: 'field09',
+        dataType: 'DATE',
+      },
      {
        name: 'formitem5',
        dataType:'FORMITEM',
      },
      {
-        name: 'formitem7',
+        name: 'formitem6',
        dataType:'FORMITEM',
      },
      {
-        name: 'formitem8',
+        name: 'formitem10',
        dataType:'FORMITEM',
      },
      {
-        name: 'formitem6',
+        name: 'formitem',
        dataType:'FORMITEM',
      },
      {
-        name: 'formitem9',
+        name: 'formitem3',
        dataType:'FORMITEM',
      },
      {
-        name: 'formitem10',
+        name: 'formitem4',
        dataType:'FORMITEM',
      },
      {
-        name: 'updateman',
-        prop: 'color',
-        dataType: 'TEXT',
+        name: 'formitem13',
+        dataType:'FORMITEM',
+      },
+      {
+        name: 'formitem14',
+        dataType:'FORMITEM',
      },
      {
        name: 'ibizsample0001id',

--- a/config.xml
+++ b/config.xml
@@ -37,11 +37,6 @@
 	  git clone -b master $para2 demosys/
      export NODE_OPTIONS=--max-old-space-size=4096
      cd demosys/
-      mvn clean package -Pdemoapi
-      cd demo-provider/demo-provider-demoapi
-      mvn -Pdemoapi docker:build
-      mvn -Pdemoapi docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/demo-provider-demoapi.yaml iBizDemo --with-registry-auth      
      </command>
    </hudson.tasks.Shell>
  </builders>

--- a/demo-provider/demo-provider-demoapi/src/main/docker/Dockerfile
+++ b/demo-provider/demo-provider-demoapi/src/main/docker/Dockerfile
@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
    sleep ${IBIZ_SLEEP} && \
    java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /demo-provider-demoapi.jar

-EXPOSE 51000
+EXPOSE 8081

 ADD demo-provider-demoapi.jar /demo-provider-demoapi.jar
--- a/demo-provider/demo-provider-demoapi/src/main/docker/demo-provider-demoapi.yaml
+++ b/demo-provider/demo-provider-demoapi/src/main/docker/demo-provider-demoapi.yaml
@@ -3,24 +3,9 @@ services:
  demo-provider-demoapi:
    image: registry.cn-shanghai.aliyuncs.com/ibizsys/demo-provider-demoapi:latest
    ports:
-      - "51000:51000"
+      - "8081:8081"
    networks:
      - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=51000
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-      - SPRING_REDIS_HOST=172.16.240.110
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_df847bdfd
-      - SPRING_DATASOURCE_PASSWORD=3d6@460A
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_df847bdfd?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_df847bdfd
-      - NACOS=172.16.240.110:8848
-      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
-      - SEATA_ENABLED=true
    deploy:
      resources:
           limits: