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

app_Web/public/assets/json/data-dictionary.json

@@ -452,6 +452,101 @@
             }
         ]
     }, 
+    {
+        "srfkey": "AppViewType",
+        "emptytext": "未定义",
+        "codelisttype":"static",
+        "items": [
+             {
+                "id": "SingleDataView",
+                "label": "单数据视图",
+                "text": "单数据视图",
+                "class":"",
+                "data":"",
+                "codename":"Singledataview",
+                "value": "SingleDataView",
+                
+                "disabled": false
+            }
+            , {
+                "id": "MultipleDataView",
+                "label": "多数据视图",
+                "text": "多数据视图",
+                "class":"",
+                "data":"",
+                "codename":"Multipledataview",
+                "value": "MultipleDataView",
+                
+                "disabled": false
+            }
+            , {
+                "id": "NavigationView",
+                "label": "导航视图",
+                "text": "导航视图",
+                "class":"",
+                "data":"",
+                "codename":"Navigationview",
+                "value": "NavigationView",
+                
+                "disabled": false
+            }
+            , {
+                "id": "SelectView",
+                "label": "选择视图",
+                "text": "选择视图",
+                "class":"",
+                "data":"",
+                "codename":"Selectview",
+                "value": "SelectView",
+                
+                "disabled": false
+            }
+            , {
+                "id": "WorkflowView",
+                "label": "工作流视图",
+                "text": "工作流视图",
+                "class":"",
+                "data":"",
+                "codename":"Workflowview",
+                "value": "WorkflowView",
+                
+                "disabled": false
+            }
+            , {
+                "id": "ApplicationView",
+                "label": "应用视图",
+                "text": "应用视图",
+                "class":"",
+                "data":"",
+                "codename":"Applicationview",
+                "value": "ApplicationView",
+                
+                "disabled": false
+            }
+            , {
+                "id": "FunctionalView",
+                "label": "功能视图",
+                "text": "功能视图",
+                "class":"",
+                "data":"",
+                "codename":"Functionalview",
+                "value": "FunctionalView",
+                
+                "disabled": false
+            }
+            , {
+                "id": "OtherView",
+                "label": "其他视图",
+                "text": "其他视图",
+                "class":"",
+                "data":"",
+                "codename":"Otherview",
+                "value": "OtherView",
+                
+                "disabled": false
+            }
+        ]
+    }, 
     {
         "srfkey": "CodeList",
         "emptytext": "未定义",

app_Web/src/locale/lanres/codelist/codelist_en_US.ts

@@ -66,6 +66,17 @@ export default {
         "4": "类型3",
         "empty": ""
     },
+    AppViewType: {
+        "SingleDataView": "单数据视图",
+        "MultipleDataView": "多数据视图",
+        "NavigationView": "导航视图",
+        "SelectView": "选择视图",
+        "WorkflowView": "工作流视图",
+        "ApplicationView": "应用视图",
+        "FunctionalView": "功能视图",
+        "OtherView": "其他视图",
+        "empty": ""
+    },
     CodeList: {
         "100": "第一图书馆",
         "300": "第三图书馆",

app_Web/src/locale/lanres/codelist/codelist_zh_CN.ts

@@ -66,6 +66,17 @@ export default {
         "4": "类型3",
         "empty": "",
     },
+    AppViewType: {
+        "SingleDataView": "单数据视图",
+        "MultipleDataView": "多数据视图",
+        "NavigationView": "导航视图",
+        "SelectView": "选择视图",
+        "WorkflowView": "工作流视图",
+        "ApplicationView": "应用视图",
+        "FunctionalView": "功能视图",
+        "OtherView": "其他视图",
+        "empty": "",
+    },
     CodeList: {
         "100": "第一图书馆",
         "300": "第三图书馆",

app_Web/src/locale/lanres/entities/ibizappctrl/ibizappctrl_en_US.ts

@@ -49,8 +49,8 @@ export default {
 	main_grid: {
 		columns: {
 			ibizappctrlname: "应用部件名称",
-			updateman: "更新人",
-			updatedate: "更新时间",
+			ibizappctrltype: "应用部件类型",
+			ctrldescription: "部件描述",
 		},
 		nodata:"",
 		uiactions: {

app_Web/src/locale/lanres/entities/ibizappctrl/ibizappctrl_zh_CN.ts

@@ -48,8 +48,8 @@ export default {
 	main_grid: {
 		columns: {
 			ibizappctrlname: "应用部件名称",
-			updateman: "更新人",
-			updatedate: "更新时间",
+			ibizappctrltype: "应用部件类型",
+			ctrldescription: "部件描述",
 		},
 		nodata:"",
 		uiactions: {

app_Web/src/locale/lanres/entities/ibizappeditor/ibizappeditor_en_US.ts

@@ -49,8 +49,8 @@ export default {
 	main_grid: {
 		columns: {
 			ibizappeditorname: "编辑器名称",
-			updateman: "更新人",
-			updatedate: "更新时间",
+			ibizappeditortype: "编辑器类型",
+			rditordescription: "编辑器描述",
 		},
 		nodata:"",
 		uiactions: {

app_Web/src/locale/lanres/entities/ibizappeditor/ibizappeditor_zh_CN.ts

@@ -48,8 +48,8 @@ export default {
 	main_grid: {
 		columns: {
 			ibizappeditorname: "编辑器名称",
-			updateman: "更新人",
-			updatedate: "更新时间",
+			ibizappeditortype: "编辑器类型",
+			rditordescription: "编辑器描述",
 		},
 		nodata:"",
 		uiactions: {

app_Web/src/locale/lanres/entities/ibizappview/ibizappview_en_US.ts

@@ -47,8 +47,10 @@ export default {
 	main_grid: {
 		columns: {
 			ibizappviewname: "应用视图名称",
-			updateman: "更新人",
-			updatedate: "更新时间",
+			ibizappviewtype: "应用视图类型",
+			documentaddress: "文档地址",
+			instanceaddress: "示例地址",
+			viewdescription: "视图描述",
 		},
 		nodata:"",
 		uiactions: {

app_Web/src/locale/lanres/entities/ibizappview/ibizappview_zh_CN.ts

@@ -46,8 +46,10 @@ export default {
 	main_grid: {
 		columns: {
 			ibizappviewname: "应用视图名称",
-			updateman: "更新人",
-			updatedate: "更新时间",
+			ibizappviewtype: "应用视图类型",
+			documentaddress: "文档地址",
+			instanceaddress: "示例地址",
+			viewdescription: "视图描述",
 		},
 		nodata:"",
 		uiactions: {

app_Web/src/mock/codelist/codelist.ts

@@ -460,6 +460,101 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
             },
         ]
     },
+    {
+        srfkey: "AppViewType",
+        emptytext: "未定义",
+        "codelisttype":"static",
+        items: [
+            {
+                id: "SingleDataView",
+                label: "单数据视图",
+                text: "单数据视图",
+                "class":"",
+                "data":"",
+                "codename":"Singledataview",
+                value: "SingleDataView",
+                
+                disabled: false,
+            },
+            {
+                id: "MultipleDataView",
+                label: "多数据视图",
+                text: "多数据视图",
+                "class":"",
+                "data":"",
+                "codename":"Multipledataview",
+                value: "MultipleDataView",
+                
+                disabled: false,
+            },
+            {
+                id: "NavigationView",
+                label: "导航视图",
+                text: "导航视图",
+                "class":"",
+                "data":"",
+                "codename":"Navigationview",
+                value: "NavigationView",
+                
+                disabled: false,
+            },
+            {
+                id: "SelectView",
+                label: "选择视图",
+                text: "选择视图",
+                "class":"",
+                "data":"",
+                "codename":"Selectview",
+                value: "SelectView",
+                
+                disabled: false,
+            },
+            {
+                id: "WorkflowView",
+                label: "工作流视图",
+                text: "工作流视图",
+                "class":"",
+                "data":"",
+                "codename":"Workflowview",
+                value: "WorkflowView",
+                
+                disabled: false,
+            },
+            {
+                id: "ApplicationView",
+                label: "应用视图",
+                text: "应用视图",
+                "class":"",
+                "data":"",
+                "codename":"Applicationview",
+                value: "ApplicationView",
+                
+                disabled: false,
+            },
+            {
+                id: "FunctionalView",
+                label: "功能视图",
+                text: "功能视图",
+                "class":"",
+                "data":"",
+                "codename":"Functionalview",
+                value: "FunctionalView",
+                
+                disabled: false,
+            },
+            {
+                id: "OtherView",
+                label: "其他视图",
+                text: "其他视图",
+                "class":"",
+                "data":"",
+                "codename":"Otherview",
+                value: "OtherView",
+                
+                disabled: false,
+            },
+        ]
+    },
     {
         srfkey: "CodeList",
         emptytext: "未定义",

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

@@ -22,7 +22,7 @@
                 <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
             </template>
             <template v-if="getColumnState('ibizappctrlname')">
-                <el-table-column show-overflow-tooltip :prop="'ibizappctrlname'" :label="$t('entities.ibizappctrl.main_grid.columns.ibizappctrlname')" :width="150"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'ibizappctrlname'" :label="$t('entities.ibizappctrl.main_grid.columns.ibizappctrlname')" :width="350"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.ibizappctrl.main_grid.columns.ibizappctrlname')}}
@@ -33,29 +33,27 @@
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('updateman')">
-                <el-table-column show-overflow-tooltip :prop="'updateman'" :label="$t('entities.ibizappctrl.main_grid.columns.updateman')" :width="150"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('ibizappctrltype')">
+                <el-table-column show-overflow-tooltip :prop="'ibizappctrltype'" :label="$t('entities.ibizappctrl.main_grid.columns.ibizappctrltype')" :width="350"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
-                        {{$t('entities.ibizappctrl.main_grid.columns.updateman')}}
+                        {{$t('entities.ibizappctrl.main_grid.columns.ibizappctrltype')}}
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <template >
-            <codelist :value="row.updateman" tag='SysOperator' codelistType='DYNAMIC' ></codelist>
-                        </template>
+                        <span>{{row.ibizappctrltype}}</span>
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('updatedate')">
-                <el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.ibizappctrl.main_grid.columns.updatedate')" :width="150"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('ctrldescription')">
+                <el-table-column show-overflow-tooltip :prop="'ctrldescription'" :label="$t('entities.ibizappctrl.main_grid.columns.ctrldescription')" :width="350"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
-                        {{$t('entities.ibizappctrl.main_grid.columns.updatedate')}}
+                        {{$t('entities.ibizappctrl.main_grid.columns.ctrldescription')}}
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <app-format-data format="YYYY-MM-DD HH:mm:ss" :data="row.updatedate"></app-format-data>
+                        <span>{{row.ctrldescription}}</span>
                     </template>
                 </el-table-column>
             </template>
@@ -626,18 +624,18 @@ export default class MainBase extends Vue implements ControlInterface {
             enableCond: 3 ,
         },
         {
-            name: 'updateman',
-            label: '更新人',
-            langtag: 'entities.ibizappctrl.main_grid.columns.updateman',
+            name: 'ibizappctrltype',
+            label: '应用部件类型',
+            langtag: 'entities.ibizappctrl.main_grid.columns.ibizappctrltype',
             show: true,
             unit: 'PX',
             isEnableRowEdit: false,
             enableCond: 3 ,
         },
         {
-            name: 'updatedate',
-            label: '更新时间',
-            langtag: 'entities.ibizappctrl.main_grid.columns.updatedate',
+            name: 'ctrldescription',
+            label: '部件描述',
+            langtag: 'entities.ibizappctrl.main_grid.columns.ctrldescription',
             show: true,
             unit: 'PX',
             isEnableRowEdit: false,
@@ -1123,14 +1121,6 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public async formatExcelData(filterVal:any, jsonData:any) {
         let codelistColumns:Array<any> = [
-            {
-                name: 'updateman',
-                srfkey: 'SysOperator',
-                codelistType : 'DYNAMIC',
-                renderMode: 'other',
-                textSeparator: '、',
-                valueSeparator: ',',
-            },
         ];
         let _this = this;
         for (const codelist of codelistColumns) {
@@ -1337,7 +1327,7 @@ export default class MainBase extends Vue implements ControlInterface {
     * @memberof MainBase
     */
     public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
-        let allColumns:Array<any> = ['ibizappctrlname','updateman','updatedate'];
+        let allColumns:Array<any> = ['ibizappctrlname','ibizappctrltype','ctrldescription'];
         if(row && row.children) {
             if(columnIndex == (this.isSingleSelect ? 0:1)) {
                 return [1, allColumns.length+1];
@@ -1418,8 +1408,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 groupById: Number((i+1)*100),
                 group: group.label,
                 ibizappctrlname:'',
-                updateman:'',
-                updatedate:'',
+                ibizappctrltype:'',
+                ctrldescription:'',
                 children: children
             }
             groupTree.push(tree);
@@ -1448,8 +1438,8 @@ export default class MainBase extends Vue implements ControlInterface {
             groupById: Number((allGroup.length+1)*100),
             group: this.$t('app.gridpage.other'),
             ibizappctrlname:'',
-            updateman:'',
-            updatedate:'',
+            ibizappctrltype:'',
+            ctrldescription:'',
             children: child
         }
         if(child && child.length > 0){
@@ -1511,8 +1501,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 groupById: Number((groupIndex+1)*100),
                 group: group,
                 ibizappctrlname:'',
-                updateman:'',
-                updatedate:'',
+                ibizappctrltype:'',
+                ctrldescription:'',
                 children: children,
             }
             groupTree.push(tree);

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

@@ -27,13 +27,13 @@ export default class MainModel {
     }else{
 		  return [
         {
-          name: 'ibizappctrlname',
-          prop: 'ibizappctrlname',
+          name: 'ibizappctrltype',
+          prop: 'ibizappctrltype',
           dataType: 'TEXT',
         },
         {
-          name: 'updateman',
-          prop: 'updateman',
+          name: 'ibizappctrlname',
+          prop: 'ibizappctrlname',
           dataType: 'TEXT',
         },
         {
@@ -42,9 +42,9 @@ export default class MainModel {
           dataType: 'GUID',
         },
         {
-          name: 'updatedate',
-          prop: 'updatedate',
-          dataType: 'DATETIME',
+          name: 'ctrldescription',
+          prop: 'ctrldescription',
+          dataType: 'TEXT',
         },
         {
           name: 'srfmajortext',

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

@@ -22,7 +22,7 @@
                 <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
             </template>
             <template v-if="getColumnState('ibizappeditorname')">
-                <el-table-column show-overflow-tooltip :prop="'ibizappeditorname'" :label="$t('entities.ibizappeditor.main_grid.columns.ibizappeditorname')" :width="150"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'ibizappeditorname'" :label="$t('entities.ibizappeditor.main_grid.columns.ibizappeditorname')" :width="350"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.ibizappeditor.main_grid.columns.ibizappeditorname')}}
@@ -33,29 +33,27 @@
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('updateman')">
-                <el-table-column show-overflow-tooltip :prop="'updateman'" :label="$t('entities.ibizappeditor.main_grid.columns.updateman')" :width="150"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('ibizappeditortype')">
+                <el-table-column show-overflow-tooltip :prop="'ibizappeditortype'" :label="$t('entities.ibizappeditor.main_grid.columns.ibizappeditortype')" :width="350"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
-                        {{$t('entities.ibizappeditor.main_grid.columns.updateman')}}
+                        {{$t('entities.ibizappeditor.main_grid.columns.ibizappeditortype')}}
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <template >
-            <codelist :value="row.updateman" tag='SysOperator' codelistType='DYNAMIC' ></codelist>
-                        </template>
+                        <span>{{row.ibizappeditortype}}</span>
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('updatedate')">
-                <el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.ibizappeditor.main_grid.columns.updatedate')" :width="150"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('rditordescription')">
+                <el-table-column show-overflow-tooltip :prop="'rditordescription'" :label="$t('entities.ibizappeditor.main_grid.columns.rditordescription')" :width="350"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
-                        {{$t('entities.ibizappeditor.main_grid.columns.updatedate')}}
+                        {{$t('entities.ibizappeditor.main_grid.columns.rditordescription')}}
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <app-format-data format="YYYY-MM-DD HH:mm:ss" :data="row.updatedate"></app-format-data>
+                        <span>{{row.rditordescription}}</span>
                     </template>
                 </el-table-column>
             </template>
@@ -626,18 +624,18 @@ export default class MainBase extends Vue implements ControlInterface {
             enableCond: 3 ,
         },
         {
-            name: 'updateman',
-            label: '更新人',
-            langtag: 'entities.ibizappeditor.main_grid.columns.updateman',
+            name: 'ibizappeditortype',
+            label: '编辑器类型',
+            langtag: 'entities.ibizappeditor.main_grid.columns.ibizappeditortype',
             show: true,
             unit: 'PX',
             isEnableRowEdit: false,
             enableCond: 3 ,
         },
         {
-            name: 'updatedate',
-            label: '更新时间',
-            langtag: 'entities.ibizappeditor.main_grid.columns.updatedate',
+            name: 'rditordescription',
+            label: '编辑器描述',
+            langtag: 'entities.ibizappeditor.main_grid.columns.rditordescription',
             show: true,
             unit: 'PX',
             isEnableRowEdit: false,
@@ -1123,14 +1121,6 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public async formatExcelData(filterVal:any, jsonData:any) {
         let codelistColumns:Array<any> = [
-            {
-                name: 'updateman',
-                srfkey: 'SysOperator',
-                codelistType : 'DYNAMIC',
-                renderMode: 'other',
-                textSeparator: '、',
-                valueSeparator: ',',
-            },
         ];
         let _this = this;
         for (const codelist of codelistColumns) {
@@ -1337,7 +1327,7 @@ export default class MainBase extends Vue implements ControlInterface {
     * @memberof MainBase
     */
     public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
-        let allColumns:Array<any> = ['ibizappeditorname','updateman','updatedate'];
+        let allColumns:Array<any> = ['ibizappeditorname','ibizappeditortype','rditordescription'];
         if(row && row.children) {
             if(columnIndex == (this.isSingleSelect ? 0:1)) {
                 return [1, allColumns.length+1];
@@ -1418,8 +1408,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 groupById: Number((i+1)*100),
                 group: group.label,
                 ibizappeditorname:'',
-                updateman:'',
-                updatedate:'',
+                ibizappeditortype:'',
+                rditordescription:'',
                 children: children
             }
             groupTree.push(tree);
@@ -1448,8 +1438,8 @@ export default class MainBase extends Vue implements ControlInterface {
             groupById: Number((allGroup.length+1)*100),
             group: this.$t('app.gridpage.other'),
             ibizappeditorname:'',
-            updateman:'',
-            updatedate:'',
+            ibizappeditortype:'',
+            rditordescription:'',
             children: child
         }
         if(child && child.length > 0){
@@ -1511,8 +1501,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 groupById: Number((groupIndex+1)*100),
                 group: group,
                 ibizappeditorname:'',
-                updateman:'',
-                updatedate:'',
+                ibizappeditortype:'',
+                rditordescription:'',
                 children: children,
             }
             groupTree.push(tree);

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

@@ -32,14 +32,14 @@ export default class MainModel {
           dataType: 'TEXT',
         },
         {
-          name: 'updateman',
-          prop: 'updateman',
+          name: 'ibizappeditortype',
+          prop: 'ibizappeditortype',
           dataType: 'TEXT',
         },
         {
-          name: 'updatedate',
-          prop: 'updatedate',
-          dataType: 'DATETIME',
+          name: 'rditordescription',
+          prop: 'rditordescription',
+          dataType: 'TEXT',
         },
         {
           name: 'srfmajortext',

app_Web/src/widgets/ibizappview/main-form/main-form-base.vue

@@ -21,14 +21,21 @@
 </i-col>
 <i-col v-show="detailsModel.ibizappviewtype.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='ibizappviewtype' :itemRules="this.rules().ibizappviewtype" class='' :caption="$t('entities.ibizappview.main_form.details.ibizappviewtype')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.ibizappviewtype.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box 
-    v-model="data.ibizappviewtype"  
-    @enter="onEnter($event)"  
-     unit=""  
+    
+ <dropdown-list 
+    v-model="data.ibizappviewtype" 
+    :data="data" 
+    :context="context"
+    :viewparams="viewparams"
+    :formState="formState" 
+    :localContext ='{ }' 
+    :localParam ='{ }' 
     :disabled="detailsModel.ibizappviewtype.disabled" 
-    type='text' 
-    style="">
-</input-box>
+    valueType="string"
+    tag='AppViewType' 
+    codelistType='STATIC'
+    placeholder='请选择...' style="">
+ </dropdown-list>
 
 </app-form-item>
 

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

@@ -22,7 +22,7 @@
                 <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
             </template>
             <template v-if="getColumnState('ibizappviewname')">
-                <el-table-column show-overflow-tooltip :prop="'ibizappviewname'" :label="$t('entities.ibizappview.main_grid.columns.ibizappviewname')" :width="150"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'ibizappviewname'" :label="$t('entities.ibizappview.main_grid.columns.ibizappviewname')" :width="350"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.ibizappview.main_grid.columns.ibizappviewname')}}
@@ -33,29 +33,53 @@
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('updateman')">
-                <el-table-column show-overflow-tooltip :prop="'updateman'" :label="$t('entities.ibizappview.main_grid.columns.updateman')" :width="150"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('ibizappviewtype')">
+                <el-table-column show-overflow-tooltip :prop="'ibizappviewtype'" :label="$t('entities.ibizappview.main_grid.columns.ibizappviewtype')" :width="350"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
-                        {{$t('entities.ibizappview.main_grid.columns.updateman')}}
+                        {{$t('entities.ibizappview.main_grid.columns.ibizappviewtype')}}
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
                         <template >
-            <codelist :value="row.updateman" tag='SysOperator' codelistType='DYNAMIC' ></codelist>
+            <codelist :value="row.ibizappviewtype" tag='AppViewType' codelistType='STATIC' ></codelist>
                         </template>
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('updatedate')">
-                <el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.ibizappview.main_grid.columns.updatedate')" :width="150"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('documentaddress')">
+                <el-table-column show-overflow-tooltip :prop="'documentaddress'" :label="$t('entities.ibizappview.main_grid.columns.documentaddress')" :width="350"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
-                        {{$t('entities.ibizappview.main_grid.columns.updatedate')}}
+                        {{$t('entities.ibizappview.main_grid.columns.documentaddress')}}
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <app-format-data format="YYYY-MM-DD HH:mm:ss" :data="row.updatedate"></app-format-data>
+                        <span>{{row.documentaddress}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('instanceaddress')">
+                <el-table-column show-overflow-tooltip :prop="'instanceaddress'" :label="$t('entities.ibizappview.main_grid.columns.instanceaddress')" :width="350"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibizappview.main_grid.columns.instanceaddress')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.instanceaddress}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('viewdescription')">
+                <el-table-column show-overflow-tooltip :prop="'viewdescription'" :label="$t('entities.ibizappview.main_grid.columns.viewdescription')" :min-width="100"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibizappview.main_grid.columns.viewdescription')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.viewdescription}}</span>
                     </template>
                 </el-table-column>
             </template>
@@ -626,23 +650,41 @@ export default class MainBase extends Vue implements ControlInterface {
             enableCond: 3 ,
         },
         {
-            name: 'updateman',
-            label: '更新人',
-            langtag: 'entities.ibizappview.main_grid.columns.updateman',
+            name: 'ibizappviewtype',
+            label: '应用视图类型',
+            langtag: 'entities.ibizappview.main_grid.columns.ibizappviewtype',
             show: true,
             unit: 'PX',
             isEnableRowEdit: false,
             enableCond: 3 ,
         },
         {
-            name: 'updatedate',
-            label: '更新时间',
-            langtag: 'entities.ibizappview.main_grid.columns.updatedate',
+            name: 'documentaddress',
+            label: '文档地址',
+            langtag: 'entities.ibizappview.main_grid.columns.documentaddress',
             show: true,
             unit: 'PX',
             isEnableRowEdit: false,
             enableCond: 3 ,
         },
+        {
+            name: 'instanceaddress',
+            label: '示例地址',
+            langtag: 'entities.ibizappview.main_grid.columns.instanceaddress',
+            show: true,
+            unit: 'PX',
+            isEnableRowEdit: false,
+            enableCond: 3 ,
+        },
+        {
+            name: 'viewdescription',
+            label: '视图描述',
+            langtag: 'entities.ibizappview.main_grid.columns.viewdescription',
+            show: true,
+            unit: 'STAR',
+            isEnableRowEdit: false,
+            enableCond: 3 ,
+        },
     ]
 
     /**
@@ -1124,9 +1166,9 @@ export default class MainBase extends Vue implements ControlInterface {
     public async formatExcelData(filterVal:any, jsonData:any) {
         let codelistColumns:Array<any> = [
             {
-                name: 'updateman',
-                srfkey: 'SysOperator',
-                codelistType : 'DYNAMIC',
+                name: 'ibizappviewtype',
+                srfkey: 'AppViewType',
+                codelistType : 'STATIC',
                 renderMode: 'other',
                 textSeparator: '、',
                 valueSeparator: ',',
@@ -1337,7 +1379,7 @@ export default class MainBase extends Vue implements ControlInterface {
     * @memberof MainBase
     */
     public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
-        let allColumns:Array<any> = ['ibizappviewname','updateman','updatedate'];
+        let allColumns:Array<any> = ['ibizappviewname','ibizappviewtype','documentaddress','instanceaddress','viewdescription'];
         if(row && row.children) {
             if(columnIndex == (this.isSingleSelect ? 0:1)) {
                 return [1, allColumns.length+1];
@@ -1418,8 +1460,10 @@ export default class MainBase extends Vue implements ControlInterface {
                 groupById: Number((i+1)*100),
                 group: group.label,
                 ibizappviewname:'',
-                updateman:'',
-                updatedate:'',
+                ibizappviewtype:'',
+                documentaddress:'',
+                instanceaddress:'',
+                viewdescription:'',
                 children: children
             }
             groupTree.push(tree);
@@ -1448,8 +1492,10 @@ export default class MainBase extends Vue implements ControlInterface {
             groupById: Number((allGroup.length+1)*100),
             group: this.$t('app.gridpage.other'),
             ibizappviewname:'',
-            updateman:'',
-            updatedate:'',
+            ibizappviewtype:'',
+            documentaddress:'',
+            instanceaddress:'',
+            viewdescription:'',
             children: child
         }
         if(child && child.length > 0){
@@ -1511,8 +1557,10 @@ export default class MainBase extends Vue implements ControlInterface {
                 groupById: Number((groupIndex+1)*100),
                 group: group,
                 ibizappviewname:'',
-                updateman:'',
-                updatedate:'',
+                ibizappviewtype:'',
+                documentaddress:'',
+                instanceaddress:'',
+                viewdescription:'',
                 children: children,
             }
             groupTree.push(tree);

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

@@ -26,20 +26,25 @@ export default class MainModel {
       ]
     }else{
 		  return [
+        {
+          name: 'instanceaddress',
+          prop: 'instanceaddress',
+          dataType: 'TEXT',
+        },
         {
           name: 'ibizappviewid',
           prop: 'ibizappviewid',
           dataType: 'GUID',
         },
         {
-          name: 'updateman',
-          prop: 'updateman',
+          name: 'documentaddress',
+          prop: 'documentaddress',
           dataType: 'TEXT',
         },
         {
-          name: 'updatedate',
-          prop: 'updatedate',
-          dataType: 'DATETIME',
+          name: 'ibizappviewtype',
+          prop: 'ibizappviewtype',
+          dataType: 'TEXT',
         },
         {
           name: 'ibizappviewname',
@@ -62,6 +67,11 @@ export default class MainModel {
           dataType: 'GUID',
           isEditable:true
         },
+        {
+          name: 'viewdescription',
+          prop: 'viewdescription',
+          dataType: 'TEXT',
+        },
         {
           name: 'ibizappview',
           prop: 'ibizappviewid',

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

@@ -237,6 +237,14 @@ export default class UsrBase extends Vue implements ControlInterface {
             },
             labelField: 'text',
             columns: [
+                {
+                    label: '归还日期',
+                    value: 'returntime',
+                    render: (task: any) => {
+                        return this.getColumnValue(task, 'returntime')
+                    },
+                    width: 200,
+                },
                 {
                     label: '图书名称',
                     value: 'ibizbookname',
@@ -269,14 +277,6 @@ export default class UsrBase extends Vue implements ControlInterface {
                     },
                     width: 200,
                 },
-                {
-                    label: '归还日期',
-                    value: 'returntime',
-                    render: (task: any) => {
-                        return this.getColumnValue(task, 'returntime')
-                    },
-                    width: 200,
-                },
             ]
         }
     };

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

@@ -46,7 +46,7 @@
                 </el-table-column>
             </template>
             <template v-if="getColumnState('unit')">
-                <el-table-column show-overflow-tooltip :prop="'unit'" :label="$t('entities.ibizhardware.main_grid.columns.unit')" :width="100"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'unit'" :label="$t('entities.ibizhardware.main_grid.columns.unit')" :width="160"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.ibizhardware.main_grid.columns.unit')}}
@@ -58,7 +58,7 @@
                 </el-table-column>
             </template>
             <template v-if="getColumnState('unitprice')">
-                <el-table-column show-overflow-tooltip :prop="'unitprice'" :label="$t('entities.ibizhardware.main_grid.columns.unitprice')" :width="100"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'unitprice'" :label="$t('entities.ibizhardware.main_grid.columns.unitprice')" :width="160"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.ibizhardware.main_grid.columns.unitprice')}}
@@ -70,7 +70,7 @@
                 </el-table-column>
             </template>
             <template v-if="getColumnState('producer')">
-                <el-table-column show-overflow-tooltip :prop="'producer'" :label="$t('entities.ibizhardware.main_grid.columns.producer')" :width="150"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'producer'" :label="$t('entities.ibizhardware.main_grid.columns.producer')" :width="160"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.ibizhardware.main_grid.columns.producer')}}

app_Web/src/widgets/ibizsample0003/tree01-treeview/tree01-treeview-service.ts

@@ -222,6 +222,8 @@ export default class Tree01Service extends ControlService {
 
             Object.assign(treeNode, { id: strNodeId });
 
+            Object.assign(treeNode, { iconcls: 'fa fa-list-ul' });
+
             Object.assign(treeNode, { expanded: filter.isAutoexpand });
             Object.assign(treeNode, { leaf: false });
             Object.assign(treeNode, { nodeid: treeNode.srfkey });

app_Web/src/widgets/ibizsoftware-suit/main-grid/main-grid-base.vue

@@ -34,7 +34,7 @@
                 </el-table-column>
             </template>
             <template v-if="getColumnState('updateman')">
-                <el-table-column show-overflow-tooltip :prop="'updateman'" :label="$t('entities.ibizsoftwaresuit.main_grid.columns.updateman')" :width="150"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'updateman'" :label="$t('entities.ibizsoftwaresuit.main_grid.columns.updateman')" :width="200"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.ibizsoftwaresuit.main_grid.columns.updateman')}}
@@ -48,7 +48,7 @@
                 </el-table-column>
             </template>
             <template v-if="getColumnState('updatedate')">
-                <el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.ibizsoftwaresuit.main_grid.columns.updatedate')" :width="150"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.ibizsoftwaresuit.main_grid.columns.updatedate')" :width="200"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.ibizsoftwaresuit.main_grid.columns.updatedate')}}

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

@@ -34,7 +34,7 @@
                 </el-table-column>
             </template>
             <template v-if="getColumnState('ibizuniproducttype')">
-                <el-table-column show-overflow-tooltip :prop="'ibizuniproducttype'" :label="$t('entities.ibizuniproduct.main_grid.columns.ibizuniproducttype')" :width="100"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'ibizuniproducttype'" :label="$t('entities.ibizuniproduct.main_grid.columns.ibizuniproducttype')" :width="160"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.ibizuniproduct.main_grid.columns.ibizuniproducttype')}}
@@ -48,7 +48,7 @@
                 </el-table-column>
             </template>
             <template v-if="getColumnState('unit')">
-                <el-table-column show-overflow-tooltip :prop="'unit'" :label="$t('entities.ibizuniproduct.main_grid.columns.unit')" :width="100"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'unit'" :label="$t('entities.ibizuniproduct.main_grid.columns.unit')" :width="160"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.ibizuniproduct.main_grid.columns.unit')}}
@@ -60,7 +60,7 @@
                 </el-table-column>
             </template>
             <template v-if="getColumnState('unitprice')">
-                <el-table-column show-overflow-tooltip :prop="'unitprice'" :label="$t('entities.ibizuniproduct.main_grid.columns.unitprice')" :width="150"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'unitprice'" :label="$t('entities.ibizuniproduct.main_grid.columns.unitprice')" :width="160"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.ibizuniproduct.main_grid.columns.unitprice')}}
@@ -72,7 +72,7 @@
                 </el-table-column>
             </template>
             <template v-if="getColumnState('updatedate')">
-                <el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.ibizuniproduct.main_grid.columns.updatedate')" :width="145"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.ibizuniproduct.main_grid.columns.updatedate')" :width="180"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.ibizuniproduct.main_grid.columns.updatedate')}}

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 -Pweb
-      cd demo-app/demo-app-web
-      mvn -Pweb docker:build
-      mvn -Pweb docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/demo-app-web.yaml iBizDemo --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

demo-app/demo-app-web/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-app-web.jar
 
-EXPOSE 51001
+EXPOSE 8080
 
 ADD demo-app-web.jar /demo-app-web.jar

demo-app/demo-app-web/src/main/docker/demo-app-web.yaml

@@ -3,24 +3,9 @@ services:
   demo-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/demo-app-web:latest
     ports:
-      - "51001:51001"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=51001
-      - 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: