zhouweidong@lab.ibiz5.com 发布系统代码

app_web/src/locale/lanres/entities/api-open-access/api-open-access_en_US.ts

 
 export default {
+  fields: {
+    id: "开放平台接入标识",
+    name: "开放平台",
+    open_type: "开放平台类型",
+    access_key: "AccessKey(AppId)",
+    secret_key: "SecretKey(AppSecret)",
+    region_id: "RegionId",
+    access_token: "管理账号token",
+    expires_time: "管理账号token过期时间",
+  },
 	views: {
 		gridview: {
 			caption: "接入开放平台",

app_web/src/locale/lanres/entities/api-open-access/api-open-access_zh_CN.ts

 export default {
+  fields: {
+    id: "开放平台接入标识",
+    name: "开放平台",
+    open_type: "开放平台类型",
+    access_key: "AccessKey(AppId)",
+    secret_key: "SecretKey(AppSecret)",
+    region_id: "RegionId",
+    access_token: "管理账号token",
+    expires_time: "管理账号token过期时间",
+  },
 	views: {
 		gridview: {
 			caption: "接入开放平台",

app_web/src/locale/lanres/entities/msg-template/msg-template_en_US.ts

 
 export default {
+  fields: {
+    tid: "模板标识",
+    template_name: "模板标题",
+    template_type: "模板类型",
+    content: "模板内容",
+    template_id: "模板标识",
+    template_url: "URL",
+    access_id: "开放平台接入标识",
+    access_name: "开放平台",
+    open_type: "开放平台类型",
+  },
 	views: {
 		gridview: {
 			caption: "消息模板",

app_web/src/locale/lanres/entities/msg-template/msg-template_zh_CN.ts

 export default {
+  fields: {
+    tid: "模板标识",
+    template_name: "模板标题",
+    template_type: "模板类型",
+    content: "模板内容",
+    template_id: "模板标识",
+    template_url: "URL",
+    access_id: "开放平台接入标识",
+    access_name: "开放平台",
+    open_type: "开放平台类型",
+  },
 	views: {
 		gridview: {
 			caption: "消息模板",

app_web/src/pages/notify/api-open-access-edit-view/api-open-access-edit-view-base.vue

@@ -96,11 +96,11 @@
             :autosave="false" 
             :viewtag="viewtag"
             :showBusyIndicator="true"
-            updateAction=""
-            removeAction=""
-            loaddraftAction=""
-            loadAction=""
-            createAction=""
+            updateAction="Update"
+            removeAction="Remove"
+            loaddraftAction="GetDraft"
+            loadAction="Get"
+            createAction="Create"
             WFSubmitAction=""
             WFStartAction=""
             style='' 
@@ -378,6 +378,7 @@ export default class ApiOpenAccessEditViewBase extends Vue {
             form: this.$refs.form,
             p2k: '0',
             keyPSDEField: 'apiopenaccess',
+            majorPSDEField: 'name',
             isLoadDefault: true,
         });
     }

app_web/src/pages/notify/api-open-access-grid-view/api-open-access-grid-view-base.vue

@@ -9,7 +9,7 @@
             <div class='view-top-messages'>
             </div>
             <div style='margin-bottom: 6px;'>
-                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="" />
+                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="开放平台" />
                 <div class='pull-right'>
                     <div class='toolbar-container'>
                         <tooltip :transfer="true" :max-width="600">
@@ -101,8 +101,8 @@
                 :context="context" 
                 :showBusyIndicator="true"
                 v-show="isExpandSearchForm"
-                loaddraftAction=""
-                loadAction=""
+                loaddraftAction="FilterGetDraft"
+                loadAction="FilterGet"
             
                 name="searchform"  
                 ref='searchform' 
@@ -121,11 +121,11 @@
                 :gridRowActiveMode="gridRowActiveMode"
                 @save="onSave"
                 updateAction=""
-                removeAction=""
+                removeAction="Remove"
                 loaddraftAction=""
                 loadAction=""
                 createAction=""
-                fetchAction=""
+                fetchAction="FetchDefault"
                 :newdata="newdata"
                 :opendata="opendata"
                 name="grid"  
@@ -412,6 +412,7 @@ export default class ApiOpenAccessGridViewBase extends Vue {
             grid: this.$refs.grid,
             searchform: this.$refs.searchform,
             keyPSDEField: 'apiopenaccess',
+            majorPSDEField: 'name',
             isLoadDefault: true,
         });
     }

app_web/src/pages/notify/api-open-access-pickup-grid-view/api-open-access-pickup-grid-view-base.vue

@@ -9,8 +9,8 @@
                 :context="context" 
                 :showBusyIndicator="true"
                 v-show="isExpandSearchForm"
-                loaddraftAction=""
-                loadAction=""
+                loaddraftAction="FilterGetDraft"
+                loadAction="FilterGet"
             
                 name="searchform"  
                 ref='searchform' 
@@ -27,11 +27,11 @@
                 :selectedData="selectedData"
                 :showBusyIndicator="true"
                 updateAction=""
-                removeAction=""
+                removeAction="Remove"
                 loaddraftAction=""
                 loadAction=""
                 createAction=""
-                fetchAction=""
+                fetchAction="FetchDefault"
                 name="grid"  
                 ref='grid' 
                 @selectionchange="grid_selectionchange($event)"  
@@ -268,6 +268,7 @@ export default class ApiOpenAccessPickupGridViewBase extends Vue {
             grid: this.$refs.grid,
             searchform: this.$refs.searchform,
             keyPSDEField: 'apiopenaccess',
+            majorPSDEField: 'name',
             isLoadDefault: true,
         });
     }

app_web/src/pages/notify/api-open-access-pickup-view/api-open-access-pickup-view-base.vue

@@ -261,6 +261,7 @@ export default class ApiOpenAccessPickupViewBase extends Vue {
             view: this,
             pickupviewpanel: this.$refs.pickupviewpanel,
             keyPSDEField: 'apiopenaccess',
+            majorPSDEField: 'name',
             isLoadDefault: true,
         });
     }

app_web/src/pages/notify/msg-template-edit-view/msg-template-edit-view-base.vue

@@ -96,11 +96,11 @@
             :autosave="false" 
             :viewtag="viewtag"
             :showBusyIndicator="true"
-            updateAction=""
-            removeAction=""
-            loaddraftAction=""
-            loadAction=""
-            createAction=""
+            updateAction="Update"
+            removeAction="Remove"
+            loaddraftAction="GetDraft"
+            loadAction="Get"
+            createAction="Create"
             WFSubmitAction=""
             WFStartAction=""
             style='' 
@@ -378,6 +378,7 @@ export default class MsgTemplateEditViewBase extends Vue {
             form: this.$refs.form,
             p2k: '0',
             keyPSDEField: 'msgtemplate',
+            majorPSDEField: 'template_name',
             isLoadDefault: true,
         });
     }

app_web/src/pages/notify/msg-template-grid-view/msg-template-grid-view-base.vue

@@ -9,7 +9,7 @@
             <div class='view-top-messages'>
             </div>
             <div style='margin-bottom: 6px;'>
-                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="" />
+                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="模板标题" />
                 <div class='pull-right'>
                     <div class='toolbar-container'>
                         <tooltip :transfer="true" :max-width="600">
@@ -101,8 +101,8 @@
                 :context="context" 
                 :showBusyIndicator="true"
                 v-show="isExpandSearchForm"
-                loaddraftAction=""
-                loadAction=""
+                loaddraftAction="FilterGetDraft"
+                loadAction="FilterGet"
             
                 name="searchform"  
                 ref='searchform' 
@@ -121,11 +121,11 @@
                 :gridRowActiveMode="gridRowActiveMode"
                 @save="onSave"
                 updateAction=""
-                removeAction=""
+                removeAction="Remove"
                 loaddraftAction=""
                 loadAction=""
                 createAction=""
-                fetchAction=""
+                fetchAction="FetchDefault"
                 :newdata="newdata"
                 :opendata="opendata"
                 name="grid"  
@@ -412,6 +412,7 @@ export default class MsgTemplateGridViewBase extends Vue {
             grid: this.$refs.grid,
             searchform: this.$refs.searchform,
             keyPSDEField: 'msgtemplate',
+            majorPSDEField: 'template_name',
             isLoadDefault: true,
         });
     }

