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

app_Web/public/assets/json/view-message-group.json

@@ -110,6 +110,9 @@
 "VMGroup53":[
 {"tag":"ViewMsg52","position":"TOP","type":"ERROR"}
 ],
+"VMGroup55":[
+{"tag":"ViewMsg54","position":"TOP","type":"ERROR"}
+],
 "VMGroup26":[
 {"tag":"ViewMsg25","position":"TOP","type":"ERROR"}
 ],
@@ -155,10 +158,10 @@
 "VMGroup20":[
 {"tag":"ViewMsg19","position":"TOP","type":"ERROR"}
 ],
-"VMGroup11":[
-{"tag":"ViewMsg10","position":"TOP","type":"ERROR"}
-],
 "VMGroup15":[
 {"tag":"ViewMsg14","position":"TOP","type":"ERROR"}
+],
+"VMGroup11":[
+{"tag":"ViewMsg10","position":"TOP","type":"ERROR"}
 ]
 }
\ No newline at end of file

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

@@ -38,6 +38,7 @@ export default {
 			ibizappctrlid: "应用部件标识", 
 			ibizappctrlname: "应用部件名称", 
 			ibizappctrltype: "应用部件类型", 
+			documentaddress: "文档地址", 
 			ctrldescription: "部件描述", 
 			createman: "建立人", 
 			createdate: "建立时间", 
@@ -51,6 +52,7 @@ export default {
 		columns: {
 			ibizappctrlname: "应用部件名称",
 			ibizappctrltype: "应用部件类型",
+			documentaddress: "文档地址",
 			ctrldescription: "部件描述",
 		},
 		nodata:"",

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

@@ -37,6 +37,7 @@ export default {
 			ibizappctrlid: "应用部件标识", 
 			ibizappctrlname: "应用部件名称", 
 			ibizappctrltype: "应用部件类型", 
+			documentaddress: "文档地址", 
 			ctrldescription: "部件描述", 
 			createman: "建立人", 
 			createdate: "建立时间", 
@@ -50,6 +51,7 @@ export default {
 		columns: {
 			ibizappctrlname: "应用部件名称",
 			ibizappctrltype: "应用部件类型",
+			documentaddress: "文档地址",
 			ctrldescription: "部件描述",
 		},
 		nodata:"",

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

@@ -40,6 +40,9 @@ export default {
 			ibizappeditorid: "编辑器标识", 
 			ibizappeditorname: "编辑器名称", 
 			ibizappeditortype: "编辑器类型", 
+			documentaddress: "文档地址", 
+			inbuilteditoramount: "内置编辑器数量", 
+			expandeditoramount: "扩展编辑器数量", 
 			rditordescription: "编辑器描述", 
 			createman: "建立人", 
 			createdate: "建立时间", 
@@ -53,6 +56,8 @@ export default {
 		columns: {
 			ibizappeditorname: "编辑器名称",
 			ibizappeditortype: "编辑器类型",
+			inbuilteditoramount: "内置编辑器数量",
+			expandeditoramount: "扩展编辑器数量",
 			rditordescription: "编辑器描述",
 		},
 		nodata:"",

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

@@ -39,6 +39,9 @@ export default {
 			ibizappeditorid: "编辑器标识", 
 			ibizappeditorname: "编辑器名称", 
 			ibizappeditortype: "编辑器类型", 
+			documentaddress: "文档地址", 
+			inbuilteditoramount: "内置编辑器数量", 
+			expandeditoramount: "扩展编辑器数量", 
 			rditordescription: "编辑器描述", 
 			createman: "建立人", 
 			createdate: "建立时间", 
@@ -52,6 +55,8 @@ export default {
 		columns: {
 			ibizappeditorname: "编辑器名称",
 			ibizappeditortype: "编辑器类型",
+			inbuilteditoramount: "内置编辑器数量",
+			expandeditoramount: "扩展编辑器数量",
 			rditordescription: "编辑器描述",
 		},
 		nodata:"",

app_Web/src/message/message-service-register.ts

@@ -47,6 +47,7 @@ export class MessageServiceRegister {
         this.allMessageService.set('ViewMsg53', () => import('@/message/view-msg53/view-msg53-message'));
         this.allMessageService.set('ViewMsg2', () => import('@/message/view-msg2/view-msg2-message'));
         this.allMessageService.set('ViewMsg28', () => import('@/message/view-msg28/view-msg28-message'));
+        this.allMessageService.set('ViewMsg54', () => import('@/message/view-msg54/view-msg54-message'));
         this.allMessageService.set('ViewMsg10', () => import('@/message/view-msg10/view-msg10-message'));
         this.allMessageService.set('ViewMsg49', () => import('@/message/view-msg49/view-msg49-message'));
         this.allMessageService.set('ViewMsg7', () => import('@/message/view-msg7/view-msg7-message'));

app_Web/src/message/view-msg53/view-msg53-message-base.ts

@@ -28,7 +28,7 @@ export default class ViewMsg53MessageServiceBase extends ViewMessageService {
         this.name = "树视图---静态节点";
         this.codename = "ViewMsg53";
         this.title = "";
-        this.content = "本示例展示树视图静态节点类型界面呈现";
+        this.content = "本示例展示树视图静态节点类型界面呈现。";
         this.closeMode = 0;
         this.position = "TOP";
         this.type = "error";

app_Web/src/message/view-msg54/view-msg54-message-base.ts

+import ViewMessageService from '../view-message-service';
+/**
+ * 树视图---动态节点（代码表）视图消息服务对象基类
+ *
+ * @export
+ * @class ViewMsg54MessageServiceBase
+ */
+export default class ViewMsg54MessageServiceBase extends ViewMessageService {
+
+
+    /**
+     * Creates an instance of  ViewMsg54MessageServiceBase.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  ViewMsg54MessageServiceBase
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+    /**
+     * 初始化基础参数
+     * 
+     * @memberof ViewMsg54MessageServiceBase
+     */
+    public initBasicParam(){
+        this.id = "682A8394-75AE-40B3-AC25-AF7722B20D4B";
+        this.name = "树视图---动态节点（代码表）";
+        this.codename = "ViewMsg54";
+        this.title = "";
+        this.content = "本示例展示树视图动态节点（代码表）节点类型界面呈现。";
+        this.closeMode = 0;
+        this.position = "TOP";
+        this.type = "error";
+        this.isEnableRemove = false;
+        this.order = 1;
+        this.dynamicMode = "STATIC";
+        this.hasMessageTemp = false;
+        this.messageType = "TEXT";
+    }
+
+    /**
+     * 转化消息模板标题和内容
+     *      
+     * @target {*} target 返回目标数据
+     * @param {*} context 应用上下文
+     * @param {*} viewparam 视图参数
+     * @param {*} item 源数据
+     * 
+     * @memberof ViewMsg54MessageServiceBase
+     */
+    public translateMessageTemp(target:any,context:any,viewparam:any,item?:any){
+        if(this.hasMessageTemp && Object.is(this.messageType,"HTML")){
+            Object.assign(target,{title:``});
+            Object.assign(target,{content:``});
+        }
+        if(this.hasMessageTemp && Object.is(this.messageType,"TEXT")){
+            Object.assign(target,{title:""});
+            Object.assign(target,{content:""});
+        }
+    }
+
+}
\ No newline at end of file

app_Web/src/message/view-msg54/view-msg54-message.ts

+import ViewMsg54MessageServiceBase from './view-msg54-message-base';
+
+/**
+ * 树视图---动态节点（代码表）视图消息服务对象
+ *
+ * @export
+ * @class ViewMsg54MessageService
+ */
+export default class ViewMsg54MessageService extends ViewMsg54MessageServiceBase {
+
+    /**
+     * Creates an instance of  ViewMsg54MessageService.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  ViewMsg54MessageService
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+}
\ No newline at end of file

app_Web/src/mock/viewconfig/viewconfig.ts

@@ -1837,6 +1837,9 @@ mock.onGet('./assets/json/view-message-group.json').reply((config: any) => {
         "VMGroup53":[
         {"tag":"ViewMsg52","position":"TOP","type":"ERROR"}
         ],
+        "VMGroup55":[
+        {"tag":"ViewMsg54","position":"TOP","type":"ERROR"}
+        ],
         "VMGroup26":[
         {"tag":"ViewMsg25","position":"TOP","type":"ERROR"}
         ],
@@ -1882,11 +1885,11 @@ mock.onGet('./assets/json/view-message-group.json').reply((config: any) => {
         "VMGroup20":[
         {"tag":"ViewMsg19","position":"TOP","type":"ERROR"}
         ],
-        "VMGroup11":[
-        {"tag":"ViewMsg10","position":"TOP","type":"ERROR"}
-        ],
         "VMGroup15":[
         {"tag":"ViewMsg14","position":"TOP","type":"ERROR"}
+        ],
+        "VMGroup11":[
+        {"tag":"ViewMsg10","position":"TOP","type":"ERROR"}
         ]
     }];
 });
\ No newline at end of file

app_Web/src/pages/sample/ibizsample0003-f2-tree-exp-view/ibizsample0003-f2-tree-exp-view-base.vue

 <template>
 <div class='view-container detreeexpview ibizsample0003-f2-tree-exp-view'>
     <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="ibizsample0003f2treeexpview"></app-studioaction>
-    <card class='view-card   view-no-toolbar'  :dis-hover="true" :bordered="false">
-        <div slot='title' class="header-container">
-        <span class='caption-info'>{{$t(model.srfCaption)}}</span>
-        </div>
+    <card class='view-card  view-no-caption  view-no-toolbar'  :dis-hover="true" :bordered="false">
 
             <div class='view-top-messages'>
-            </div>
+            <app-alert-group position='TOP' :context="context" :viewparam="viewparams" infoGroup='VMGroup55' viewname='ibizsample0003f2treeexpview'></app-alert-group>            </div>
         <div class='content-container'>
         <div class='view-body-messages'>
-        </div>
+        <app-alert-group position='BODY' :context="context" :viewparam="viewparams" infoGroup='VMGroup55' viewname='ibizsample0003f2treeexpview'></app-alert-group>        </div>
             <view_treeexpbar 
                 :viewState="viewState"  
                 :viewparams="viewparams" 
@@ -27,7 +24,7 @@
             </view_treeexpbar>
         </div>
             <div class='view-bottom-messages'>
-            </div>
+            <app-alert-group position='BOTTOM' :context="context" :viewparam="viewparams" infoGroup='VMGroup55' viewname='ibizsample0003f2treeexpview'></app-alert-group>            </div>
     </card>
 </div>
 </template>

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

@@ -49,6 +49,20 @@
 
 </app-form-item>
 
+</i-col>
+<i-col v-show="detailsModel.documentaddress.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='documentaddress' :itemRules="this.rules().documentaddress" class='' :caption="$t('entities.ibizappctrl.main_form.details.documentaddress')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.documentaddress.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box 
+    v-model="data.documentaddress"  
+    @enter="onEnter($event)"  
+     unit=""  
+    :disabled="detailsModel.documentaddress.disabled" 
+    type='text' 
+    style="">
+</input-box>
+
+</app-form-item>
+
 </i-col>
 <i-col v-show="detailsModel.ctrldescription.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='ctrldescription' :itemRules="this.rules().ctrldescription" class='' :caption="$t('entities.ibizappctrl.main_form.details.ctrldescription')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.ctrldescription.error" :isEmptyCaption="false" labelPos="LEFT">
@@ -521,6 +535,7 @@ export default class MainBase extends Vue implements ControlInterface {
         ibizappctrlid: null,
         ibizappctrlname: null,
         ibizappctrltype: null,
+        documentaddress: null,
         ctrldescription: null,
         createman: null,
         createdate: null,
@@ -585,6 +600,10 @@ export default class MainBase extends Vue implements ControlInterface {
             { required: this.detailsModel.ibizappctrltype.required, type: 'string', message: '应用部件类型 值不能为空', trigger: 'change' },
             { required: this.detailsModel.ibizappctrltype.required, type: 'string', message: '应用部件类型 值不能为空', trigger: 'blur' },
         ],
+        documentaddress: [
+            { required: this.detailsModel.documentaddress.required, type: 'string', message: '文档地址 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.documentaddress.required, type: 'string', message: '文档地址 值不能为空', trigger: 'blur' },
+        ],
         ctrldescription: [
             { required: this.detailsModel.ctrldescription.required, type: 'string', message: '部件描述 值不能为空', trigger: 'change' },
             { required: this.detailsModel.ctrldescription.required, type: 'string', message: '部件描述 值不能为空', trigger: 'blur' },
@@ -739,6 +758,8 @@ export default class MainBase extends Vue implements ControlInterface {
         ibizappctrlname: new FormItemModel({ caption: '应用部件名称', detailType: 'FORMITEM', name: 'ibizappctrlname', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         ibizappctrltype: new FormItemModel({ caption: '应用部件类型', detailType: 'FORMITEM', name: 'ibizappctrltype', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        documentaddress: new FormItemModel({ caption: '文档地址', detailType: 'FORMITEM', name: 'documentaddress', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         ctrldescription: new FormItemModel({ caption: '部件描述', detailType: 'FORMITEM', name: 'ctrldescription', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
@@ -885,6 +906,18 @@ export default class MainBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'ibizappctrltype', newVal: newVal, oldVal: oldVal });
     }
 
+    /**
+     * 监控表单属性 documentaddress 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof MainBase
+     */
+    @Watch('data.documentaddress')
+    onDocumentaddressChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'documentaddress', newVal: newVal, oldVal: oldVal });
+    }
+
     /**
      * 监控表单属性 ctrldescription 值
      *
@@ -1017,6 +1050,7 @@ export default class MainBase extends Vue implements ControlInterface {
 
 
 
+
 
 
     }

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

@@ -70,6 +70,11 @@ export default class MainModel {
         prop: 'ibizappctrltype',
         dataType: 'TEXT',
       },
+      {
+        name: 'documentaddress',
+        prop: 'documentaddress',
+        dataType: 'TEXT',
+      },
       {
         name: 'ctrldescription',
         prop: 'ctrldescription',

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

@@ -47,6 +47,18 @@
                     </template>
                 </el-table-column>
             </template>
+            <template v-if="getColumnState('documentaddress')">
+                <el-table-column show-overflow-tooltip :prop="'documentaddress'" :label="$t('entities.ibizappctrl.main_grid.columns.documentaddress')" :width="350"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibizappctrl.main_grid.columns.documentaddress')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.documentaddress}}</span>
+                    </template>
+                </el-table-column>
+            </template>
             <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}">
@@ -634,6 +646,15 @@ export default class MainBase extends Vue implements ControlInterface {
             isEnableRowEdit: false,
             enableCond: 3 ,
         },
+        {
+            name: 'documentaddress',
+            label: '文档地址',
+            langtag: 'entities.ibizappctrl.main_grid.columns.documentaddress',
+            show: true,
+            unit: 'PX',
+            isEnableRowEdit: false,
+            enableCond: 3 ,
+        },
         {
             name: 'ctrldescription',
             label: '部件描述',
@@ -1337,7 +1358,7 @@ export default class MainBase extends Vue implements ControlInterface {
     * @memberof MainBase
     */
     public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
-        let allColumns:Array<any> = ['ibizappctrlname','ibizappctrltype','ctrldescription'];
+        let allColumns:Array<any> = ['ibizappctrlname','ibizappctrltype','documentaddress','ctrldescription'];
         if(row && row.children) {
             if(columnIndex == (this.isSingleSelect ? 0:1)) {
                 return [1, allColumns.length+1];
@@ -1419,6 +1440,7 @@ export default class MainBase extends Vue implements ControlInterface {
                 group: group.label,
                 ibizappctrlname:'',
                 ibizappctrltype:'',
+                documentaddress:'',
                 ctrldescription:'',
                 children: children
             }
@@ -1449,6 +1471,7 @@ export default class MainBase extends Vue implements ControlInterface {
             group: this.$t('app.gridpage.other'),
             ibizappctrlname:'',
             ibizappctrltype:'',
+            documentaddress:'',
             ctrldescription:'',
             children: child
         }
@@ -1512,6 +1535,7 @@ export default class MainBase extends Vue implements ControlInterface {
                 group: group,
                 ibizappctrlname:'',
                 ibizappctrltype:'',
+                documentaddress:'',
                 ctrldescription:'',
                 children: children,
             }

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

@@ -36,6 +36,11 @@ export default class MainModel {
           prop: 'ibizappctrlname',
           dataType: 'TEXT',
         },
+        {
+          name: 'documentaddress',
+          prop: 'documentaddress',
+          dataType: 'TEXT',
+        },
         {
           name: 'ibizappctrlid',
           prop: 'ibizappctrlid',

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

@@ -49,6 +49,48 @@
 
 </app-form-item>
 
+</i-col>
+<i-col v-show="detailsModel.documentaddress.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='documentaddress' :itemRules="this.rules().documentaddress" class='' :caption="$t('entities.ibizappeditor.main_form.details.documentaddress')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.documentaddress.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box 
+    v-model="data.documentaddress"  
+    @enter="onEnter($event)"  
+     unit=""  
+    :disabled="detailsModel.documentaddress.disabled" 
+    type='text' 
+    style="">
+</input-box>
+
+</app-form-item>
+
+</i-col>
+<i-col v-show="detailsModel.inbuilteditoramount.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='inbuilteditoramount' :itemRules="this.rules().inbuilteditoramount" class='' :caption="$t('entities.ibizappeditor.main_form.details.inbuilteditoramount')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.inbuilteditoramount.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box 
+    v-model="data.inbuilteditoramount"  
+    @enter="onEnter($event)"  
+     unit=""  
+    :disabled="detailsModel.inbuilteditoramount.disabled" 
+    type='number' 
+    style="">
+</input-box>
+
+</app-form-item>
+
+</i-col>
+<i-col v-show="detailsModel.expandeditoramount.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='expandeditoramount' :itemRules="this.rules().expandeditoramount" class='' :caption="$t('entities.ibizappeditor.main_form.details.expandeditoramount')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.expandeditoramount.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box 
+    v-model="data.expandeditoramount"  
+    @enter="onEnter($event)"  
+     unit=""  
+    :disabled="detailsModel.expandeditoramount.disabled" 
+    type='number' 
+    style="">
+</input-box>
+
+</app-form-item>
+
 </i-col>
 <i-col v-show="detailsModel.rditordescription.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='rditordescription' :itemRules="this.rules().rditordescription" class='' :caption="$t('entities.ibizappeditor.main_form.details.rditordescription')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.rditordescription.error" :isEmptyCaption="false" labelPos="LEFT">
@@ -521,6 +563,9 @@ export default class MainBase extends Vue implements ControlInterface {
         ibizappeditorid: null,
         ibizappeditorname: null,
         ibizappeditortype: null,
+        documentaddress: null,
+        inbuilteditoramount: null,
+        expandeditoramount: null,
         rditordescription: null,
         createman: null,
         createdate: null,
@@ -585,6 +630,18 @@ export default class MainBase extends Vue implements ControlInterface {
             { required: this.detailsModel.ibizappeditortype.required, type: 'string', message: '编辑器类型 值不能为空', trigger: 'change' },
             { required: this.detailsModel.ibizappeditortype.required, type: 'string', message: '编辑器类型 值不能为空', trigger: 'blur' },
         ],
+        documentaddress: [
+            { required: this.detailsModel.documentaddress.required, type: 'string', message: '文档地址 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.documentaddress.required, type: 'string', message: '文档地址 值不能为空', trigger: 'blur' },
+        ],
+        inbuilteditoramount: [
+            { required: this.detailsModel.inbuilteditoramount.required, type: 'number', message: '内置编辑器数量 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.inbuilteditoramount.required, type: 'number', message: '内置编辑器数量 值不能为空', trigger: 'blur' },
+        ],
+        expandeditoramount: [
+            { required: this.detailsModel.expandeditoramount.required, type: 'number', message: '扩展编辑器数量 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.expandeditoramount.required, type: 'number', message: '扩展编辑器数量 值不能为空', trigger: 'blur' },
+        ],
         rditordescription: [
             { required: this.detailsModel.rditordescription.required, type: 'string', message: '编辑器描述 值不能为空', trigger: 'change' },
             { required: this.detailsModel.rditordescription.required, type: 'string', message: '编辑器描述 值不能为空', trigger: 'blur' },
@@ -739,6 +796,12 @@ export default class MainBase extends Vue implements ControlInterface {
         ibizappeditorname: new FormItemModel({ caption: '编辑器名称', detailType: 'FORMITEM', name: 'ibizappeditorname', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         ibizappeditortype: new FormItemModel({ caption: '编辑器类型', detailType: 'FORMITEM', name: 'ibizappeditortype', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        documentaddress: new FormItemModel({ caption: '文档地址', detailType: 'FORMITEM', name: 'documentaddress', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        inbuilteditoramount: new FormItemModel({ caption: '内置编辑器数量', detailType: 'FORMITEM', name: 'inbuilteditoramount', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        expandeditoramount: new FormItemModel({ caption: '扩展编辑器数量', detailType: 'FORMITEM', name: 'expandeditoramount', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         rditordescription: new FormItemModel({ caption: '编辑器描述', detailType: 'FORMITEM', name: 'rditordescription', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
@@ -885,6 +948,42 @@ export default class MainBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'ibizappeditortype', newVal: newVal, oldVal: oldVal });
     }
 
+    /**
+     * 监控表单属性 documentaddress 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof MainBase
+     */
+    @Watch('data.documentaddress')
+    onDocumentaddressChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'documentaddress', newVal: newVal, oldVal: oldVal });
+    }
+
+    /**
+     * 监控表单属性 inbuilteditoramount 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof MainBase
+     */
+    @Watch('data.inbuilteditoramount')
+    onInbuilteditoramountChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'inbuilteditoramount', newVal: newVal, oldVal: oldVal });
+    }
+
+    /**
+     * 监控表单属性 expandeditoramount 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof MainBase
+     */
+    @Watch('data.expandeditoramount')
+    onExpandeditoramountChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'expandeditoramount', newVal: newVal, oldVal: oldVal });
+    }
+
     /**
      * 监控表单属性 rditordescription 值
      *
@@ -1015,6 +1114,9 @@ export default class MainBase extends Vue implements ControlInterface {
 
 
 
+
+
+
 
 
 

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

@@ -70,6 +70,21 @@ export default class MainModel {
         prop: 'ibizappeditortype',
         dataType: 'TEXT',
       },
+      {
+        name: 'documentaddress',
+        prop: 'documentaddress',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'inbuilteditoramount',
+        prop: 'inbuilteditoramount',
+        dataType: 'INT',
+      },
+      {
+        name: 'expandeditoramount',
+        prop: 'expandeditoramount',
+        dataType: 'INT',
+      },
       {
         name: 'rditordescription',
         prop: 'rditordescription',

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="350"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'ibizappeditorname'" :label="$t('entities.ibizappeditor.main_grid.columns.ibizappeditorname')" :width="300"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.ibizappeditor.main_grid.columns.ibizappeditorname')}}
@@ -34,7 +34,7 @@
                 </el-table-column>
             </template>
             <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'">
+                <el-table-column show-overflow-tooltip :prop="'ibizappeditortype'" :label="$t('entities.ibizappeditor.main_grid.columns.ibizappeditortype')" :width="300"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.ibizappeditor.main_grid.columns.ibizappeditortype')}}
@@ -47,8 +47,32 @@
                     </template>
                 </el-table-column>
             </template>
+            <template v-if="getColumnState('inbuilteditoramount')">
+                <el-table-column show-overflow-tooltip :prop="'inbuilteditoramount'" :label="$t('entities.ibizappeditor.main_grid.columns.inbuilteditoramount')" :width="300"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibizappeditor.main_grid.columns.inbuilteditoramount')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.inbuilteditoramount}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('expandeditoramount')">
+                <el-table-column show-overflow-tooltip :prop="'expandeditoramount'" :label="$t('entities.ibizappeditor.main_grid.columns.expandeditoramount')" :width="300"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibizappeditor.main_grid.columns.expandeditoramount')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.expandeditoramount}}</span>
+                    </template>
+                </el-table-column>
+            </template>
             <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'">
+                <el-table-column show-overflow-tooltip :prop="'rditordescription'" :label="$t('entities.ibizappeditor.main_grid.columns.rditordescription')" :min-width="100"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.ibizappeditor.main_grid.columns.rditordescription')}}
@@ -634,12 +658,30 @@ export default class MainBase extends Vue implements ControlInterface {
             isEnableRowEdit: false,
             enableCond: 3 ,
         },
+        {
+            name: 'inbuilteditoramount',
+            label: '内置编辑器数量',
+            langtag: 'entities.ibizappeditor.main_grid.columns.inbuilteditoramount',
+            show: true,
+            unit: 'PX',
+            isEnableRowEdit: false,
+            enableCond: 3 ,
+        },
+        {
+            name: 'expandeditoramount',
+            label: '扩展编辑器数量',
+            langtag: 'entities.ibizappeditor.main_grid.columns.expandeditoramount',
+            show: true,
+            unit: 'PX',
+            isEnableRowEdit: false,
+            enableCond: 3 ,
+        },
         {
             name: 'rditordescription',
             label: '编辑器描述',
             langtag: 'entities.ibizappeditor.main_grid.columns.rditordescription',
             show: true,
-            unit: 'PX',
+            unit: 'STAR',
             isEnableRowEdit: false,
             enableCond: 3 ,
         },
@@ -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> = ['ibizappeditorname','ibizappeditortype','rditordescription'];
+        let allColumns:Array<any> = ['ibizappeditorname','ibizappeditortype','inbuilteditoramount','expandeditoramount','rditordescription'];
         if(row && row.children) {
             if(columnIndex == (this.isSingleSelect ? 0:1)) {
                 return [1, allColumns.length+1];
@@ -1419,6 +1461,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 group: group.label,
                 ibizappeditorname:'',
                 ibizappeditortype:'',
+                inbuilteditoramount:'',
+                expandeditoramount:'',
                 rditordescription:'',
                 children: children
             }
@@ -1449,6 +1493,8 @@ export default class MainBase extends Vue implements ControlInterface {
             group: this.$t('app.gridpage.other'),
             ibizappeditorname:'',
             ibizappeditortype:'',
+            inbuilteditoramount:'',
+            expandeditoramount:'',
             rditordescription:'',
             children: child
         }
@@ -1512,6 +1558,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 group: group,
                 ibizappeditorname:'',
                 ibizappeditortype:'',
+                inbuilteditoramount:'',
+                expandeditoramount:'',
                 rditordescription:'',
                 children: children,
             }

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

@@ -26,6 +26,11 @@ export default class MainModel {
       ]
     }else{
 		  return [
+        {
+          name: 'inbuilteditoramount',
+          prop: 'inbuilteditoramount',
+          dataType: 'INT',
+        },
         {
           name: 'ibizappeditorname',
           prop: 'ibizappeditorname',
@@ -41,6 +46,11 @@ export default class MainModel {
           prop: 'rditordescription',
           dataType: 'TEXT',
         },
+        {
+          name: 'expandeditoramount',
+          prop: 'expandeditoramount',
+          dataType: 'INT',
+        },
         {
           name: 'srfmajortext',
           prop: 'ibizappeditorname',

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

@@ -237,14 +237,6 @@ 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',
@@ -277,6 +269,14 @@ 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/ibizsample0003/f2-tree-exp-viewtreeexpbar-treeexpbar/f2-tree-exp-viewtreeexpbar-treeexpbar-base.vue

@@ -344,7 +344,7 @@ export default class F2TreeExpViewtreeexpbarBase extends Vue implements ControlI
         if (Object.is(expmode, 'STATE')) {
             return {  
                 viewname: 'ibizorder-grid-view', 
-                parentdata: {"n_orderstate_eq":"%NODEID%"},
+                parentdata: {},
                 deKeyField:'ibizorder'
 			};
         }

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

@@ -198,6 +198,7 @@ export default class Tree02Service extends ControlService {
                     strNodeId += this.TREENODE_SEPARATOR;
                     strNodeId += item.value;
                     Object.assign(item, { id: strNodeId });
+                    Object.assign(item, { iconcls: 'fa fa-street-view' });
                     Object.assign(item, { expanded: filter.isautoexpand });
                     Object.assign(item, {navigateParams: {n_orderstate_eq:"%NODEID%"} });
                     Object.assign(item, { nodeid: item.srfkey });
@@ -216,6 +217,7 @@ export default class Tree02Service extends ControlService {
                     strNodeId += this.TREENODE_SEPARATOR;
                     strNodeId += item.value;
                     Object.assign(treeNode, { id: strNodeId });
+                    Object.assign(treeNode, { iconcls: 'fa fa-street-view' });
                     Object.assign(treeNode, { expanded: filter.isautoexpand });
                     Object.assign(treeNode, { leaf: true });
                     Object.assign(treeNode, {navigateParams: {n_orderstate_eq:"%NODEID%"} });