chitanda 发布系统代码

app_CRM/src/engine/view/edit-view-engine.ts

@@ -103,7 +103,7 @@ export default class EditViewEngine extends ViewEngine {
     public onFormLoad(arg: any): void {
         this.view.model.dataInfo = Object.is(arg.srfuf, '1') ? (this.majorPSDEField?arg[this.majorPSDEField]:arg.srfmajortext) : this.view.$t('app.local.new');
 
-        this.setTabCaption(this.view.model.dataInfo,Object.is(arg.srfuf, '0'));
+        this.setTabCaption(this.view.model.dataInfo);
         const newdata: boolean = !Object.is(arg.srfuf, '1');
         this.calcToolbarItemState(newdata);
     }
@@ -117,7 +117,7 @@ export default class EditViewEngine extends ViewEngine {
     public onFormSave(arg: any): void {
         this.view.model.dataInfo = Object.is(arg.srfuf, '1') ? (this.majorPSDEField?arg[this.majorPSDEField]:arg.srfmajortext) : this.view.$t('app.local.new');
 
-        this.setTabCaption(this.view.model.dataInfo,Object.is(arg.srfuf, '0'));
+        this.setTabCaption(this.view.model.dataInfo);
         const newdata: boolean = !Object.is(arg.srfuf, '1');
         this.calcToolbarItemState(newdata);
         this.view.$emit('save',arg);
@@ -245,21 +245,15 @@ export default class EditViewEngine extends ViewEngine {
      *
      * @memberof EditViewEngine
      */
-    public setTabCaption(info: string,isNew:boolean): void {
+    public setTabCaption(info: string): void {
         let viewdata: any = this.view.model;
-        let index:number = viewdata.srfTitle.indexOf("-");
-        if (viewdata  && info && !Object.is(info, '')) {
-            if(index !== -1){
-                viewdata.srfTitle = viewdata.srfTitle.substr(0,index);
-            }
-            if(this.view.$tabPageExp){
-                this.view.$tabPageExp.setCurPageCaption(this.view.$t(viewdata.srfTitle), this.view.$t(viewdata.srfTitle), info);
-            }
+        if (viewdata  && info && !Object.is(info, '') && this.view.$tabPageExp && (viewdata.srfTitle.indexOf(" - ") === -1)) {
+            this.view.$tabPageExp.setCurPageCaption(viewdata.srfTitle, viewdata.srfTitle, info);
             if(this.view.$route){
                 this.view.$route.meta.info = info;
             }
-            this.view.model.srfTitle = `${this.view.$t(viewdata.srfTitle)}-${viewdata.dataInfo}`;
-            this.view.initNavDataWithRoute(null,isNew);
+            this.view.model.srfTitle = `${this.view.$t(viewdata.srfTitle)} - ${viewdata.dataInfo}`;
+            this.view.$emit('viewModelChange', this.view.model.srfTitle);
         }
     }
 

app_CRM/src/engine/view/md-view-engine.ts

@@ -367,15 +367,6 @@ export default class MDViewEngine extends ViewEngine {
      * @memberof MDViewEngine
      */
     public MDCtrlLoad(args: any[]) {
-        let cacheArray:Array<any> = [];
-        if(args.length >0){
-            args.forEach((item:any) =>{
-                cacheArray.push({srfkey:item.srfkey,srfmajortext:item.srfmajortext});
-            })
-        }
-        this.view.viewCacheData = cacheArray;
-        this.view.initNavDataWithRoute(cacheArray);
-        this.view.initNavDataWithTab(cacheArray,false);
         if (this.view) {
             this.view.$emit('viewload', args);
         }

app_CRM/src/pages/base/account-info/account-info-base.tsx

@@ -444,7 +444,7 @@ export class AccountInfoBase extends TabExpViewBase {
      * 
      * @memberof AccountInfoBase
      */
-    public loadModel(): void {
+    public async loadModel(): Promise<void> {
         if(this.context.account){
             this.appEntityService.getDataInfo(JSON.parse(JSON.stringify(this.context)),{},false).then((response:any) =>{
                 if (!response || response.status !== 200) {

app_CRM/src/pages/base/contact-info/contact-info-base.tsx

@@ -409,7 +409,7 @@ export class ContactInfoBase extends TabExpViewBase {
      * 
      * @memberof ContactInfoBase
      */
-    public loadModel(): void {
+    public async loadModel(): Promise<void> {
         if(this.context.contact){
             this.appEntityService.getDataInfo(JSON.parse(JSON.stringify(this.context)),{},false).then((response:any) =>{
                 if (!response || response.status !== 200) {

app_CRM/src/pages/marketing/campaign-info/campaign-info-base.tsx

@@ -409,7 +409,7 @@ export class CampaignInfoBase extends TabExpViewBase {
      * 
      * @memberof CampaignInfoBase
      */
-    public loadModel(): void {
+    public async loadModel(): Promise<void> {
         if(this.context.campaign){
             this.appEntityService.getDataInfo(JSON.parse(JSON.stringify(this.context)),{},false).then((response:any) =>{
                 if (!response || response.status !== 200) {

app_CRM/src/pages/marketing/ibiz-list-info/ibiz-list-info-base.tsx

@@ -97,7 +97,7 @@ export class IBizListInfoBase extends TabExpViewBase {
      * 
      * @memberof IBizListInfoBase
      */
-    public loadModel(): void {
+    public async loadModel(): Promise<void> {
         if(this.context.ibizlist){
             this.appEntityService.getDataInfo(JSON.parse(JSON.stringify(this.context)),{},false).then((response:any) =>{
                 if (!response || response.status !== 200) {

app_CRM/src/pages/sales/competitor-info/competitor-info-base.tsx

@@ -97,7 +97,7 @@ export class CompetitorInfoBase extends TabExpViewBase {
      * 
      * @memberof CompetitorInfoBase
      */
-    public loadModel(): void {
+    public async loadModel(): Promise<void> {
         if(this.context.competitor){
             this.appEntityService.getDataInfo(JSON.parse(JSON.stringify(this.context)),{},false).then((response:any) =>{
                 if (!response || response.status !== 200) {

app_CRM/src/pages/sales/lead-info/lead-info-base.tsx

@@ -613,7 +613,7 @@ export class LeadInfoBase extends TabExpViewBase {
      * 
      * @memberof LeadInfoBase
      */
-    public loadModel(): void {
+    public async loadModel(): Promise<void> {
         if(this.context.lead){
             this.appEntityService.getDataInfo(JSON.parse(JSON.stringify(this.context)),{},false).then((response:any) =>{
                 if (!response || response.status !== 200) {

app_CRM/src/pages/sales/opportunity-info/opportunity-info-base.tsx

@@ -511,7 +511,7 @@ export class OpportunityInfoBase extends TabExpViewBase {
      * 
      * @memberof OpportunityInfoBase
      */
-    public loadModel(): void {
+    public async loadModel(): Promise<void> {
         if(this.context.opportunity){
             this.appEntityService.getDataInfo(JSON.parse(JSON.stringify(this.context)),{},false).then((response:any) =>{
                 if (!response || response.status !== 200) {

app_CRM/src/pages/sales/quote-info/quote-info-base.tsx

@@ -97,7 +97,7 @@ export class QuoteInfoBase extends TabExpViewBase {
      * 
      * @memberof QuoteInfoBase
      */
-    public loadModel(): void {
+    public async loadModel(): Promise<void> {
         if(this.context.quote){
             this.appEntityService.getDataInfo(JSON.parse(JSON.stringify(this.context)),{},false).then((response:any) =>{
                 if (!response || response.status !== 200) {

app_CRM/src/widgets/account/view-account-info-all-portlet/view-account-info-all-portlet-base.tsx

@@ -86,6 +86,24 @@ export class View_AccountInfoAllPortletBase extends MainControlBase {
         return {};
     }
 
+    /**
+     * 获取高度
+     *
+     * @returns {any[]}
+     * @memberof View_AccountInfoAllBase
+     */
+    get getHeight(): any{
+        if(!this.$util.isEmpty(this.height) && !this.$util.isNumberNaN(this.height)){
+            if(this.height == 0){
+                return 'auto';
+            } else {
+                return this.height+'px';
+            }
+        } else {
+            return 'auto';
+        }
+    }
+
     /**
      * vue 生命周期
      *

app_CRM/src/widgets/activity-pointer/by-regarding-object-id-panel/by-regarding-object-id-panel.html

-<layout_dashboard_sysportlet2_list_itempanel 
-  :viewState="viewState"  
-  :viewparams="viewparams" 
-  :context="context"
-  :inputData="item"
-  @panelDataChange="($event)=>{onPanelDataChange(item,$event)}"
-  name="dashboard_sysportlet2_list_itempanel"  
-  ref='dashboard_sysportlet2_list_itempanel'>
-</layout_dashboard_sysportlet2_list_itempanel>
\ No newline at end of file
+<div class='panel-container' style="">
+    <row class="app-layoutpanel" style="height:100%;">
+        <div v-show="detailsModel.container1.visible" class="app-layoutpanel-container" style="">
+            <div style="height:100%;display: flex;">
+                      
+                <div v-show="detailsModel.activitytypecode.visible" style="" class="app-layoutpanel-field ">
+                    <div class="item-field">
+                    
+                    <div class="item-field-content">
+                    <span>{{data.activitytypecode}}</span>
+                    </div>
+                </div>
+                
+                
+                </div>
+                      
+                <div v-show="detailsModel.subject.visible" style="" class="app-layoutpanel-field ">
+                    <div class="item-field">
+                    
+                    <div class="item-field-content">
+                    <span>{{data.subject}}</span>
+                    </div>
+                </div>
+                
+                
+                </div>
+            </div>
+        </div>
+    </row>
+</div>
\ No newline at end of file

app_CRM/src/widgets/activity-pointer/list-by-parent-key-portlet/list-by-parent-key-portlet-base.tsx

@@ -202,6 +202,24 @@ export class List_ByParentKeyPortletBase extends MainControlBase {
         return {};
     }
 
+    /**
+     * 获取高度
+     *
+     * @returns {any[]}
+     * @memberof List_ByParentKeyBase
+     */
+    get getHeight(): any{
+        if(!this.$util.isEmpty(this.height) && !this.$util.isNumberNaN(this.height)){
+            if(this.height == 0){
+                return 'auto';
+            } else {
+                return this.height+'px';
+            }
+        } else {
+            return 'auto';
+        }
+    }
+
     /**
      * vue 生命周期
      *

app_CRM/src/widgets/campaign/view-campagin-portlet/view-campagin-portlet-base.tsx

@@ -86,6 +86,24 @@ export class View_CampaginPortletBase extends MainControlBase {
         return {};
     }
 
+    /**
+     * 获取高度
+     *
+     * @returns {any[]}
+     * @memberof View_CampaginBase
+     */
+    get getHeight(): any{
+        if(!this.$util.isEmpty(this.height) && !this.$util.isNumberNaN(this.height)){
+            if(this.height == 0){
+                return 'auto';
+            } else {
+                return this.height+'px';
+            }
+        } else {
+            return 'auto';
+        }
+    }
+
     /**
      * vue 生命周期
      *

app_CRM/src/widgets/campaign/view-head-portlet/view-head-portlet-base.tsx

@@ -86,6 +86,24 @@ export class View_HeadPortletBase extends MainControlBase {
         return {};
     }
 
+    /**
+     * 获取高度
+     *
+     * @returns {any[]}
+     * @memberof View_HeadBase
+     */
+    get getHeight(): any{
+        if(!this.$util.isEmpty(this.height) && !this.$util.isNumberNaN(this.height)){
+            if(this.height == 0){
+                return 'auto';
+            } else {
+                return this.height+'px';
+            }
+        } else {
+            return 'auto';
+        }
+    }
+
     /**
      * vue 生命周期
      *

app_CRM/src/widgets/campaign/view-info-portlet/view-info-portlet-base.tsx

@@ -86,6 +86,24 @@ export class View_InfoPortletBase extends MainControlBase {
         return {};
     }
 
+    /**
+     * 获取高度
+     *
+     * @returns {any[]}
+     * @memberof View_InfoBase
+     */
+    get getHeight(): any{
+        if(!this.$util.isEmpty(this.height) && !this.$util.isNumberNaN(this.height)){
+            if(this.height == 0){
+                return 'auto';
+            } else {
+                return this.height+'px';
+            }
+        } else {
+            return 'auto';
+        }
+    }
+
     /**
      * vue 生命周期
      *

app_CRM/src/widgets/campaign/view-manager-portlet/view-manager-portlet-base.tsx

@@ -86,6 +86,24 @@ export class View_ManagerPortletBase extends MainControlBase {
         return {};
     }
 
+    /**
+     * 获取高度
+     *
+     * @returns {any[]}
+     * @memberof View_ManagerBase
+     */
+    get getHeight(): any{
+        if(!this.$util.isEmpty(this.height) && !this.$util.isNumberNaN(this.height)){
+            if(this.height == 0){
+                return 'auto';
+            } else {
+                return this.height+'px';
+            }
+        } else {
+            return 'auto';
+        }
+    }
+
     /**
      * vue 生命周期
      *

app_CRM/src/widgets/campaign/view-schedule-portlet/view-schedule-portlet-base.tsx

@@ -86,6 +86,24 @@ export class View_SchedulePortletBase extends MainControlBase {
         return {};
     }
 
+    /**
+     * 获取高度
+     *
+     * @returns {any[]}
+     * @memberof View_ScheduleBase
+     */
+    get getHeight(): any{
+        if(!this.$util.isEmpty(this.height) && !this.$util.isNumberNaN(this.height)){
+            if(this.height == 0){
+                return 'auto';
+            } else {
+                return this.height+'px';
+            }
+        } else {
+            return 'auto';
+        }
+    }
+
     /**
      * vue 生命周期
      *

app_CRM/src/widgets/competitor/view-comp-abstract-portlet/view-comp-abstract-portlet-base.tsx

@@ -86,6 +86,24 @@ export class View_CompAbstractPortletBase extends MainControlBase {
         return {};
     }
 
+    /**
+     * 获取高度
+     *
+     * @returns {any[]}
+     * @memberof View_CompAbstractBase
+     */
+    get getHeight(): any{
+        if(!this.$util.isEmpty(this.height) && !this.$util.isNumberNaN(this.height)){
+            if(this.height == 0){
+                return 'auto';
+            } else {
+                return this.height+'px';
+            }
+        } else {
+            return 'auto';
+        }
+    }
+
     /**
      * vue 生命周期
      *

app_CRM/src/widgets/contact/view-con-abs-portlet/view-con-abs-portlet-base.tsx

@@ -115,6 +115,24 @@ export class View_ConAbsPortletBase extends MainControlBase {
         return {};
     }
 
+    /**
+     * 获取高度
+     *
+     * @returns {any[]}
+     * @memberof View_ConAbsBase
+     */
+    get getHeight(): any{
+        if(!this.$util.isEmpty(this.height) && !this.$util.isNumberNaN(this.height)){
+            if(this.height == 0){
+                return 'auto';
+            } else {
+                return this.height+'px';
+            }
+        } else {
+            return 'auto';
+        }
+    }
+
     /**
      * vue 生命周期
      *

app_CRM/src/widgets/contact/view-con-add-portlet/view-con-add-portlet-base.tsx

@@ -115,6 +115,24 @@ export class View_ConAddPortletBase extends MainControlBase {
         return {};
     }
 
+    /**
+     * 获取高度
+     *
+     * @returns {any[]}
+     * @memberof View_ConAddBase
+     */
+    get getHeight(): any{
+        if(!this.$util.isEmpty(this.height) && !this.$util.isNumberNaN(this.height)){
+            if(this.height == 0){
+                return 'auto';
+            } else {
+                return this.height+'px';
+            }
+        } else {
+            return 'auto';
+        }
+    }
+
     /**
      * vue 生命周期
      *

app_CRM/src/widgets/contact/view-con-book-portlet/view-con-book-portlet-base.tsx

@@ -115,6 +115,24 @@ export class View_ConBookPortletBase extends MainControlBase {
         return {};
     }
 
+    /**
+     * 获取高度
+     *
+     * @returns {any[]}
+     * @memberof View_ConBookBase
+     */
+    get getHeight(): any{
+        if(!this.$util.isEmpty(this.height) && !this.$util.isNumberNaN(this.height)){
+            if(this.height == 0){
+                return 'auto';
+            } else {
+                return this.height+'px';
+            }
+        } else {
+            return 'auto';
+        }
+    }
+
     /**
      * vue 生命周期
      *

app_CRM/src/widgets/contact/view-con-mar-portlet/view-con-mar-portlet-base.tsx

@@ -115,6 +115,24 @@ export class View_ConMarPortletBase extends MainControlBase {
         return {};
     }
 
+    /**
+     * 获取高度
+     *
+     * @returns {any[]}
+     * @memberof View_ConMarBase
+     */
+    get getHeight(): any{
+        if(!this.$util.isEmpty(this.height) && !this.$util.isNumberNaN(this.height)){
+            if(this.height == 0){
+                return 'auto';
+            } else {
+                return this.height+'px';
+            }
+        } else {
+            return 'auto';
+        }
+    }
+
     /**
      * vue 生命周期
      *

app_CRM/src/widgets/contact/view-con-per-portlet/view-con-per-portlet-base.tsx

@@ -115,6 +115,24 @@ export class View_ConPerPortletBase extends MainControlBase {
         return {};
     }
 
+    /**
+     * 获取高度
+     *
+     * @returns {any[]}
+     * @memberof View_ConPerBase
+     */
+    get getHeight(): any{
+        if(!this.$util.isEmpty(this.height) && !this.$util.isNumberNaN(this.height)){
+            if(this.height == 0){
+                return 'auto';
+            } else {
+                return this.height+'px';
+            }
+        } else {
+            return 'auto';
+        }
+    }
+
     /**
      * vue 生命周期
      *

app_CRM/src/widgets/ibiz-list/view-list-abs-portlet/view-list-abs-portlet-base.tsx

@@ -115,6 +115,24 @@ export class View_ListAbsPortletBase extends MainControlBase {
         return {};
     }
 
+    /**
+     * 获取高度
+     *
+     * @returns {any[]}
+     * @memberof View_ListAbsBase
+     */
+    get getHeight(): any{
+        if(!this.$util.isEmpty(this.height) && !this.$util.isNumberNaN(this.height)){
+            if(this.height == 0){
+                return 'auto';
+            } else {
+                return this.height+'px';
+            }
+        } else {
+            return '300px';
+        }
+    }
+
     /**
      * vue 生命周期
      *

app_CRM/src/widgets/lead/view-lead-com-portlet/view-lead-com-portlet-base.tsx

@@ -86,6 +86,24 @@ export class View_LeadComPortletBase extends MainControlBase {
         return {};
     }
 
+    /**
+     * 获取高度
+     *
+     * @returns {any[]}
+     * @memberof View_LeadComBase
+     */
+    get getHeight(): any{
+        if(!this.$util.isEmpty(this.height) && !this.$util.isNumberNaN(this.height)){
+            if(this.height == 0){
+                return 'auto';
+            } else {
+                return this.height+'px';
+            }
+        } else {
+            return 'auto';
+        }
+    }
+
     /**
      * vue 生命周期
      *

app_CRM/src/widgets/lead/view-lead-con-portlet/view-lead-con-portlet-base.tsx

@@ -86,6 +86,24 @@ export class View_LeadConPortletBase extends MainControlBase {
         return {};
     }
 
+    /**
+     * 获取高度
+     *
+     * @returns {any[]}
+     * @memberof View_LeadConBase
+     */
+    get getHeight(): any{
+        if(!this.$util.isEmpty(this.height) && !this.$util.isNumberNaN(this.height)){
+            if(this.height == 0){
+                return 'auto';
+            } else {
+                return this.height+'px';
+            }
+        } else {
+            return 'auto';
+        }
+    }
+
     /**
      * vue 生命周期
      *

app_CRM/src/widgets/lead/view-lead-detail-portlet/view-lead-detail-portlet-base.tsx

@@ -86,6 +86,24 @@ export class View_LeadDetailPortletBase extends MainControlBase {
         return {};
     }
 
+    /**
+     * 获取高度
+     *
+     * @returns {any[]}
+     * @memberof View_LeadDetailBase
+     */
+    get getHeight(): any{
+        if(!this.$util.isEmpty(this.height) && !this.$util.isNumberNaN(this.height)){
+            if(this.height == 0){
+                return 'auto';
+            } else {
+                return this.height+'px';
+            }
+        } else {
+            return 'auto';
+        }
+    }
+
     /**
      * vue 生命周期
      *

app_CRM/src/widgets/lead/view-lead-market-portlet/view-lead-market-portlet-base.tsx

@@ -86,6 +86,24 @@ export class View_LeadMarketPortletBase extends MainControlBase {
         return {};
     }
 
+    /**
+     * 获取高度
+     *
+     * @returns {any[]}
+     * @memberof View_LeadMarketBase
+     */
+    get getHeight(): any{
+        if(!this.$util.isEmpty(this.height) && !this.$util.isNumberNaN(this.height)){
+            if(this.height == 0){
+                return 'auto';
+            } else {
+                return this.height+'px';
+            }
+        } else {
+            return 'auto';
+        }
+    }
+
     /**
      * vue 生命周期
      *

app_CRM/src/widgets/opportunity/panel-panel/panel-panel.html

-<layout_listexpbar_list_itempanel 
-  :viewState="viewState"  
-  :viewparams="viewparams" 
-  :context="context"
-  :inputData="item"
-  @panelDataChange="($event)=>{onPanelDataChange(item,$event)}"
-  name="listexpbar_list_itempanel"  
-  ref='listexpbar_list_itempanel'>
-</layout_listexpbar_list_itempanel>
\ No newline at end of file
+<div class='panel-container' style="">
+    <row class="app-layoutpanel" style="height:100%;">
+        <i-col v-show="detailsModel.container1.visible"  style="" class="app-layoutpanel-container">
+            <row style="height:100%;">
+                      
+                <i-col v-show="detailsModel.opportunityname.visible"  :md="{ span: 24, offset: 0 }" style="font-size:20px;font-weight:bold" class="app-layoutpanel-field list-title">
+                    <div class="item-field">
+                    
+                    <div class="item-field-content">
+                    <span>{{data.opportunityname}}</span>
+                    </div>
+                </div>
+                
+                
+                </i-col>
+                      
+                <i-col v-show="detailsModel.parentaccountname.visible"  :md="{ span: 24, offset: 0 }" style="" class="app-layoutpanel-field">
+                    <div class="item-field">
+                    
+                    <div class="item-field-content">
+                    <span>{{data.parentaccountname}}</span>
+                    </div>
+                </div>
+                
+                
+                </i-col>
+                      
+                <i-col v-show="detailsModel.parentcontactname.visible"  :md="{ span: 24, offset: 0 }" style="" class="app-layoutpanel-field">
+                    <div class="item-field">
+                    
+                    <div class="item-field-content">
+                    <span>{{data.parentcontactname}}</span>
+                    </div>
+                </div>
+                
+                
+                </i-col>
+            </row>
+        </i-col>
+    </row>
+</div>
\ No newline at end of file

app_CRM/src/widgets/opportunity/view-opp-pro-portlet/view-opp-pro-portlet-base.tsx

@@ -86,6 +86,24 @@ export class View_OppProPortletBase extends MainControlBase {
         return {};
     }
 
+    /**
+     * 获取高度
+     *
+     * @returns {any[]}
+     * @memberof View_OppProBase
+     */
+    get getHeight(): any{
+        if(!this.$util.isEmpty(this.height) && !this.$util.isNumberNaN(this.height)){
+            if(this.height == 0){
+                return 'auto';
+            } else {
+                return this.height+'px';
+            }
+        } else {
+            return 'auto';
+        }
+    }
+
     /**
      * vue 生命周期
      *

app_CRM/src/widgets/quote/view-quo-abs-portlet/view-quo-abs-portlet-base.tsx

@@ -86,6 +86,24 @@ export class View_QuoAbsPortletBase extends MainControlBase {
         return {};
     }
 
+    /**
+     * 获取高度
+     *
+     * @returns {any[]}
+     * @memberof View_QuoAbsBase
+     */
+    get getHeight(): any{
+        if(!this.$util.isEmpty(this.height) && !this.$util.isNumberNaN(this.height)){
+            if(this.height == 0){
+                return 'auto';
+            } else {
+                return this.height+'px';
+            }
+        } else {
+            return '300px';
+        }
+    }
+
     /**
      * vue 生命周期
      *