app_web/src/service/api-open-access/api-open-access-service-base.ts

-!!!!模版产生代码错误:----
-Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
-----
-
-----
-FTL stack trace ("~" means nesting-related):
-	- Failed at: ${item.getKeyPSAppDEField().getCodeNa...  [in template "TEMPLCODE_zh_CN" at line 566, column 26]
-----
+import { Http,Util } from '@/utils';
+import EntityService from '../entity-service';
+
+
+
+/**
+ * 接入开放平台服务对象基类
+ *
\ No newline at end of file
+ * @export
+ * @class ApiOpenAccessServiceBase
+ * @extends {EntityServie}
+ */
+export default class ApiOpenAccessServiceBase extends EntityService {
+
+    /**
+     * Creates an instance of  ApiOpenAccessServiceBase.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  ApiOpenAccessServiceBase
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+    /**
+     * 初始化基础数据
+     *
+     * @memberof ApiOpenAccessServiceBase
+     */
+    public initBasicData(){
+        this.APPLYDEKEY ='apiopenaccess';
+        this.APPDEKEY = 'id';
+        this.APPDENAME = 'apiopenaccesses';
+        this.APPDETEXT = 'name';
+        this.APPNAME = 'web';
+        this.SYSTEMNAME = 'ibznotify';
+    }
+
+// 实体接口
+
+    /**
+     * Select接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof ApiOpenAccessServiceBase
+     */
+    public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            let res:any = Http.getInstance().get(`/apiopenaccesses/${context.apiopenaccess}/select`,isloading);
+            
+            return res;
+    }
+
+    /**
+     * Create接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof ApiOpenAccessServiceBase
+     */
+    public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let masterData:any = {};
+        Object.assign(data,masterData);
+        if(!data.srffrontuf || data.srffrontuf !== "1"){
+            data[this.APPDEKEY] = null;
+        }
+        if(data.srffrontuf){
+            delete data.srffrontuf;
+        }
+        let tempContext:any = JSON.parse(JSON.stringify(context));
+        let res:any = await Http.getInstance().post(`/apiopenaccesses`,data,isloading);
+        
+        return res;
+    }
+
+    /**
+     * Update接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof ApiOpenAccessServiceBase
+     */
+    public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let masterData:any = {};
+        Object.assign(data,masterData);
+            let res:any = await  Http.getInstance().put(`/apiopenaccesses/${context.apiopenaccess}`,data,isloading);
+            
+            return res;
+    }
+
+    /**
+     * Remove接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof ApiOpenAccessServiceBase
+     */
+    public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            let res:any = Http.getInstance().delete(`/apiopenaccesses/${context.apiopenaccess}`,isloading);
+            return res;
+    }
+
+    /**
+     * Get接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof ApiOpenAccessServiceBase
+     */
+    public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            let res:any = await Http.getInstance().get(`/apiopenaccesses/${context.apiopenaccess}`,isloading);
+            
+            return res;
+    }
+
+    /**
+     * GetDraft接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof ApiOpenAccessServiceBase
+     */
+    public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let res:any = await  Http.getInstance().get(`/apiopenaccesses/getdraft`,isloading);
+        res.data.apiopenaccess = data.apiopenaccess;
+        
+        return res;
+    }
+
+    /**
+     * CheckKey接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof ApiOpenAccessServiceBase
+     */
+    public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            let res:any = Http.getInstance().post(`/apiopenaccesses/${context.apiopenaccess}/checkkey`,data,isloading);
+            return res;
+    }
+
+    /**
+     * Save接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof ApiOpenAccessServiceBase
+     */
+    public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let masterData:any = {};
+        Object.assign(data,masterData);
+            let res:any = await  Http.getInstance().post(`/apiopenaccesses/${context.apiopenaccess}/save`,data,isloading);
+            
+            return res;
+    }
+
+    /**
+     * FetchDefault接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof ApiOpenAccessServiceBase
+     */
+    public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        let res:any = Http.getInstance().get(`/apiopenaccesses/fetchdefault`,tempData,isloading);
+        return res;
+    }
+}
\ No newline at end of file

app_web/src/service/msg-template/msg-template-service-base.ts

-!!!!模版产生代码错误:----
-Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
-----
-
-----
-FTL stack trace ("~" means nesting-related):
-	- Failed at: ${item.getKeyPSAppDEField().getCodeNa...  [in template "TEMPLCODE_zh_CN" at line 566, column 26]
-----
+import { Http,Util } from '@/utils';
+import EntityService from '../entity-service';
+
+
+
+/**
+ * 消息模板服务对象基类
+ *
\ No newline at end of file
+ * @export
+ * @class MsgTemplateServiceBase
+ * @extends {EntityServie}
+ */
+export default class MsgTemplateServiceBase extends EntityService {
+
+    /**
+     * Creates an instance of  MsgTemplateServiceBase.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  MsgTemplateServiceBase
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+    /**
+     * 初始化基础数据
+     *
+     * @memberof MsgTemplateServiceBase
+     */
+    public initBasicData(){
+        this.APPLYDEKEY ='msgtemplate';
+        this.APPDEKEY = 'tid';
+        this.APPDENAME = 'msgtemplates';
+        this.APPDETEXT = 'template_name';
+        this.APPNAME = 'web';
+        this.SYSTEMNAME = 'ibznotify';
+    }
+
+// 实体接口
+
+    /**
+     * Select接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof MsgTemplateServiceBase
+     */
+    public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            let res:any = Http.getInstance().get(`/msgtemplates/${context.msgtemplate}/select`,isloading);
+            
+            return res;
+    }
+
+    /**
+     * Create接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof MsgTemplateServiceBase
+     */
+    public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let masterData:any = {};
+        Object.assign(data,masterData);
+        if(!data.srffrontuf || data.srffrontuf !== "1"){
+            data[this.APPDEKEY] = null;
+        }
+        if(data.srffrontuf){
+            delete data.srffrontuf;
+        }
+        let tempContext:any = JSON.parse(JSON.stringify(context));
+        let res:any = await Http.getInstance().post(`/msgtemplates`,data,isloading);
+        
+        return res;
+    }
+
+    /**
+     * Update接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof MsgTemplateServiceBase
+     */
+    public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let masterData:any = {};
+        Object.assign(data,masterData);
+            let res:any = await  Http.getInstance().put(`/msgtemplates/${context.msgtemplate}`,data,isloading);
+            
+            return res;
+    }
+
+    /**
+     * Remove接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof MsgTemplateServiceBase
+     */
+    public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            let res:any = Http.getInstance().delete(`/msgtemplates/${context.msgtemplate}`,isloading);
+            return res;
+    }
+
+    /**
+     * Get接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof MsgTemplateServiceBase
+     */
+    public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            let res:any = await Http.getInstance().get(`/msgtemplates/${context.msgtemplate}`,isloading);
+            
+            return res;
+    }
+
+    /**
+     * GetDraft接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof MsgTemplateServiceBase
+     */
+    public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let res:any = await  Http.getInstance().get(`/msgtemplates/getdraft`,isloading);
+        res.data.msgtemplate = data.msgtemplate;
+        
+        return res;
+    }
+
+    /**
+     * CheckKey接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof MsgTemplateServiceBase
+     */
+    public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            let res:any = Http.getInstance().post(`/msgtemplates/${context.msgtemplate}/checkkey`,data,isloading);
+            return res;
+    }
+
+    /**
+     * Save接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof MsgTemplateServiceBase
+     */
+    public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let masterData:any = {};
+        Object.assign(data,masterData);
+            let res:any = await  Http.getInstance().post(`/msgtemplates/${context.msgtemplate}/save`,data,isloading);
+            
+            return res;
+    }
+
+    /**
+     * FetchDefault接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof MsgTemplateServiceBase
+     */
+    public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        let res:any = Http.getInstance().get(`/msgtemplates/fetchdefault`,tempData,isloading);
+        return res;
+    }
+}
\ No newline at end of file

app_web/src/widgets/api-open-access/default-searchform/default-searchform-base.vue

@@ -29,6 +29,7 @@
               :localContext ='{ }' 
               :localParam ='{ }' 
               :disabled="detailsModel.n_open_type_eq.disabled" 
+              valueType="string"
               tag='OpenAccessType' 
               codelistType='STATIC'
               placeholder='请选择...' style="">

app_web/src/widgets/api-open-access/main-form/main-form-base.vue

@@ -31,6 +31,7 @@
     :localContext ='{ }' 
     :localParam ='{ }' 
     :disabled="detailsModel.open_type.disabled" 
+    valueType="string"
     tag='OpenAccessType' 
     codelistType='STATIC'
     placeholder='请选择...' style="">

app_web/src/widgets/api-open-access/main-form/main-form-model.ts

@@ -90,6 +90,11 @@ export default class MainModel {
         prop: 'id',
         dataType: 'TEXT',
       },
+      {
+        name: 'apiopenaccess',
+        prop: 'id',
+        dataType: 'FONTKEY',
+      },
     ]
   }
 

app_web/src/widgets/api-open-access/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-base.vue

-!!!!模版产生代码错误:----
-Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
-----
-
-----
-FTL stack trace ("~" means nesting-related):
-	- Failed at: ${ctrl.getPSAppDataEntity().getMajorP...  [in template "TEMPLCODE_zh_CN" at line 409, column 40]
-----
+<template>
+    <div class='pickupviewpanel'>
+        <component 
+          v-if="inited && view.viewname && !Object.is(view.viewname, '')" 
+          :is="view.viewname"
+          class="viewcontainer3"
+          :viewdata="viewdata"
+          :viewparam="viewparam"
\ No newline at end of file
+          :viewDefaultUsage="false"
+          :isSingleSelect="isSingleSelect"
+          :selectedData="selectedData"
+          :isShowButton="isShowButton"
+          @viewdataschange="onViewDatasChange"
+          @viewdatasactivated="viewDatasActivated"
+          @viewload="onViewLoad">
+        </component>
+    </div>
+</template>
+
+<script lang='tsx'>
+import { Vue, Component, Prop, Provide, Emit, Watch, Model,Inject } from 'vue-property-decorator';
+import { CreateElement } from 'vue';
+import { Subject, Subscription } from 'rxjs';
+import { ControlInterface } from '@/interface/control';
+import { UIActionTool,Util,ViewTool } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
+import AppCenterService from "@service/app/app-center-service";
+import ApiOpenAccessService from '@/service/api-open-access/api-open-access-service';
+import PickupViewpickupviewpanelService from './pickup-viewpickupviewpanel-pickupviewpanel-service';
+import ApiOpenAccessUIService from '@/uiservice/api-open-access/api-open-access-ui-service';
+import PickupViewpickupviewpanelModel from './pickup-viewpickupviewpanel-pickupviewpanel-model';
+
+
+@Component({
+    components: {
+      
+    }
+})
+export default class PickupViewpickupviewpanelBase extends Vue implements ControlInterface {
+
+    /**
+     * 名称
+     *
+     * @type {string}
+     * @memberof PickupViewpickupviewpanelBase
+     */
+    @Prop() public name?: string;
+
+    /**
+     * 视图通讯对象
+     *
+     * @type {Subject<ViewState>}
+     * @memberof PickupViewpickupviewpanelBase
+     */
+    @Prop() public viewState!: Subject<ViewState>;
+
+    /**
+     * 应用上下文
+     *
+     * @type {*}
+     * @memberof PickupViewpickupviewpanelBase
+     */
+    @Prop() public context: any;
+
+    /**
+     * 视图参数
+     *
+     * @type {*}
+     * @memberof PickupViewpickupviewpanelBase
+     */
+    @Prop() public viewparams: any;
+
+    /**
+     * 视图状态事件
+     *
+     * @public
+     * @type {(Subscription | undefined)}
+     * @memberof PickupViewpickupviewpanelBase
+     */
+    public viewStateEvent: Subscription | undefined;
+
+    /**
+     * 获取部件类型
+     *
+     * @returns {string}
+     * @memberof PickupViewpickupviewpanelBase
+     */
+    public getControlType(): string {
+        return 'PICKUPVIEWPANEL'
+    }
+
+
+
+    /**
+     * 建构部件服务对象
+     *
+     * @type {PickupViewpickupviewpanelService}
+     * @memberof PickupViewpickupviewpanelBase
+     */
+    public service: PickupViewpickupviewpanelService = new PickupViewpickupviewpanelService({ $store: this.$store });
+
+    /**
+     * 实体服务对象
+     *
+     * @type {ApiOpenAccessService}
+     * @memberof PickupViewpickupviewpanelBase
+     */
+    public appEntityService: ApiOpenAccessService = new ApiOpenAccessService({ $store: this.$store });
+    
+
+
+    /**
+     * 转化数据
+     *
+     * @param {any} args
+     * @memberof  PickupViewpickupviewpanelBase
+     */
+    public transformData(args: any) {
+        let _this: any = this;
+        if(_this.service && _this.service.handleRequestData instanceof Function && _this.service.handleRequestData('transform',_this.context,args)){
+            return _this.service.handleRequestData('transform',_this.context,args)['data'];
+        }
+    }
+
+    /**
+     * 关闭视图
+     *
+     * @param {any} args
+     * @memberof PickupViewpickupviewpanelBase
+     */
+    public closeView(args: any): void {
+        let _this: any = this;
+        _this.$emit('closeview', [args]);
+    }
+
+    /**
+     *  计数器刷新
+     *
+     * @memberof PickupViewpickupviewpanelBase
+     */
+    public counterRefresh(){
+        const _this:any =this;
+        if(_this.counterServiceArray && _this.counterServiceArray.length >0){
+            _this.counterServiceArray.forEach((item:any) =>{
+                if(item.refreshData && item.refreshData instanceof Function){
+                    item.refreshData();
+                }
+            })
+        }
+    }
+
+
+
+    /**
+     * 选中数据字符串
+     *
+     * @type {string}
+     * @memberof PickupViewpickupviewpanelBase
+     */
+    @Prop() public selectedData?: string;
+
+    /**
+     * 获取多项数据
+     *
+     * @returns {any[]}
+     * @memberof PickupViewpickupviewpanelBase
+     */
+    public getDatas(): any[] {
+        return [];
+    }
+
+    /**
+     * 获取单项树
+     *
+     * @returns {*}
+     * @memberof PickupViewpickupviewpanelBase
+     */
+    public getData(): any {
+        return {};
+    }
+
+    /**
+     * 视图名称
+     *
+     * @type {*}
+     * @memberof PickupViewpickupviewpanelBase
+     */
+    public view: any = {
+        viewname: 'api-open-access-pickup-grid-view',
+        data: {},
+    }
+
+    /**
+     * 局部上下文
+     *
+     * @type {*}
+     * @memberof PickupViewpickupviewpanelBase
+     */
+    public localContext: any = null;
+
+    /**
+     * 局部视图参数
+     *
+     * @type {*}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public localViewParam: any = null;
+
+    /**
+     * 视图数据
+     *
+     * @type {*}
+     * @memberof PickupViewpickupviewpanelBase
+     */
+    public viewdata: string  = JSON.stringify(this.context);
+
+    /**
+     * 视图参数
+     *
+     * @type {*}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public viewparam: string  = JSON.stringify(this.viewparams);
+
+    /**
+     * 是否显示按钮
+     *
+     * @type {boolean}
+     * @memberof PickupViewpickupviewpanelBase
+     */
+    @Prop({default: true}) public isShowButton!: boolean;
+
+    /**
+     * 是否单选
+     *
+     * @type {boolean}
+     * @memberof PickupViewpickupviewpanelBase
+     */
+    @Prop() public isSingleSelect?: boolean;
+
+    /**
+     * 初始化完成
+     *
+     * @type {boolean}
+     * @memberof PickupViewpickupviewpanelBase
+     */
+    public inited: boolean = false;
+
+    /**
+     * 视图数据变化
+     *
+     * @param {*} $event
+     * @memberof PickupViewpickupviewpanelBase
+     */
+    public onViewDatasChange($event: any): void {
+        if($event.length>0){
+          $event.forEach((item:any,index:any) => {
+              let srfmajortext = item['name'];
+              if(srfmajortext){
+                Object.assign($event[index],{srfmajortext: srfmajortext});
+              }
+          });
+        }
+        this.$emit('selectionchange', $event);
+    }
+
+    /**
+     * 视图数据被激活
+     *
+     * @param {*} $event
+     * @memberof PickupViewpickupviewpanelBase
+     */
+    public viewDatasActivated($event: any): void {
+        this.$emit('activated', $event);
+    }
+
+    /**
+     * 视图加载完成
+     *
+     * @param {*} $event
+     * @memberof PickupViewpickupviewpanelBase
+     */
+    public onViewLoad($event: any): void {
+        this.$emit('load', $event);
+    }
+
+    /**
+     * vue 生命周期
+     *
+     * @memberof PickupViewpickupviewpanelBase
+     */
+    public created() {
+        this.afterCreated();
+    }
+
+    /**
+     * 执行created后的逻辑
+     *
+     *  @memberof PickupViewpickupviewpanelBase
+     */    
+    public afterCreated(){
+        this.initNavParam();
+        if (this.viewState) {
+            this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
+                if (!Object.is(tag, this.name)) {
+                    return;
+                }
+                if (Object.is('load', action)) {
+                    this.viewdata = JSON.stringify(this.context);
+                    this.viewparam = JSON.stringify(Object.assign(data, this.viewparams));
+                    this.inited = true;
+                }
+            });
+        }
+    }
+
+    /**
+     * 初始化导航参数
+     *
+     *  @memberof PickupViewpickupviewpanelBase
+     */  
+    public initNavParam(){
+        if(this.localContext && Object.keys(this.localContext).length >0){
+            let _context:any = this.$util.computedNavData({},this.context,this.viewparams,this.localContext);
+            Object.assign(this.context,_context);
+        }
+        if(this.localViewParam && Object.keys(this.localViewParam).length >0){
+            let _param:any = this.$util.computedNavData({},this.context,this.viewparams,this.localViewParam);
+            Object.assign(this.viewparams,_param);
+        }
+        this.viewdata = JSON.stringify(this.context);
+        this.viewparam = JSON.stringify(this.viewparams);
+    }
+
+
+    /**
+     * vue 生命周期
+     *
+     * @memberof PickupViewpickupviewpanelBase
+     */
+    public destroyed() {
+        this.afterDestroy();
+    }
+
+    /**
+     * 执行destroyed后的逻辑
+     *
+     * @memberof PickupViewpickupviewpanelBase
+     */
+    public afterDestroy() {
+        if (this.viewStateEvent) {
+            this.viewStateEvent.unsubscribe();
+        }
+    }
+
+}
+</script>
+
+<style lang='less'>
+@import './pickup-viewpickupviewpanel-pickupviewpanel.less';
+</style>
\ No newline at end of file

app_web/src/widgets/api-open-access/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts

@@ -14,6 +14,31 @@ export default class PickupViewpickupviewpanelModel {
     */
   public getDataItems(): any[] {
     return [
+      {
+        name: 'apiopenaccess',
+        prop: 'id',
+      },
+      {
+        name: 'name',
+      },
+      {
+        name: 'open_type',
+      },
+      {
+        name: 'access_key',
+      },
+      {
+        name: 'secret_key',
+      },
+      {
+        name: 'region_id',
+      },
+      {
+        name: 'access_token',
+      },
+      {
+        name: 'expires_time',
+      },
     ]
   }
 

app_web/src/widgets/msg-template/default-searchform/default-searchform-base.vue

@@ -6,14 +6,28 @@
       <row>
                     <i-col v-show="detailsModel.n_accessname_eq.visible" :style="{}"  :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
               <app-form-item name='n_accessname_eq' :itemRules="this.rules.n_accessname_eq" class='' :caption="$t('entities.msgtemplate.default_searchform.details.n_accessname_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_accessname_eq.error" :isEmptyCaption="false" labelPos="LEFT"> 
-              !!!!模版产生代码错误:----
-          Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
-          ----
+              
+          <app-picker 
+            :formState="formState"
+            :data="data"
+            :context="context"
+            :viewparams="viewparams"
+            :localContext ='{ }' 
+            :localParam ='{ }' 
+            :disabled="detailsModel.n_accessname_eq.disabled"
+            name='n_accessname_eq'
+            deMajorField='name'
+            deKeyField='apiopenaccess'
+            :service="service"
+            :acParams="{ serviceName: 'ApiOpenAccessService', interfaceName: 'FetchDefault'}"
+            valueitem='n_accessid_eq' 
+            :value="data.n_accessname_eq" 
+            editortype="" 
+            :pickupView="{ viewname: 'api-open-access-pickup-view', title: $t('entities.apiopenaccess.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'apiopenaccesses', parameterName: 'apiopenaccess' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
+            style=""  
+            @formitemvaluechange="onFormItemValueChange">
+          </app-picker>
           
-          ----
-          FTL stack trace ("~" means nesting-related):
-          	- Failed at: ${editor.getPSAppDataEntity().getMajo...  [in template "TEMPLCODE_zh_CN" at line 169, column 17]
-          ----
           </app-form-item>
           
           </i-col>

app_web/src/widgets/msg-template/default-searchform/default-searchform-service.ts

@@ -91,6 +91,9 @@ export default class DefaultService extends ControlService {
     public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
         data.page = data.page ? data.page : 0;
         data.size = data.size ? data.size : 1000;
+        if (Object.is(serviceName, 'ApiOpenAccessService') && Object.is(interfaceName, 'FetchDefault')) {
+            return this.doItems(this.apiopenaccessService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'id', 'apiopenaccess');
+        }
 
         return Promise.reject([])
     }

app_web/src/widgets/msg-template/main-form/main-form-base.vue

@@ -8,21 +8,36 @@
     <row>
         <i-col v-show="detailsModel.accessname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='accessname' :itemRules="this.rules().accessname" class='' :caption="$t('entities.msgtemplate.main_form.details.accessname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.accessname.error" :isEmptyCaption="false" labelPos="LEFT">
-    !!!!模版产生代码错误:----
-Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
-----
-
-----
-FTL stack trace ("~" means nesting-related):
-	- Failed at: ${editor.getPSAppDataEntity().getMajo...  [in template "TEMPLCODE_zh_CN" at line 169, column 17]
-----
+    
+<app-picker 
+  :formState="formState"
+  :data="data"
+  :context="context"
+  :viewparams="viewparams"
+  :localContext ='{ }' 
+  :localParam ='{ }' 
+  :disabled="detailsModel.accessname.disabled"
+  name='accessname'
+  deMajorField='name'
+  deKeyField='apiopenaccess'
+  :service="service"
+  :acParams="{ serviceName: 'ApiOpenAccessService', interfaceName: 'FetchDefault'}"
+  valueitem='accessid' 
+  :value="data.accessname" 
+  editortype="" 
+  :pickupView="{ viewname: 'api-open-access-pickup-view', title: $t('entities.apiopenaccess.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'apiopenaccesses', parameterName: 'apiopenaccess' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
+  style=""  
+  @formitemvaluechange="onFormItemValueChange">
+</app-picker>
+
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.open_type.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='open_type' :itemRules="this.rules().open_type" class='' :caption="$t('entities.msgtemplate.main_form.details.open_type')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.open_type.error" :isEmptyCaption="false" labelPos="LEFT">
     
-<app-span name='open_type' :value="data.open_type" tag='OpenAccessType' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style="">  
+<app-span name='open_type' :value="data.open_type" dataType="PICKUPDATA"     :precision="0"
+tag='OpenAccessType' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style="">  
 </app-span>
 
 </app-form-item>

app_web/src/widgets/msg-template/main-form/main-form-model.ts

@@ -95,6 +95,11 @@ export default class MainModel {
         prop: 'tid',
         dataType: 'TEXT',
       },
+      {
+        name: 'msgtemplate',
+        prop: 'tid',
+        dataType: 'FONTKEY',
+      },
     ]
   }
 

ibznotify-app/ibznotify-app-web/src/main/resources/application-web-prod.yml

-!!!!模版产生代码错误:----
-Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
-----
-
-----
-FTL stack trace ("~" means nesting-related):
-	- Failed at: #assign sysApi = appDataEntity.getPSD...  [in template "CODETEMPL_zh_CN" at line 37, column 9]
-----
+server:
+  port: 8080
+#Log配置
+logging:
+  level:
+    cn.ibizlab: info
+#zuul网关路由设置
+zuul:
\ No newline at end of file
+  routes:
+    msg_template:
+      path: /msgtemplates/**
+      serviceId: ${ibiz.ref.service.ibznotify-api:ibznotify-api}
+      stripPrefix: false
+    api_open_access:
+      path: /apiopenaccesses/**
+      serviceId: ${ibiz.ref.service.ibznotify-api:ibznotify-api}
+      stripPrefix: false
+    loginv7:
+      path: /v7/login
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
+      stripPrefix: false
+    changepwd:
+      path: /v7/changepwd
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
+      stripPrefix: false
+    uaa:
+      path: /uaa/**
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
+      stripPrefix: false
+    config:
+      path: /config/**
+      serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
+      stripPrefix: false
+    oucore:
+      path: /ibzorganizations/**
+      serviceId: ${ibiz.ref.service.ou:ibzou-api}
+      stripPrefix: false
+  sensitive-headers:
+    - Cookie,Set-Cookie,Authorization