ibiz4j 发布系统代码

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

  [
         {
-        "srfkey": "OpenAccessType",
+        "srfkey": "TemplateType",
         "emptytext": "未定义",
         "codelisttype":"static",
         "items": [
              {
-                "id": "aliyun",
-                "label": "阿里云",
-                "text": "阿里云",
+                "id": "aliyun-sms",
+                "label": "阿里云短信",
+                "text": "阿里云短信",
                 "class":"",
                 "data":"",
-                "codename":"Aliyun",
-                "value": "aliyun",
+                "codename":"Aliyun_SUB_sms",
+                "value": "aliyun-sms",
                 
                 "disabled": false
             }
             , {
-                "id": "wechat",
-                "label": "微信开放平台",
-                "text": "微信开放平台",
+                "id": "aliyun-email",
+                "label": "阿里云邮件",
+                "text": "阿里云邮件",
                 "class":"",
                 "data":"",
-                "codename":"Wechat",
-                "value": "wechat",
+                "codename":"Aliyun_SUB_email",
+                "value": "aliyun-email",
                 
                 "disabled": false
             }
             , {
-                "id": "qq",
-                "label": "QQ互联",
-                "text": "QQ互联",
+                "id": "wechat-msg",
+                "label": "微信消息",
+                "text": "微信消息",
                 "class":"",
                 "data":"",
-                "codename":"Qq",
-                "value": "qq",
+                "codename":"Wechat_SUB_msg",
+                "value": "wechat-msg",
                 
                 "disabled": false
             }
             , {
-                "id": "dingtalk",
-                "label": "钉钉开放平台",
-                "text": "钉钉开放平台",
+                "id": "dingtalk-msg",
+                "label": "钉钉通知",
+                "text": "钉钉通知",
                 "class":"",
                 "data":"",
-                "codename":"Dingtalk",
-                "value": "dingtalk",
+                "codename":"Dingtalk_SUB_msg",
+                "value": "dingtalk-msg",
                 
                 "disabled": false
             }
         ]
     }, 
     {
-        "srfkey": "TemplateType",
+        "srfkey": "OpenAccessType",
         "emptytext": "未定义",
         "codelisttype":"static",
         "items": [
              {
-                "id": "aliyun-sms",
-                "label": "阿里云短信",
-                "text": "阿里云短信",
+                "id": "aliyun",
+                "label": "阿里云",
+                "text": "阿里云",
                 "class":"",
                 "data":"",
-                "codename":"Aliyun_SUB_sms",
-                "value": "aliyun-sms",
+                "codename":"Aliyun",
+                "value": "aliyun",
                 
                 "disabled": false
             }
             , {
-                "id": "aliyun-email",
-                "label": "阿里云邮件",
-                "text": "阿里云邮件",
+                "id": "wechat",
+                "label": "微信开放平台",
+                "text": "微信开放平台",
                 "class":"",
                 "data":"",
-                "codename":"Aliyun_SUB_email",
-                "value": "aliyun-email",
+                "codename":"Wechat",
+                "value": "wechat",
                 
                 "disabled": false
             }
             , {
-                "id": "wechat-msg",
-                "label": "微信消息",
-                "text": "微信消息",
+                "id": "qq",
+                "label": "QQ互联",
+                "text": "QQ互联",
                 "class":"",
                 "data":"",
-                "codename":"Wechat_SUB_msg",
-                "value": "wechat-msg",
+                "codename":"Qq",
+                "value": "qq",
                 
                 "disabled": false
             }
             , {
-                "id": "dingtalk-msg",
-                "label": "钉钉通知",
-                "text": "钉钉通知",
+                "id": "dingtalk",
+                "label": "钉钉开放平台",
+                "text": "钉钉开放平台",
                 "class":"",
                 "data":"",
-                "codename":"Dingtalk_SUB_msg",
-                "value": "dingtalk-msg",
+                "codename":"Dingtalk",
+                "value": "dingtalk",
                 
                 "disabled": false
             }

app_web/public/assets/json/view-config.json

 {
-    "msgopenaccesseditview": {
-        "title": "接入开放平台编辑视图",
-        "caption": "接入开放平台",
-        "viewtype": "DEEDITVIEW",
-        "viewmodule": "notify",
-        "viewname": "MsgOpenAccessEditView",
-        "viewtag": "21df20858e3e04237f987b6aabb7d53e"
-    },
-    "msgtemplategridview": {
-        "title": "消息模板表格视图",
-        "caption": "消息模板",
-        "viewtype": "DEGRIDVIEW",
-        "viewmodule": "notify",
-        "viewname": "MsgTemplateGridView",
-        "viewtag": "24012ef8f76c1733b2b2271b864aa293"
-    },
-    "msgopenaccesspickupview": {
-        "title": "接入开放平台数据选择视图",
-        "caption": "接入开放平台",
-        "viewtype": "DEPICKUPVIEW",
-        "viewmodule": "notify",
-        "viewname": "MsgOpenAccessPickupView",
-        "viewtag": "2b1e4ec8cc8d1b7d3df4c738dd32abbd"
-    },
     "msgopenaccesspickupgridview": {
         "title": "接入开放平台选择表格视图",
         "caption": "接入开放平台",
         "viewtype": "DEPICKUPGRIDVIEW",
         "viewmodule": "notify",
         "viewname": "MsgOpenAccessPickupGridView",
-        "viewtag": "7dbf0d79bec7466c6597036b21833b07"
+        "viewtag": "05c6db43c9d5946f3f6da2d2b122fcdb"
     },
     "msgopenaccessgridview": {
         "title": "接入开放平台表格视图",
@@ -37,7 +13,23 @@
         "viewtype": "DEGRIDVIEW",
         "viewmodule": "notify",
         "viewname": "MsgOpenAccessGridView",
-        "viewtag": "8563f7be052a93dffe667fdaa0dbc387"
+        "viewtag": "13944c37e6cb87c6aca28dec7b31892e"
+    },
+    "msgtemplategridview": {
+        "title": "消息模板表格视图",
+        "caption": "消息模板",
+        "viewtype": "DEGRIDVIEW",
+        "viewmodule": "notify",
+        "viewname": "MsgTemplateGridView",
+        "viewtag": "2ac24526f9a5f79abb2b9d474e57be0a"
+    },
+    "msgtemplateeditview": {
+        "title": "消息模板编辑视图",
+        "caption": "消息模板",
+        "viewtype": "DEEDITVIEW",
+        "viewmodule": "notify",
+        "viewname": "MsgTemplateEditView",
+        "viewtag": "30868cf27f47d5ec65261c8b6d5c18a1"
     },
     "msguseraccounteditview": {
         "title": "绑定消息账号编辑视图",
@@ -45,23 +37,23 @@
         "viewtype": "DEEDITVIEW",
         "viewmodule": "notify",
         "viewname": "MsgUserAccountEditView",
-        "viewtag": "8fe61032f4a886c82b93251368df0533"
+        "viewtag": "4c01113024cb96ba2f6deaa33773f0aa"
     },
-    "notifyindexview": {
-        "title": "notify",
-        "caption": "ibizlab",
-        "viewtype": "APPINDEXVIEW",
+    "msgopenaccesspickupview": {
+        "title": "接入开放平台数据选择视图",
+        "caption": "接入开放平台",
+        "viewtype": "DEPICKUPVIEW",
         "viewmodule": "notify",
-        "viewname": "NotifyIndexView",
-        "viewtag": "AB032BD4-8B7A-4848-B3D5-880390C396DC"
+        "viewname": "MsgOpenAccessPickupView",
+        "viewtag": "5fd5a34016a13395007d949d732cb30d"
     },
-    "msgtemplateeditview": {
-        "title": "消息模板编辑视图",
-        "caption": "消息模板",
+    "msgopenaccesseditview": {
+        "title": "接入开放平台编辑视图",
+        "caption": "接入开放平台",
         "viewtype": "DEEDITVIEW",
         "viewmodule": "notify",
-        "viewname": "MsgTemplateEditView",
-        "viewtag": "d40d28e6e7b714c11cc3e965236b212d"
+        "viewname": "MsgOpenAccessEditView",
+        "viewtag": "6a6e3d13c769ee31fe6ec9cc5508324f"
     },
     "msguseraccountgridview": {
         "title": "绑定消息账号表格视图",
@@ -69,6 +61,14 @@
         "viewtype": "DEGRIDVIEW",
         "viewmodule": "notify",
         "viewname": "MsgUserAccountGridView",
-        "viewtag": "e6bf4bf11c92edd8e7bfdb621580d73b"
+        "viewtag": "a186d7dee3d83d5f95c27142bece5df6"
+    },
+    "notifyindexview": {
+        "title": "notify",
+        "caption": "ibizlab",
+        "viewtype": "APPINDEXVIEW",
+        "viewmodule": "notify",
+        "viewname": "NotifyIndexView",
+        "viewtag": "b7253a520eec9b5ffa50e7bf6468ccb1"
     }
 }

app_web/src/app-register.ts

@@ -86,9 +86,6 @@ import AppLockScren from './components/app-lock-scren/app-lock-scren.vue'
 import ActionTimeline from './components/action-timeline/action-timeline.vue'
 import CronEditor from './components/cron-editor/cron-editor.vue'
 import AppMessagePopover from './components/app-message-popover/app-message-popover.vue'
-import AppPanelField from './components/app-panel-field/app-panel-field.vue'
-import AppPanelItem from './components/app-panel-item/app-panel-item.vue'
-
 
 // 全局挂载UI实体服务注册中心
 window['uiServiceRegister'] = uiServiceRegister;
@@ -114,8 +111,6 @@ export const AppComponents = {
         v.prototype.$verify = Verify;
         v.prototype.$viewTool = ViewTool;
         v.prototype.$uiActionTool = UIActionTool;
-        v.component('app-panel-item',AppPanelItem);
-        v.component('app-panel-field',AppPanelField);
         v.component('app-full-scren',AppFullScren);
         v.component('app-lock-scren',AppLockScren);
         v.component('input-box', InputBox);

app_web/src/authservice/auth-service-register.ts

@@ -39,9 +39,9 @@ export class AuthServiceRegister {
      * @memberof AuthServiceRegister
      */
     protected init(): void {
-                this.allAuthService.set('msgopenaccess', () => import('@/authservice/msg-open-access/msg-open-access-auth-service'));
+                this.allAuthService.set('msguseraccount', () => import('@/authservice/msg-user-account/msg-user-account-auth-service'));
         this.allAuthService.set('msgtemplate', () => import('@/authservice/msg-template/msg-template-auth-service'));
-        this.allAuthService.set('msguseraccount', () => import('@/authservice/msg-user-account/msg-user-account-auth-service'));
+        this.allAuthService.set('msgopenaccess', () => import('@/authservice/msg-open-access/msg-open-access-auth-service'));
     }
 
     /**

app_web/src/authservice/auth-service.ts

@@ -112,9 +112,6 @@ export default class AuthService {
      * @memberof AuthService
      */
     public getMenusPermission(item: any): boolean {
-        if(!this.$store.getters['authresource/getEnablePermissionValid']) {
-            return true;
-        }
         return this.$store.getters['authresource/getAuthMenu'](item);
     }
 
@@ -126,9 +123,6 @@ export default class AuthService {
      * @memberof AuthService
      */
     public getResourcePermission(tag: any): boolean {
-        if(!this.$store.getters['authresource/getEnablePermissionValid']) {
-            return true;
-        }
         return this.$store.getters['authresource/getResourceData'](tag);
     }
 

app_web/src/components/app-actionbar/app-actionbar.vue

@@ -100,37 +100,39 @@ export default class AppActionBar extends Vue {
    * @memberof AppActionBar
    */
   public calcActionItemAuthState(data:any,ActionModel:any,UIService:any){
-    for (const key in ActionModel) {
-        if (!ActionModel.hasOwnProperty(key)) {
-            return;
-        }
-        const _item = ActionModel[key];
-        if(_item && _item['dataaccaction'] && UIService){
-            let dataActionResult:any;
-            if(Object.is(_item['actiontarget'],"NONE")){
-                dataActionResult = UIService.getResourceOPPrivs(_item['dataaccaction']);
-            }else{
-                if(data && Object.keys(data).length >0){
-                    dataActionResult = UIService.getAllOPPrivs(data)[_item['dataaccaction']];
-                }
-            }
-            // 无权限:0;有权限:1
-            if(dataActionResult === 0){
-                // 禁用:1;隐藏:2;隐藏且默认隐藏:6
-                if(_item.noprivdisplaymode === 1){
-                    _item.disabled = true;
-                }
-                if((_item.noprivdisplaymode === 2) || (_item.noprivdisplaymode === 6)){
-                    _item.visabled = false;
-                }else{
-                    _item.visabled = true;
-                }
-            }
-            if(dataActionResult === 1){
-                _item.visabled = true;
-                _item.disabled = false;
-            }
-        }
+    if(Environment.enablePermissionValid){
+      for (const key in ActionModel) {
+          if (!ActionModel.hasOwnProperty(key)) {
+              return;
+          }
+          const _item = ActionModel[key];
+          if(_item && _item['dataaccaction'] && UIService){
+              let dataActionResult:any;
+              if(Object.is(_item['actiontarget'],"NONE")){
+                  dataActionResult = UIService.getResourceOPPrivs(_item['dataaccaction']);
+              }else{
+                  if(data && Object.keys(data).length >0){
+                      dataActionResult = UIService.getAllOPPrivs(data)[_item['dataaccaction']];
+                  }
+              }
+              // 无权限:0;有权限:1
+              if(dataActionResult === 0){
+                  // 禁用:1;隐藏:2;隐藏且默认隐藏:6
+                  if(_item.noprivdisplaymode === 1){
+                      _item.disabled = true;
+                  }
+                  if((_item.noprivdisplaymode === 2) || (_item.noprivdisplaymode === 6)){
+                      _item.visabled = false;
+                  }else{
+                      _item.visabled = true;
+                  }
+              }
+              if(dataActionResult === 1){
+                  _item.visabled = true;
+                  _item.disabled = false;
+              }
+          }
+      }
     }
   } 
 

app_web/src/components/app-data-upload/app-data-upload.less

@@ -18,7 +18,4 @@
         font-family: '微软雅黑','黑体','宋体';
         font-size: 16px;
     }
-    .progress {
-        margin-top: -15px;
-    }
 }
\ No newline at end of file

app_web/src/components/app-data-upload/app-data-upload.vue

 <template>
-    <div class="app-data-upload-view" v-loading.fullscreen="isUploading" element-loading-background="rgba(57, 57, 57, 0.2)">
+    <div class="app-data-upload-view">
         <el-row style="margin-top:24px" :gutter="20">
             <el-col :span="4">
                 <el-button type="primary" @click="handleUpLoad">{{$t('components.appDataUploadView.selectfile')}}</el-button>
@@ -13,7 +13,6 @@
             </el-col>
         </el-row>
         <el-divider></el-divider>
-        <el-progress class="progress" v-show="isUploading" :text-inside="true" :stroke-width="14" :percentage="uploadProgress"></el-progress>
         <el-row style="height:480px;padding: 0px 12px;">
             <div class="data-info-content" >
                 <template v-if="importDataArray.length >0 && isUploading === false">
@@ -51,7 +50,6 @@ import XLSX from 'xlsx';
 import CodeListService from "@service/app/codelist-service";
 import EntityService from '@/service/entity-service';
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
-import { Environment } from '@/environments/environment';
 
 @Component({
 })
@@ -193,22 +191,6 @@ export default class AppDataUploadView extends Vue {
      * @memberof AppDataUploadView
      */
     public allFieldMap:Map<string,any> = new Map();
-    
-    /**
-     * 上传服务器数据切片数
-     *
-     * @type {number}
-     * @memberof AppDataUploadView
-     */
-    public sliceUploadCnt: number = Environment.sliceUploadCnt;
-
-    /**
-     * 上传服务器进度条百分比
-     *
-     * @type {number}
-     * @memberof AppDataUploadView
-     */
-    public uploadProgress: number = 0;
 
     /**
      * 视图参数变化
@@ -300,29 +282,10 @@ export default class AppDataUploadView extends Vue {
         this.transformData(this.importDataArray,tempDataArray);
         this.hasImported = true;
         this.isUploading = true;
-        this.uploadProgress = 0;
         this.importDataArray = [];
-        this.sliceUploadService(tempDataArray, 0);
-    }
-
-    /**
-     * 数据切片上传
-     *
-     * @memberof AppDataUploadView
-     */
-    public sliceUploadService(dataArray: Array<any>, cnt: number) {
-        if(cnt > dataArray.length) {
-            this.isUploading = false;
-            this.uploadProgress = 100;
-            return;
-        }
-        let sliceArray: Array<any> = [];
-        if(dataArray) {
-            sliceArray = dataArray.slice(cnt, cnt+this.sliceUploadCnt);
-        }
         try{
             this.entityService.getService(this.viewparams.serviceName).then((service:any) =>{
-            service.ImportData(this.viewdata,{name:this.importId,importData:sliceArray}).then((res:any) =>{
+            service.ImportData(this.viewdata,{name:this.importId,importData:tempDataArray}).then((res:any) =>{
                 const result:any = res.data;
                 if(result && result.rst !== 0){
                     this.promptInfo = (this.$t('components.appDataUploadView.importfailed') as string);
@@ -331,8 +294,7 @@ export default class AppDataUploadView extends Vue {
                 }
                 this.importSuccessData = result.data;
                 this.promptInfo = (this.$t('components.appDataUploadView.completed') as string);
-                this.uploadProgress = Number((cnt / dataArray.length * 100).toFixed(2));
-                this.sliceUploadService(dataArray, cnt + this.sliceUploadCnt);
+                this.isUploading = false;
             }).catch((error:any) =>{
                 this.isUploading = false;
                 this.promptInfo = (this.$t('components.appDataUploadView.importfailed') as string);
@@ -349,6 +311,7 @@ export default class AppDataUploadView extends Vue {
             console.error(error);
         };
     }
+
     /**
      * 导出excel
      *

app_web/src/components/app-form-group/app-form-group.vue

@@ -158,36 +158,38 @@ export default class AppFormGroup extends Vue {
      * @memberof AppFormGroup
      */
     public calcActionItemAuthState(data:any,ActionModel:any,UIService:any){
-        for (const key in ActionModel) {
-            if (!ActionModel.hasOwnProperty(key)) {
-                return;
-            }
-            const _item = ActionModel[key];
-            if(_item && _item['dataaccaction'] && UIService){
-                let dataActionResult:any;
-                if(Object.is(_item['actiontarget'],"NONE")){
-                    dataActionResult = UIService.getResourceOPPrivs(_item['dataaccaction']);
-                }else{
-                    if(data && Object.keys(data).length >0){
-                        dataActionResult = UIService.getAllOPPrivs(data)[_item['dataaccaction']];
-                    }
+        if(Environment.enablePermissionValid){
+            for (const key in ActionModel) {
+                if (!ActionModel.hasOwnProperty(key)) {
+                    return;
                 }
-                // 无权限:0;有权限:1
-                if(dataActionResult === 0){
-                    // 禁用:1;隐藏:2;隐藏且默认隐藏:6
-                    if(_item.noprivdisplaymode === 1){
-                        _item.disabled = true;
-                    }
-                    if((_item.noprivdisplaymode === 2) || (_item.noprivdisplaymode === 6)){
-                        _item.visabled = false;
+                const _item = ActionModel[key];
+                if(_item && _item['dataaccaction'] && UIService){
+                    let dataActionResult:any;
+                    if(Object.is(_item['actiontarget'],"NONE")){
+                        dataActionResult = UIService.getResourceOPPrivs(_item['dataaccaction']);
                     }else{
+                        if(data && Object.keys(data).length >0){
+                            dataActionResult = UIService.getAllOPPrivs(data)[_item['dataaccaction']];
+                        }
+                    }
+                    // 无权限:0;有权限:1
+                    if(dataActionResult === 0){
+                        // 禁用:1;隐藏:2;隐藏且默认隐藏:6
+                        if(_item.noprivdisplaymode === 1){
+                            _item.disabled = true;
+                        }
+                        if((_item.noprivdisplaymode === 2) || (_item.noprivdisplaymode === 6)){
+                            _item.visabled = false;
+                        }else{
+                            _item.visabled = true;
+                        }
+                    }
+                    if(dataActionResult === 1){
                         _item.visabled = true;
+                        _item.disabled = false;
                     }
                 }
-                if(dataActionResult === 1){
-                    _item.visabled = true;
-                    _item.disabled = false;
-                }
             }
         }
     } 

app_web/src/components/app-header-menus/app-header-menus.vue

@@ -41,7 +41,7 @@ export default class AppHeaderMenus extends Vue {
       {
           name: "ibizstudio",
           title: "components.appHeaderMenus.ibizstudio.title",
-          url: `${Environment.StudioUrl}?#/common_mosindex/srfkeys=${Environment.SysId}`,
+          url: `${Environment.StudioUrl}?#/common_slnindex/srfkeys=${Environment.SlnId}/sysdesign_psdevslnsysmodeltreeexpview`,
           iconcls: 'fa fa-wrench',
       },
       {

app_web/src/components/app-message-popover/app-message-popover.vue

@@ -149,7 +149,7 @@
                     this.getMyMsgs();
                 }
             }).catch((error: any) => {
-                console.warn("加载数据错误");
+                this.$Notice.error({title: '错误', desc: error});
             })
         }
 

app_web/src/components/app-quick-group/app-quick-group.vue

@@ -65,6 +65,7 @@ export default class AppQuickGroup extends Vue {
      */
     get renderArray(){
       if(this.items && this.items.length >0){
+        this.selectedUiItem = this.items[0];
         this.handleClick(this.items[0]);
         return this.handleDataSet(this.items)
       }else{
@@ -144,9 +145,6 @@ export default class AppQuickGroup extends Vue {
      * @memberof AppQuickGroup
      */
     public handleClick($event:any,isswitch:boolean = true){
-      if(this.selectedUiItem && (this.selectedUiItem.id === $event.id)){
-        return;
-      }
       this.$emit('valuechange',$event);
       if(isswitch){
         this.selectedUiItem = $event;

app_web/src/components/app-span/app-span.vue

@@ -214,8 +214,7 @@ export default class AppSpan extends Vue {
             this.text = Number(number.toFixed(this.precision)).toLocaleString('en-US')+ ' '+ this.unitName;   
         }else if(Object.is(this.dataType,"FLOAT") || Object.is(this.dataType,"DECIMAL")){
             let number:any = Number(this.value);
-            const decimalCnt:number = this.value.toString().split('.').length > 1 ? this.value.toString().split('.')[1].length : 0;
-            this.text = (Number(this.precision) === 0 && decimalCnt !== 0) ? number.toFixed(decimalCnt) : number.toFixed(this.precision);
+            this.text = number.toFixed(this.precision);
         }else {
             this.text = this.value;
         }

app_web/src/components/context-menu-drag/context-menu-drag.vue

@@ -293,13 +293,12 @@ export default class ContextMenuDrag extends Vue {
   mounted() {
     let that: any = this;
     const get: Promise<any> = this.entityService.getAllApp(null,{});
-    get.then((response: any) => {
+    get
+      .then((response: any) => {
         if (response) {
           that.list = response.data.model;
           that.listFilter();
         }
-      }).catch((error:any) =>{
-        console.warn("加载数据错误")
       });
   }
 }

app_web/src/components/context-menu/context-menu.tsx

@@ -92,14 +92,6 @@ export default class ContextMenu extends Vue {
      */
     @Prop()
     public menus?: any[]
-    /**
-     * 是否阻止默认绘制上下文菜单
-     *
-     * @type {any}
-     * @memberof ContextMenu
-     */
-    @Prop({default:false})
-    public isBlocked?:any;
 
     /**
      * 显示右键菜单
@@ -203,10 +195,7 @@ export default class ContextMenu extends Vue {
         if (contextRef) {
             contextRef.oncontextmenu = (event: MouseEvent) => {
                 event.preventDefault();
-                if(!this.isBlocked){
-                    this.showContextMenu(event.clientX, event.clientY);
-                }
-                this.$emit("showContext",event);
+                this.showContextMenu(event.clientX, event.clientY);
             };
         }
     }

app_web/src/counter/counter-service.ts

 import { Store } from 'vuex';
-import EntityService from '@/service/entity-service';
-
 
 /**
  * 计数器服务基类
@@ -18,51 +16,6 @@ export default class CounterService {
      * @memberof CounterService
      */
     private $store: Store<any> | null = null;
-    
-    /**
-     * 当前计数器数据
-     * 
-     * @protected
-     * @type {*}
-     * @memberof  CounterService
-     */
-    protected counterData:any ={};
-
-    /**
-     * 应用实体数据服务
-     *
-     * @protected
-     * @type {EntityService}
-     * @memberof CounterService
-     */    
-    protected appEntityService:EntityService = new EntityService();
-
-    /**
-     * 当前计数器导航上下文
-     * 
-     * @protected
-     * @type {*}
-     * @memberof  CounterService
-     */
-    protected context:any ={};
-
-    /**
-     * 当前计数器导航参数
-     * 
-     * @protected
-     * @type {*}
-     * @memberof  CounterService
-     */
-    protected viewparams:any ={};
-
-    /**
-     * 当前计数器定时器对象
-     * 
-     * @protected
-     * @type {*}
-     * @memberof  CounterService
-     */
-    protected timer:any;
 
     /**
      * Creates an instance of CounterService.
@@ -72,8 +25,6 @@ export default class CounterService {
      */
     constructor(opts: any = {}) {
         this.$store = opts.$store;
-        this.context = opts.context?opts.context:{};
-        this.viewparams = opts.viewparams?opts.viewparams:{};
     }
 
     /**
@@ -98,13 +49,5 @@ export default class CounterService {
         return (window as any)['counterServiceRegister'].getService(name);
     }
 
-    /**
-     * 销毁计数器
-     *
-     * @memberof ActionCounterCounterServiceBase
-     */
-    public destroyCounter(){
-        if(this.timer) clearInterval(this.timer);
-    }
-  
+   
 }
\ No newline at end of file

app_web/src/engine/view/view-engine.ts

@@ -186,37 +186,39 @@ export default class ViewEngine {
      * @memberof ViewEngine
      */
     public calcToolbarItemAuthState(data:any){
-        const _this: any = this;
-        for (const key in _this.view.toolBarModels) {
-            if (!_this.view.toolBarModels.hasOwnProperty(key)) {
-                return;
-            }
-            const _item = _this.view.toolBarModels[key];
-            if(_item && _item['dataaccaction'] && _this.view.appUIService){
-                let dataActionResult:any;
-                if (_item.uiaction && (Object.is(_item.uiaction.target, 'NONE'))){
-                    dataActionResult = _this.view.appUIService.getResourceOPPrivs(_item['dataaccaction']);
-                }else{
-                    if(data && Object.keys(data).length >0){
-                        dataActionResult= _this.view.appUIService.getAllOPPrivs(data)[_item['dataaccaction']];       
-                    }
+        if(Environment.enablePermissionValid){
+            const _this: any = this;
+            for (const key in _this.view.toolBarModels) {
+                if (!_this.view.toolBarModels.hasOwnProperty(key)) {
+                    return;
                 }
-                // 无权限:0;有权限:1
-                if(dataActionResult === 0){
-                    // 禁用:1;隐藏:2;隐藏且默认隐藏:6
-                    if(_item.noprivdisplaymode === 1){
-                        _this.view.toolBarModels[key].disabled = true;
-                    }
-                    if((_item.noprivdisplaymode === 2) || (_item.noprivdisplaymode === 6)){
-                        _this.view.toolBarModels[key].visabled = false;
+                const _item = _this.view.toolBarModels[key];
+                if(_item && _item['dataaccaction'] && _this.view.appUIService){
+                    let dataActionResult:any;
+                    if (_item.uiaction && (Object.is(_item.uiaction.target, 'NONE'))){
+                        dataActionResult = _this.view.appUIService.getResourceOPPrivs(_item['dataaccaction']);
                     }else{
+                        if(data && Object.keys(data).length >0){
+                            dataActionResult= _this.view.appUIService.getAllOPPrivs(data)[_item['dataaccaction']];       
+                        }
+                    }
+                    // 无权限:0;有权限:1
+                    if(dataActionResult === 0){
+                        // 禁用:1;隐藏:2;隐藏且默认隐藏:6
+                        if(_item.noprivdisplaymode === 1){
+                            _this.view.toolBarModels[key].disabled = true;
+                        }
+                        if((_item.noprivdisplaymode === 2) || (_item.noprivdisplaymode === 6)){
+                            _this.view.toolBarModels[key].visabled = false;
+                        }else{
+                            _this.view.toolBarModels[key].visabled = true;
+                        }
+                    }
+                    if(dataActionResult === 1){
                         _this.view.toolBarModels[key].visabled = true;
+                        _this.view.toolBarModels[key].disabled = false;
                     }
                 }
-                if(dataActionResult === 1){
-                    _this.view.toolBarModels[key].visabled = true;
-                    _this.view.toolBarModels[key].disabled = false;
-                }
             }
         }
     }   

app_web/src/engine/view/wfdyna-exp-grid-view-engine.ts

@@ -49,7 +49,6 @@ export default class WFDynaExpGridViewEngine extends GridViewEngine {
     public onCtrlEvent(ctrlName: string, eventName: string, args: any): void {
         if (Object.is(ctrlName, 'grid')) {
             this.GridEvent(eventName, args);
-            return;
         }
         super.onCtrlEvent(ctrlName, eventName, args);
     }

app_web/src/environments/environment.ts

@@ -15,8 +15,6 @@ export const Environment = {
     ExportFile: '/ibizutil/download',
     // 文件上传
     UploadFile: '/ibizutil/upload',
-    // 数据导入单次上传最大数量
-    sliceUploadCnt: 100,
     // 是否为pc端应用
     isAppMode:true,
     //统一地址
@@ -38,7 +36,7 @@ export const Environment = {
     // 前端应用标识
     AppId: "6e0b7357169ef4eba84e1347ed94bd84",
     // 项目发布文件地址
-    PublishProjectUrl: 'http://oauth2:ymrzrgzh97axsgq_TjR3@labcs.ibizee.cn/ibiz4jteam/ibznotify.git',
+    PublishProjectUrl: 'http://oauth2:cTux_e7Aoz1PrasP5dDq@demo.ibizlab.cn/ibiz4jteam/ibznotify.git',
     // ibiz开放平台地址
     ibizlabtUrl: 'https://www.ibizlab.cn',
     // ibiz论坛地址

app_web/src/locale/lang/en-US.ts

-import msgopenaccess_en_US from '@locale/lanres/entities/msg-open-access/msg-open-access_en_US';
-import msgtemplate_en_US from '@locale/lanres/entities/msg-template/msg-template_en_US';
 import msguseraccount_en_US from '@locale/lanres/entities/msg-user-account/msg-user-account_en_US';
+import msgtemplate_en_US from '@locale/lanres/entities/msg-template/msg-template_en_US';
+import msgopenaccess_en_US from '@locale/lanres/entities/msg-open-access/msg-open-access_en_US';
 import components_en_US from '@locale/lanres/components/components_en_US';
 import codelist_en_US from '@locale/lanres/codelist/codelist_en_US';
 import userCustom_en_US from '@locale/lanres/userCustom/userCustom_en_US';
@@ -218,9 +218,9 @@ export default {
         },
     },
     entities: {
-        msgopenaccess: msgopenaccess_en_US,
-        msgtemplate: msgtemplate_en_US,
         msguseraccount: msguseraccount_en_US,
+        msgtemplate: msgtemplate_en_US,
+        msgopenaccess: msgopenaccess_en_US,
     },
     components: components_en_US,
     codelist: codelist_en_US,

app_web/src/locale/lang/zh-CN.ts

-import msgopenaccess_zh_CN from '@locale/lanres/entities/msg-open-access/msg-open-access_zh_CN';
-import msgtemplate_zh_CN from '@locale/lanres/entities/msg-template/msg-template_zh_CN';
 import msguseraccount_zh_CN from '@locale/lanres/entities/msg-user-account/msg-user-account_zh_CN';
+import msgtemplate_zh_CN from '@locale/lanres/entities/msg-template/msg-template_zh_CN';
+import msgopenaccess_zh_CN from '@locale/lanres/entities/msg-open-access/msg-open-access_zh_CN';
 import components_zh_CN from '@locale/lanres/components/components_zh_CN';
 import codelist_zh_CN from '@locale/lanres/codelist/codelist_zh_CN';
 import userCustom_zh_CN from '@locale/lanres/userCustom/userCustom_zh_CN';
@@ -217,9 +217,9 @@ export default {
         },
     },
     entities: {
-        msgopenaccess: msgopenaccess_zh_CN,
-        msgtemplate: msgtemplate_zh_CN,
         msguseraccount: msguseraccount_zh_CN,
+        msgtemplate: msgtemplate_zh_CN,
+        msgopenaccess: msgopenaccess_zh_CN,
     },
     components: components_zh_CN,
     codelist: codelist_zh_CN,

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

 export default {
-    OpenAccessType: {
-        "aliyun": "阿里云",
-        "wechat": "微信开放平台",
-        "qq": "QQ互联",
-        "dingtalk": "钉钉开放平台",
-        "empty": ""
-    },
     TemplateType: {
         "aliyun-sms": "阿里云短信",
         "aliyun-email": "阿里云邮件",
@@ -13,4 +6,11 @@ export default {
         "dingtalk-msg": "钉钉通知",
         "empty": ""
     },
+    OpenAccessType: {
+        "aliyun": "阿里云",
+        "wechat": "微信开放平台",
+        "qq": "QQ互联",
+        "dingtalk": "钉钉开放平台",
+        "empty": ""
+    },
 };
\ No newline at end of file

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

 export default {
-    OpenAccessType: {
-        "aliyun": "阿里云",
-        "wechat": "微信开放平台",
-        "qq": "QQ互联",
-        "dingtalk": "钉钉开放平台",
-        "empty": "",
-    },
     TemplateType: {
         "aliyun-sms": "阿里云短信",
         "aliyun-email": "阿里云邮件",
@@ -13,4 +6,11 @@ export default {
         "dingtalk-msg": "钉钉通知",
         "empty": "",
     },
+    OpenAccessType: {
+        "aliyun": "阿里云",
+        "wechat": "微信开放平台",
+        "qq": "QQ互联",
+        "dingtalk": "钉钉开放平台",
+        "empty": "",
+    },
 };
\ No newline at end of file

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

@@ -13,14 +13,6 @@ export default {
     redirect_uri: "RedirectURI",
   },
 	views: {
-		editview: {
-			caption: "接入开放平台",
-      		title: "接入开放平台编辑视图",
-		},
-		pickupview: {
-			caption: "接入开放平台",
-      		title: "接入开放平台数据选择视图",
-		},
 		pickupgridview: {
 			caption: "接入开放平台",
       		title: "接入开放平台选择表格视图",
@@ -29,6 +21,14 @@ export default {
 			caption: "接入开放平台",
       		title: "接入开放平台表格视图",
 		},
+		pickupview: {
+			caption: "接入开放平台",
+      		title: "接入开放平台数据选择视图",
+		},
+		editview: {
+			caption: "接入开放平台",
+      		title: "接入开放平台编辑视图",
+		},
 	},
 	main_form: {
 		details: {
@@ -72,6 +72,64 @@ export default {
 		uiactions: {
 		},
 	},
+	gridviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "New",
+			tip: "New",
+		},
+		tbitem4: {
+			caption: "Edit",
+			tip: "Edit {0}",
+		},
+		tbitem6: {
+			caption: "Copy",
+			tip: "Copy {0}",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "Remove",
+			tip: "Remove {0}",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "Export",
+			tip: "Export {0} Data To Excel",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem16: {
+			caption: "其它",
+			tip: "其它",
+		},
+		tbitem21: {
+			caption: "Export Data Model",
+			tip: "导出数据模型",
+		},
+		tbitem23: {
+			caption: "数据导入",
+			tip: "数据导入",
+		},
+		tbitem17: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "Filter",
+			tip: "Filter",
+		},
+		tbitem18: {
+			caption: "Help",
+			tip: "Help",
+		},
+	},
 	editviewtoolbar_toolbar: {
 		tbitem3: {
 			caption: "Save",
@@ -138,62 +196,4 @@ export default {
 			tip: "Help",
 		},
 	},
-	gridviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "New",
-			tip: "New",
-		},
-		tbitem4: {
-			caption: "Edit",
-			tip: "Edit {0}",
-		},
-		tbitem6: {
-			caption: "Copy",
-			tip: "Copy {0}",
-		},
-		tbitem7: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem8: {
-			caption: "Remove",
-			tip: "Remove {0}",
-		},
-		tbitem9: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem13: {
-			caption: "Export",
-			tip: "Export {0} Data To Excel",
-		},
-		tbitem10: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem16: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem21: {
-			caption: "Export Data Model",
-			tip: "导出数据模型",
-		},
-		tbitem23: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-		tbitem17: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem19: {
-			caption: "Filter",
-			tip: "Filter",
-		},
-		tbitem18: {
-			caption: "Help",
-			tip: "Help",
-		},
-	},
 };
\ No newline at end of file

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

@@ -12,14 +12,6 @@ export default {
     redirect_uri: "RedirectURI",
   },
 	views: {
-		editview: {
-			caption: "接入开放平台",
-      		title: "接入开放平台编辑视图",
-		},
-		pickupview: {
-			caption: "接入开放平台",
-      		title: "接入开放平台数据选择视图",
-		},
 		pickupgridview: {
 			caption: "接入开放平台",
       		title: "接入开放平台选择表格视图",
@@ -28,6 +20,14 @@ export default {
 			caption: "接入开放平台",
       		title: "接入开放平台表格视图",
 		},
+		pickupview: {
+			caption: "接入开放平台",
+      		title: "接入开放平台数据选择视图",
+		},
+		editview: {
+			caption: "接入开放平台",
+      		title: "接入开放平台编辑视图",
+		},
 	},
 	main_form: {
 		details: {
@@ -71,6 +71,64 @@ export default {
 		uiactions: {
 		},
 	},
+	gridviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem4: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		tbitem6: {
+			caption: "拷贝",
+			tip: "拷贝",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "删除",
+			tip: "删除",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "导出",
+			tip: "导出",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem16: {
+			caption: "其它",
+			tip: "其它",
+		},
+		tbitem21: {
+			caption: "导出数据模型",
+			tip: "导出数据模型",
+		},
+		tbitem23: {
+			caption: "数据导入",
+			tip: "数据导入",
+		},
+		tbitem17: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "过滤",
+			tip: "过滤",
+		},
+		tbitem18: {
+			caption: "帮助",
+			tip: "帮助",
+		},
+	},
 	editviewtoolbar_toolbar: {
 		tbitem3: {
 			caption: "保存",
@@ -137,62 +195,4 @@ export default {
 			tip: "帮助",
 		},
 	},
-	gridviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem4: {
-			caption: "编辑",
-			tip: "编辑",
-		},
-		tbitem6: {
-			caption: "拷贝",
-			tip: "拷贝",
-		},
-		tbitem7: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem8: {
-			caption: "删除",
-			tip: "删除",
-		},
-		tbitem9: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem13: {
-			caption: "导出",
-			tip: "导出",
-		},
-		tbitem10: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem16: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem21: {
-			caption: "导出数据模型",
-			tip: "导出数据模型",
-		},
-		tbitem23: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-		tbitem17: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem19: {
-			caption: "过滤",
-			tip: "过滤",
-		},
-		tbitem18: {
-			caption: "帮助",
-			tip: "帮助",
-		},
-	},
 };
\ No newline at end of file

app_web/src/mock/app/notify-index-view-appmenu/notify-index-view-appmenu.ts

@@ -11,7 +11,7 @@ mock.onGet('v7/notify-index-viewappmenu').reply((config: any) => {
         name: 'appmenu',
         items:  [
             {
-	id: '3006BFD1-CFF7-43D0-BD00-14D491D4EABD',
+	id: '46e30d9996c90c9d617fdc7d75936058',
 	name: 'menuitem1',
 	text: '接入第三方平台',
 	type: 'MENUITEM',
@@ -29,7 +29,7 @@ mock.onGet('v7/notify-index-viewappmenu').reply((config: any) => {
 	resourcetag: '',
 },
             {
-	id: '7E11B4BD-A48E-48A9-9010-F40C7B7C60FD',
+	id: 'bb418fcd75aff6e293b7b8b416bb01ce',
 	name: 'menuitem2',
 	text: '消息模板',
 	type: 'MENUITEM',
@@ -47,7 +47,7 @@ mock.onGet('v7/notify-index-viewappmenu').reply((config: any) => {
 	resourcetag: '',
 },
             {
-	id: '565D9E14-3E01-43ED-AF79-22C27416DD15',
+	id: '6199646ee62aeb492996a780d1c3365f',
 	name: 'menuitem3',
 	text: '消息账户',
 	type: 'MENUITEM',

app_web/src/mock/appdata/appdata.ts

@@ -33,7 +33,6 @@ mock.onGet('/appdata').reply((config: any) => {
           // 当前用户条线代码
          srfsectorbc:""
         },
-        enablepermissionvalid:false,
         unires:["RESOURCE1","RESOURCE2"],
          //当前用户所有组织部门标识
          srforgsections:[{"srforgsectorid":"5bd1ecf4d3c31e31cb66373df56b852f","srforgsectorname":"项目一部"},{"srforgsectorid":"2ad1ecf4d3c31e31cb66373df56b852f","srforgsectorname":"项目二部"}]

app_web/src/mock/codelist/codelist.ts

@@ -8,102 +8,102 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
     let status = MockAdapter.mockStatus(config);
     return [status, [
         {
-        srfkey: "OpenAccessType",
+        srfkey: "TemplateType",
         emptytext: "未定义",
         "codelisttype":"static",
         items: [
             {
-                id: "aliyun",
-                label: "阿里云",
-                text: "阿里云",
+                id: "aliyun-sms",
+                label: "阿里云短信",
+                text: "阿里云短信",
                 "class":"",
                 "data":"",
-                "codename":"Aliyun",
-                value: "aliyun",
+                "codename":"Aliyun_SUB_sms",
+                value: "aliyun-sms",
                 
                 disabled: false,
             },
             {
-                id: "wechat",
-                label: "微信开放平台",
-                text: "微信开放平台",
+                id: "aliyun-email",
+                label: "阿里云邮件",
+                text: "阿里云邮件",
                 "class":"",
                 "data":"",
-                "codename":"Wechat",
-                value: "wechat",
+                "codename":"Aliyun_SUB_email",
+                value: "aliyun-email",
                 
                 disabled: false,
             },
             {
-                id: "qq",
-                label: "QQ互联",
-                text: "QQ互联",
+                id: "wechat-msg",
+                label: "微信消息",
+                text: "微信消息",
                 "class":"",
                 "data":"",
-                "codename":"Qq",
-                value: "qq",
+                "codename":"Wechat_SUB_msg",
+                value: "wechat-msg",
                 
                 disabled: false,
             },
             {
-                id: "dingtalk",
-                label: "钉钉开放平台",
-                text: "钉钉开放平台",
+                id: "dingtalk-msg",
+                label: "钉钉通知",
+                text: "钉钉通知",
                 "class":"",
                 "data":"",
-                "codename":"Dingtalk",
-                value: "dingtalk",
+                "codename":"Dingtalk_SUB_msg",
+                value: "dingtalk-msg",
                 
                 disabled: false,
             },
         ]
     },
     {
-        srfkey: "TemplateType",
+        srfkey: "OpenAccessType",
         emptytext: "未定义",
         "codelisttype":"static",
         items: [
             {
-                id: "aliyun-sms",
-                label: "阿里云短信",
-                text: "阿里云短信",
+                id: "aliyun",
+                label: "阿里云",
+                text: "阿里云",
                 "class":"",
                 "data":"",
-                "codename":"Aliyun_SUB_sms",
-                value: "aliyun-sms",
+                "codename":"Aliyun",
+                value: "aliyun",
                 
                 disabled: false,
             },
             {
-                id: "aliyun-email",
-                label: "阿里云邮件",
-                text: "阿里云邮件",
+                id: "wechat",
+                label: "微信开放平台",
+                text: "微信开放平台",
                 "class":"",
                 "data":"",
-                "codename":"Aliyun_SUB_email",
-                value: "aliyun-email",
+                "codename":"Wechat",
+                value: "wechat",
                 
                 disabled: false,
             },
             {
-                id: "wechat-msg",
-                label: "微信消息",
-                text: "微信消息",
+                id: "qq",
+                label: "QQ互联",
+                text: "QQ互联",
                 "class":"",
                 "data":"",
-                "codename":"Wechat_SUB_msg",
-                value: "wechat-msg",
+                "codename":"Qq",
+                value: "qq",
                 
                 disabled: false,
             },
             {
-                id: "dingtalk-msg",
-                label: "钉钉通知",
-                text: "钉钉通知",
+                id: "dingtalk",
+                label: "钉钉开放平台",
+                text: "钉钉开放平台",
                 "class":"",
                 "data":"",
-                "codename":"Dingtalk_SUB_msg",
-                value: "dingtalk-msg",
+                "codename":"Dingtalk",
+                value: "dingtalk",
                 
                 disabled: false,
             },

app_web/src/mock/index.ts

@@ -7,6 +7,6 @@ import './login/login';
 import './upload/upload';
 
 // 实体级接口对象
-import './entity/msg-open-accesss/msg-open-accesss';
-import './entity/msg-templates/msg-templates';
 import './entity/msg-user-accounts/msg-user-accounts';
+import './entity/msg-templates/msg-templates';
+import './entity/msg-open-accesss/msg-open-accesss';

app_web/src/mock/viewconfig/viewconfig.ts

@@ -7,37 +7,13 @@ import Mock from 'mockjs'
 mock.onGet('./assets/json/view-config.json').reply((config: any) => {
     let status = MockAdapter.mockStatus(config);
     return [status,{
-                "msgopenaccesseditview": {
-            "title": "接入开放平台编辑视图",
-            "caption": "接入开放平台",
-            "viewtype": "DEEDITVIEW",
-            "viewmodule": "notify",
-            "viewname": "MsgOpenAccessEditView",
-            "viewtag": "21df20858e3e04237f987b6aabb7d53e"
-        },
-        "msgtemplategridview": {
-            "title": "消息模板表格视图",
-            "caption": "消息模板",
-            "viewtype": "DEGRIDVIEW",
-            "viewmodule": "notify",
-            "viewname": "MsgTemplateGridView",
-            "viewtag": "24012ef8f76c1733b2b2271b864aa293"
-        },
-        "msgopenaccesspickupview": {
-            "title": "接入开放平台数据选择视图",
-            "caption": "接入开放平台",
-            "viewtype": "DEPICKUPVIEW",
-            "viewmodule": "notify",
-            "viewname": "MsgOpenAccessPickupView",
-            "viewtag": "2b1e4ec8cc8d1b7d3df4c738dd32abbd"
-        },
-        "msgopenaccesspickupgridview": {
+                "msgopenaccesspickupgridview": {
             "title": "接入开放平台选择表格视图",
             "caption": "接入开放平台",
             "viewtype": "DEPICKUPGRIDVIEW",
             "viewmodule": "notify",
             "viewname": "MsgOpenAccessPickupGridView",
-            "viewtag": "7dbf0d79bec7466c6597036b21833b07"
+            "viewtag": "05c6db43c9d5946f3f6da2d2b122fcdb"
         },
         "msgopenaccessgridview": {
             "title": "接入开放平台表格视图",
@@ -45,7 +21,23 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtype": "DEGRIDVIEW",
             "viewmodule": "notify",
             "viewname": "MsgOpenAccessGridView",
-            "viewtag": "8563f7be052a93dffe667fdaa0dbc387"
+            "viewtag": "13944c37e6cb87c6aca28dec7b31892e"
+        },
+        "msgtemplategridview": {
+            "title": "消息模板表格视图",
+            "caption": "消息模板",
+            "viewtype": "DEGRIDVIEW",
+            "viewmodule": "notify",
+            "viewname": "MsgTemplateGridView",
+            "viewtag": "2ac24526f9a5f79abb2b9d474e57be0a"
+        },
+        "msgtemplateeditview": {
+            "title": "消息模板编辑视图",
+            "caption": "消息模板",
+            "viewtype": "DEEDITVIEW",
+            "viewmodule": "notify",
+            "viewname": "MsgTemplateEditView",
+            "viewtag": "30868cf27f47d5ec65261c8b6d5c18a1"
         },
         "msguseraccounteditview": {
             "title": "绑定消息账号编辑视图",
@@ -53,23 +45,23 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtype": "DEEDITVIEW",
             "viewmodule": "notify",
             "viewname": "MsgUserAccountEditView",
-            "viewtag": "8fe61032f4a886c82b93251368df0533"
+            "viewtag": "4c01113024cb96ba2f6deaa33773f0aa"
         },
-        "notifyindexview": {
-            "title": "notify",
-            "caption": "ibizlab",
-            "viewtype": "APPINDEXVIEW",
+        "msgopenaccesspickupview": {
+            "title": "接入开放平台数据选择视图",
+            "caption": "接入开放平台",
+            "viewtype": "DEPICKUPVIEW",
             "viewmodule": "notify",
-            "viewname": "NotifyIndexView",
-            "viewtag": "AB032BD4-8B7A-4848-B3D5-880390C396DC"
+            "viewname": "MsgOpenAccessPickupView",
+            "viewtag": "5fd5a34016a13395007d949d732cb30d"
         },
-        "msgtemplateeditview": {
-            "title": "消息模板编辑视图",
-            "caption": "消息模板",
+        "msgopenaccesseditview": {
+            "title": "接入开放平台编辑视图",
+            "caption": "接入开放平台",
             "viewtype": "DEEDITVIEW",
             "viewmodule": "notify",
-            "viewname": "MsgTemplateEditView",
-            "viewtag": "d40d28e6e7b714c11cc3e965236b212d"
+            "viewname": "MsgOpenAccessEditView",
+            "viewtag": "6a6e3d13c769ee31fe6ec9cc5508324f"
         },
         "msguseraccountgridview": {
             "title": "绑定消息账号表格视图",
@@ -77,7 +69,15 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtype": "DEGRIDVIEW",
             "viewmodule": "notify",
             "viewname": "MsgUserAccountGridView",
-            "viewtag": "e6bf4bf11c92edd8e7bfdb621580d73b"
+            "viewtag": "a186d7dee3d83d5f95c27142bece5df6"
+        },
+        "notifyindexview": {
+            "title": "notify",
+            "caption": "ibizlab",
+            "viewtype": "APPINDEXVIEW",
+            "viewmodule": "notify",
+            "viewname": "NotifyIndexView",
+            "viewtag": "b7253a520eec9b5ffa50e7bf6468ccb1"
         }
     }];
 });
\ No newline at end of file

app_web/src/pages/notify/msg-open-access-edit-view/msg-open-access-edit-view.less

@@ -8,19 +8,19 @@
 .msg-open-access-edit-view{
     position: relative;
 }
-        .toolbar-container {
-            button {
-                margin: 6px 0px 4px 4px;
-                .caption {
-                    margin-left: 4px;
-                }
-            }
-            .seperator {
-                color: #dcdee2;
-                margin: 0 0px 0 4px;
-            }
-        }
-        
-        // this is less
+        .toolbar-container {
+            button {
+                margin: 6px 0px 4px 4px;
+                .caption {
+                    margin-left: 4px;
+                }
+            }
+            .seperator {
+                color: #dcdee2;
+                margin: 0 0px 0 4px;
+            }
+        }
+        
+        // this is less
 
 

app_web/src/pages/notify/msg-open-access-grid-view/msg-open-access-grid-view.less

 .msg-open-access-grid-view{
     position: relative;
 }
-        .toolbar-container {
-            button {
-                margin: 6px 0px 4px 4px;
-                .caption {
-                    margin-left: 4px;
-                }
-            }
-            .seperator {
-                color: #dcdee2;
-                margin: 0 0px 0 4px;
-            }
-        }
-        
-        // this is less
+        .toolbar-container {
+            button {
+                margin: 6px 0px 4px 4px;
+                .caption {
+                    margin-left: 4px;
+                }
+            }
+            .seperator {
+                color: #dcdee2;
+                margin: 0 0px 0 4px;
+            }
+        }
+        
+        // this is less
 
 

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

@@ -3,43 +3,43 @@
     <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="msgopenaccesspickupgridview"></app-studioaction>
     <card class='view-card view-no-caption  view-no-toolbar' :dis-hover="true" :bordered="false">
         <div class='content-container pickup-grid-view'>
-            <view_searchform 
-                :viewState="viewState"  
-                :viewparams="viewparams" 
-                :context="context" 
-                :showBusyIndicator="true"
-                v-show="isExpandSearchForm"
-                loaddraftAction="FilterGetDraft"
-                loadAction="FilterGet"
-            
-                name="searchform"  
-                ref='searchform' 
-                @save="searchform_save($event)"  
-                @search="searchform_search($event)"  
-                @load="searchform_load($event)"  
-                @closeview="closeView($event)">
-            </view_searchform>
-            <view_grid 
-                :viewState="viewState"  
-                :viewparams="viewparams" 
-                :context="context" 
-                :isSingleSelect="isSingleSelect"
-                :selectedData="selectedData"
-                :showBusyIndicator="true"
-                updateAction=""
-                removeAction="Remove"
-                loaddraftAction=""
-                loadAction=""
-                createAction=""
-                fetchAction="FetchDefault"
-                name="grid"  
-                ref='grid' 
-                @selectionchange="grid_selectionchange($event)"  
-                @beforeload="grid_beforeload($event)"  
-                @rowdblclick="grid_rowdblclick($event)"  
-                @load="grid_load($event)"  
-                @closeview="closeView($event)">
-            </view_grid>
+            <view_searchform 
+                :viewState="viewState"  
+                :viewparams="viewparams" 
+                :context="context" 
+                :showBusyIndicator="true"
+                v-show="isExpandSearchForm"
+                loaddraftAction="FilterGetDraft"
+                loadAction="FilterGet"
+            
+                name="searchform"  
+                ref='searchform' 
+                @save="searchform_save($event)"  
+                @search="searchform_search($event)"  
+                @load="searchform_load($event)"  
+                @closeview="closeView($event)">
+            </view_searchform>
+            <view_grid 
+                :viewState="viewState"  
+                :viewparams="viewparams" 
+                :context="context" 
+                :isSingleSelect="isSingleSelect"
+                :selectedData="selectedData"
+                :showBusyIndicator="true"
+                updateAction=""
+                removeAction="Remove"
+                loaddraftAction=""
+                loadAction=""
+                createAction=""
+                fetchAction="FetchDefault"
+                name="grid"  
+                ref='grid' 
+                @selectionchange="grid_selectionchange($event)"  
+                @beforeload="grid_beforeload($event)"  
+                @rowdblclick="grid_rowdblclick($event)"  
+                @load="grid_load($event)"  
+                @closeview="closeView($event)">
+            </view_grid>
         </div>
     </card>
 </div>
@@ -79,6 +79,15 @@ export default class MsgOpenAccessPickupGridViewBase extends Vue {
      * @memberof MsgOpenAccessPickupGridViewBase
      */
     public appUIService: MsgOpenAccessUIService = new MsgOpenAccessUIService(this.$store);
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @type {Array<*>}
+     * @memberof MsgOpenAccessPickupGridViewBase
+     */    
+    public counterServiceArray:Array<any> = [];
     
     /**
      * 数据变化
@@ -131,7 +140,7 @@ export default class MsgOpenAccessPickupGridViewBase extends Vue {
 	 * @type {string}
 	 * @memberof MsgOpenAccessPickupGridViewBase
 	 */
-	public viewtag: string = '7dbf0d79bec7466c6597036b21833b07';
+	public viewtag: string = '05c6db43c9d5946f3f6da2d2b122fcdb';
 
 	/**
 	 * 自定义视图导航上下文集合
@@ -305,15 +314,6 @@ export default class MsgOpenAccessPickupGridViewBase extends Vue {
      */
     public viewCacheData:any;
 
-
-    /**
-     * 计数器服务对象集合
-     *
-     * @type {Array<*>}
-     * @memberof MsgOpenAccessPickupGridViewBase
-     */    
-    public counterServiceArray:Array<any> = [];
-
     /**
      * 解析视图参数
      *

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

@@ -3,20 +3,20 @@
     <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="msgopenaccesspickupview"></app-studioaction>
     <card class='view-card view-no-caption  view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false">
         <div class="content-container pickup-view">
-            <view_pickupviewpanel 
-                :viewState="viewState"  
-                :viewparams="JSON.parse(JSON.stringify(viewparams))" 
-                :context="JSON.parse(JSON.stringify(context))" 
-                :isSingleSelect="isSingleSelect"
-                :selectedData="selectedData"
-                :isShowButton="isShowButton"
-                name="pickupviewpanel"  
-                ref='pickupviewpanel' 
-                @selectionchange="pickupviewpanel_selectionchange($event)"  
-                @activated="pickupviewpanel_activated($event)"  
-                @load="pickupviewpanel_load($event)"  
-                @closeview="closeView($event)">
-            </view_pickupviewpanel>
+            <view_pickupviewpanel 
+                :viewState="viewState"  
+                :viewparams="JSON.parse(JSON.stringify(viewparams))" 
+                :context="JSON.parse(JSON.stringify(context))" 
+                :isSingleSelect="isSingleSelect"
+                :selectedData="selectedData"
+                :isShowButton="isShowButton"
+                name="pickupviewpanel"  
+                ref='pickupviewpanel' 
+                @selectionchange="pickupviewpanel_selectionchange($event)"  
+                @activated="pickupviewpanel_activated($event)"  
+                @load="pickupviewpanel_load($event)"  
+                @closeview="closeView($event)">
+            </view_pickupviewpanel>
             <card v-if="isShowButton" :dis-hover="true" :bordered="false" class="footer">
                 <row :style="{ textAlign: 'right' }">
                     <i-button type="primary" :disabled="this.viewSelections.length > 0 ? false : true" @click="onClickOk">{{this.containerModel.view_okbtn.text}}</i-button>
@@ -64,6 +64,15 @@ export default class MsgOpenAccessPickupViewBase extends Vue {
      * @memberof MsgOpenAccessPickupViewBase
      */
     public appUIService: MsgOpenAccessUIService = new MsgOpenAccessUIService(this.$store);
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @type {Array<*>}
+     * @memberof MsgOpenAccessPickupViewBase
+     */    
+    public counterServiceArray:Array<any> = [];
     
     /**
      * 数据变化
@@ -116,7 +125,7 @@ export default class MsgOpenAccessPickupViewBase extends Vue {
 	 * @type {string}
 	 * @memberof MsgOpenAccessPickupViewBase
 	 */
-	public viewtag: string = '2b1e4ec8cc8d1b7d3df4c738dd32abbd';
+	public viewtag: string = '5fd5a34016a13395007d949d732cb30d';
 
 	/**
 	 * 自定义视图导航上下文集合
@@ -298,15 +307,6 @@ export default class MsgOpenAccessPickupViewBase extends Vue {
      */
     public viewCacheData:any;
 
-
-    /**
-     * 计数器服务对象集合
-     *
-     * @type {Array<*>}
-     * @memberof MsgOpenAccessPickupViewBase
-     */    
-    public counterServiceArray:Array<any> = [];
-
     /**
      * 解析视图参数
      *

app_web/src/pages/notify/msg-template-edit-view/msg-template-edit-view.less

@@ -8,19 +8,19 @@
 .msg-template-edit-view{
     position: relative;
 }
-        .toolbar-container {
-            button {
-                margin: 6px 0px 4px 4px;
-                .caption {
-                    margin-left: 4px;
-                }
-            }
-            .seperator {
-                color: #dcdee2;
-                margin: 0 0px 0 4px;
-            }
-        }
-        
-        // this is less
+        .toolbar-container {
+            button {
+                margin: 6px 0px 4px 4px;
+                .caption {
+                    margin-left: 4px;
+                }
+            }
+            .seperator {
+                color: #dcdee2;
+                margin: 0 0px 0 4px;
+            }
+        }
+        
+        // this is less
 
 

app_web/src/pages/notify/msg-template-grid-view/msg-template-grid-view.less

 .msg-template-grid-view{
     position: relative;
 }
-        .toolbar-container {
-            button {
-                margin: 6px 0px 4px 4px;
-                .caption {
-                    margin-left: 4px;
-                }
-            }
-            .seperator {
-                color: #dcdee2;
-                margin: 0 0px 0 4px;
-            }
-        }
-        
-        // this is less
+        .toolbar-container {
+            button {
+                margin: 6px 0px 4px 4px;
+                .caption {
+                    margin-left: 4px;
+                }
+            }
+            .seperator {
+                color: #dcdee2;
+                margin: 0 0px 0 4px;
+            }
+        }
+        
+        // this is less
 
 

app_web/src/pages/notify/msg-user-account-edit-view/msg-user-account-edit-view.less

@@ -8,19 +8,19 @@
 .msg-user-account-edit-view{
     position: relative;
 }
-        .toolbar-container {
-            button {
-                margin: 6px 0px 4px 4px;
-                .caption {
-                    margin-left: 4px;
-                }
-            }
-            .seperator {
-                color: #dcdee2;
-                margin: 0 0px 0 4px;
-            }
-        }
-        
-        // this is less
+        .toolbar-container {
+            button {
+                margin: 6px 0px 4px 4px;
+                .caption {
+                    margin-left: 4px;
+                }
+            }
+            .seperator {
+                color: #dcdee2;
+                margin: 0 0px 0 4px;
+            }
+        }
+        
+        // this is less
 
 

app_web/src/pages/notify/msg-user-account-grid-view/msg-user-account-grid-view.less

 .msg-user-account-grid-view{
     position: relative;
 }
-        .toolbar-container {
-            button {
-                margin: 6px 0px 4px 4px;
-                .caption {
-                    margin-left: 4px;
-                }
-            }
-            .seperator {
-                color: #dcdee2;
-                margin: 0 0px 0 4px;
-            }
-        }
-        
-        // this is less
+        .toolbar-container {
+            button {
+                margin: 6px 0px 4px 4px;
+                .caption {
+                    margin-left: 4px;
+                }
+            }
+            .seperator {
+                color: #dcdee2;
+                margin: 0 0px 0 4px;
+            }
+        }
+        
+        // this is less
 
 

app_web/src/pages/notify/notify-index-view/notify-index-view-base.vue

@@ -77,6 +77,15 @@ import { Subject,Subscription } from 'rxjs';
     },
 })
 export default class NotifyIndexViewBase extends Vue {
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @type {Array<*>}
+     * @memberof NotifyIndexViewBase
+     */    
+    public counterServiceArray:Array<any> = [];
     
     /**
      * 数据变化
@@ -121,7 +130,7 @@ export default class NotifyIndexViewBase extends Vue {
 	 * @type {string}
 	 * @memberof NotifyIndexViewBase
 	 */
-	public viewtag: string = 'AB032BD4-8B7A-4848-B3D5-880390C396DC';
+	public viewtag: string = 'b7253a520eec9b5ffa50e7bf6468ccb1';
 
 	/**
 	 * 自定义视图导航上下文集合
@@ -279,15 +288,6 @@ export default class NotifyIndexViewBase extends Vue {
      */
     public viewCacheData:any;
 
-
-    /**
-     * 计数器服务对象集合
-     *
-     * @type {Array<*>}
-     * @memberof NotifyIndexViewBase
-     */    
-    public counterServiceArray:Array<any> = [];
-
     /**
      * 解析视图参数
      *

app_web/src/pages/notify/notify-index-view/page-register.ts

 export const PageComponents = {
     install(Vue: any, opt: any) {
-                Vue.component('msg-open-access-edit-view', () => import('@pages/notify/msg-open-access-edit-view/msg-open-access-edit-view.vue'));
+                Vue.component('msg-open-access-grid-view', () => import('@pages/notify/msg-open-access-grid-view/msg-open-access-grid-view.vue'));
+        Vue.component('msg-user-account-edit-view', () => import('@pages/notify/msg-user-account-edit-view/msg-user-account-edit-view.vue'));
+        Vue.component('msg-user-account-grid-view', () => import('@pages/notify/msg-user-account-grid-view/msg-user-account-grid-view.vue'));
+        Vue.component('msg-open-access-pickup-view', () => import('@pages/notify/msg-open-access-pickup-view/msg-open-access-pickup-view.vue'));
         Vue.component('msg-template-grid-view', () => import('@pages/notify/msg-template-grid-view/msg-template-grid-view.vue'));
         Vue.component('msg-open-access-pickup-grid-view', () => import('@pages/notify/msg-open-access-pickup-grid-view/msg-open-access-pickup-grid-view.vue'));
-        Vue.component('msg-open-access-pickup-view', () => import('@pages/notify/msg-open-access-pickup-view/msg-open-access-pickup-view.vue'));
         Vue.component('msg-template-edit-view', () => import('@pages/notify/msg-template-edit-view/msg-template-edit-view.vue'));
-        Vue.component('msg-user-account-edit-view', () => import('@pages/notify/msg-user-account-edit-view/msg-user-account-edit-view.vue'));
-        Vue.component('msg-user-account-grid-view', () => import('@pages/notify/msg-user-account-grid-view/msg-user-account-grid-view.vue'));
-        Vue.component('msg-open-access-grid-view', () => import('@pages/notify/msg-open-access-grid-view/msg-open-access-grid-view.vue'));
+        Vue.component('msg-open-access-edit-view', () => import('@pages/notify/msg-open-access-edit-view/msg-open-access-edit-view.vue'));
     }
 };
\ No newline at end of file

app_web/src/service/entity-service-register.ts

@@ -39,9 +39,9 @@ export class EntityServiceRegister {
      * @memberof EntityServiceRegister
      */
     protected init(): void {
-                this.allEntityService.set('msgopenaccess', () => import('@/service/msg-open-access/msg-open-access-service'));
+                this.allEntityService.set('msguseraccount', () => import('@/service/msg-user-account/msg-user-account-service'));
         this.allEntityService.set('msgtemplate', () => import('@/service/msg-template/msg-template-service'));
-        this.allEntityService.set('msguseraccount', () => import('@/service/msg-user-account/msg-user-account-service'));
+        this.allEntityService.set('msgopenaccess', () => import('@/service/msg-open-access/msg-open-access-service'));
     }
 
     /**

app_web/src/store/modules/view-action/state.ts

@@ -4,92 +4,92 @@
 export const viewstate: any = {
     appviews: [
         {
-            viewtag: '21df20858e3e04237f987b6aabb7d53e',
+            viewtag: '05c6db43c9d5946f3f6da2d2b122fcdb',
             viewmodule: 'notify',
-            viewname: 'MsgOpenAccessEditView',
+            viewname: 'MsgOpenAccessPickupGridView',
             viewaction: '',
             viewdatachange: false,
             refviews: [
             ],
         },
         {
-            viewtag: '24012ef8f76c1733b2b2271b864aa293',
+            viewtag: '13944c37e6cb87c6aca28dec7b31892e',
             viewmodule: 'notify',
-            viewname: 'MsgTemplateGridView',
+            viewname: 'MsgOpenAccessGridView',
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                'd40d28e6e7b714c11cc3e965236b212d',
+                '6a6e3d13c769ee31fe6ec9cc5508324f',
             ],
         },
         {
-            viewtag: '2b1e4ec8cc8d1b7d3df4c738dd32abbd',
+            viewtag: '2ac24526f9a5f79abb2b9d474e57be0a',
             viewmodule: 'notify',
-            viewname: 'MsgOpenAccessPickupView',
+            viewname: 'MsgTemplateGridView',
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                '7dbf0d79bec7466c6597036b21833b07',
+                '30868cf27f47d5ec65261c8b6d5c18a1',
             ],
         },
         {
-            viewtag: '7dbf0d79bec7466c6597036b21833b07',
+            viewtag: '30868cf27f47d5ec65261c8b6d5c18a1',
             viewmodule: 'notify',
-            viewname: 'MsgOpenAccessPickupGridView',
+            viewname: 'MsgTemplateEditView',
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                '5fd5a34016a13395007d949d732cb30d',
             ],
         },
         {
-            viewtag: '8563f7be052a93dffe667fdaa0dbc387',
+            viewtag: '4c01113024cb96ba2f6deaa33773f0aa',
             viewmodule: 'notify',
-            viewname: 'MsgOpenAccessGridView',
+            viewname: 'MsgUserAccountEditView',
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                '21df20858e3e04237f987b6aabb7d53e',
             ],
         },
         {
-            viewtag: '8fe61032f4a886c82b93251368df0533',
+            viewtag: '5fd5a34016a13395007d949d732cb30d',
             viewmodule: 'notify',
-            viewname: 'MsgUserAccountEditView',
+            viewname: 'MsgOpenAccessPickupView',
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                '05c6db43c9d5946f3f6da2d2b122fcdb',
             ],
         },
         {
-            viewtag: 'AB032BD4-8B7A-4848-B3D5-880390C396DC',
+            viewtag: '6a6e3d13c769ee31fe6ec9cc5508324f',
             viewmodule: 'notify',
-            viewname: 'NotifyIndexView',
+            viewname: 'MsgOpenAccessEditView',
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                '24012ef8f76c1733b2b2271b864aa293',
-                'e6bf4bf11c92edd8e7bfdb621580d73b',
-                '8563f7be052a93dffe667fdaa0dbc387',
             ],
         },
         {
-            viewtag: 'd40d28e6e7b714c11cc3e965236b212d',
+            viewtag: 'a186d7dee3d83d5f95c27142bece5df6',
             viewmodule: 'notify',
-            viewname: 'MsgTemplateEditView',
+            viewname: 'MsgUserAccountGridView',
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                '2b1e4ec8cc8d1b7d3df4c738dd32abbd',
+                '4c01113024cb96ba2f6deaa33773f0aa',
             ],
         },
         {
-            viewtag: 'e6bf4bf11c92edd8e7bfdb621580d73b',
+            viewtag: 'b7253a520eec9b5ffa50e7bf6468ccb1',
             viewmodule: 'notify',
-            viewname: 'MsgUserAccountGridView',
+            viewname: 'NotifyIndexView',
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                '8fe61032f4a886c82b93251368df0533',
+                '13944c37e6cb87c6aca28dec7b31892e',
+                'a186d7dee3d83d5f95c27142bece5df6',
+                '2ac24526f9a5f79abb2b9d474e57be0a',
             ],
         },
     ],

app_web/src/uiservice/msg-open-access/msg-open-access-ui-service-base.ts

@@ -89,10 +89,10 @@ export default class MsgOpenAccessUIServiceBase extends UIService {
      * @memberof  MsgOpenAccessUIServiceBase
      */  
     public initViewMap(){
-        this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'msgopenaccesses'});
-        this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'msgopenaccesses'});
         this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'msgopenaccesses'});
         this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'msgopenaccesses'});
+        this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'msgopenaccesses'});
+        this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'msgopenaccesses'});
     }
 
     /**

app_web/src/uiservice/ui-service-register.ts

@@ -39,9 +39,9 @@ export class UIServiceRegister {
      * @memberof UIServiceRegister
      */
     protected init(): void {
-                this.allUIService.set('msgopenaccess', () => import('@/uiservice/msg-open-access/msg-open-access-ui-service'));
+                this.allUIService.set('msguseraccount', () => import('@/uiservice/msg-user-account/msg-user-account-ui-service'));
         this.allUIService.set('msgtemplate', () => import('@/uiservice/msg-template/msg-template-ui-service'));
-        this.allUIService.set('msguseraccount', () => import('@/uiservice/msg-user-account/msg-user-account-ui-service'));
+        this.allUIService.set('msgopenaccess', () => import('@/uiservice/msg-open-access/msg-open-access-ui-service'));
     }
 
     /**

app_web/src/widgets/app/notify-index-view-appmenu/notify-index-view-appmenu-base.vue

@@ -504,90 +504,90 @@ export default class NotifyIndexViewBase extends Vue implements ControlInterface
                 navDataService.removeNavData(this.viewtag);
             }
             switch (item.appfunctag) {
+                case 'Auto3': 
+                    this.clickAuto3(item);
+                    return;
                 case 'Auto2': 
                     this.clickAuto2(item);
                     return;
                 case 'Auto1': 
                     this.clickAuto1(item);
                     return;
-                case 'Auto3': 
-                    this.clickAuto3(item);
-                    return;
                 default:
                     console.warn('未指定应用功能');
             }
         }
     }
 
-    
-    /**
-     * 接入第三方平台
-     *
-     * @param {*} [item={}]
-     * @memberof NotifyIndexView
-     */
-    public clickAuto2(item: any = {}) {
-        const viewparam: any = {};
-        Object.assign(viewparam, {});
-        const deResParameters: any[] = [];
-        const parameters: any[] = [
-            { pathName: 'msgopenaccesses', parameterName: 'msgopenaccess' },
-            { pathName: 'gridview', parameterName: 'gridview' },
-        ];
-        const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
-        if(Object.is(this.$route.fullPath,path)){
-            return;
-        }
-        this.$nextTick(function(){
-            this.$router.push(path);
-        })
-    }
-    
-    /**
-     * 消息模板
-     *
-     * @param {*} [item={}]
-     * @memberof NotifyIndexView
-     */
-    public clickAuto1(item: any = {}) {
-        const viewparam: any = {};
-        Object.assign(viewparam, {});
-        const deResParameters: any[] = [];
-        const parameters: any[] = [
-            { pathName: 'msgtemplates', parameterName: 'msgtemplate' },
-            { pathName: 'gridview', parameterName: 'gridview' },
-        ];
-        const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
-        if(Object.is(this.$route.fullPath,path)){
-            return;
-        }
-        this.$nextTick(function(){
-            this.$router.push(path);
-        })
-    }
-    
-    /**
-     * 消息账户
-     *
-     * @param {*} [item={}]
-     * @memberof NotifyIndexView
-     */
-    public clickAuto3(item: any = {}) {
-        const viewparam: any = {};
-        Object.assign(viewparam, {});
-        const deResParameters: any[] = [];
-        const parameters: any[] = [
-            { pathName: 'msguseraccounts', parameterName: 'msguseraccount' },
-            { pathName: 'gridview', parameterName: 'gridview' },
-        ];
-        const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
-        if(Object.is(this.$route.fullPath,path)){
-            return;
-        }
-        this.$nextTick(function(){
-            this.$router.push(path);
-        })
-    }
+    
+    /**
+     * 消息账户
+     *
+     * @param {*} [item={}]
+     * @memberof NotifyIndexView
+     */
+    public clickAuto3(item: any = {}) {
+        const viewparam: any = {};
+        Object.assign(viewparam, {});
+        const deResParameters: any[] = [];
+        const parameters: any[] = [
+            { pathName: 'msguseraccounts', parameterName: 'msguseraccount' },
+            { pathName: 'gridview', parameterName: 'gridview' },
+        ];
+        const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
+        if(Object.is(this.$route.fullPath,path)){
+            return;
+        }
+        this.$nextTick(function(){
+            this.$router.push(path);
+        })
+    }
+    
+    /**
+     * 接入第三方平台
+     *
+     * @param {*} [item={}]
+     * @memberof NotifyIndexView
+     */
+    public clickAuto2(item: any = {}) {
+        const viewparam: any = {};
+        Object.assign(viewparam, {});
+        const deResParameters: any[] = [];
+        const parameters: any[] = [
+            { pathName: 'msgopenaccesses', parameterName: 'msgopenaccess' },
+            { pathName: 'gridview', parameterName: 'gridview' },
+        ];
+        const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
+        if(Object.is(this.$route.fullPath,path)){
+            return;
+        }
+        this.$nextTick(function(){
+            this.$router.push(path);
+        })
+    }
+    
+    /**
+     * 消息模板
+     *
+     * @param {*} [item={}]
+     * @memberof NotifyIndexView
+     */
+    public clickAuto1(item: any = {}) {
+        const viewparam: any = {};
+        Object.assign(viewparam, {});
+        const deResParameters: any[] = [];
+        const parameters: any[] = [
+            { pathName: 'msgtemplates', parameterName: 'msgtemplate' },
+            { pathName: 'gridview', parameterName: 'gridview' },
+        ];
+        const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
+        if(Object.is(this.$route.fullPath,path)){
+            return;
+        }
+        this.$nextTick(function(){
+            this.$router.push(path);
+        })
+    }
 
     /**
      * 数据加载
@@ -606,7 +606,7 @@ export default class NotifyIndexViewBase extends Vue implements ControlInterface
      * @memberof NotifyIndexViewBase
      */
     public handleMenusResource(inputMenus:Array<any>){
-        if(this.$store.getters['authresource/getEnablePermissionValid']){
+        if(Environment.enablePermissionValid){
             this.computedEffectiveMenus(inputMenus);
             this.computeParentMenus(inputMenus);
         }

app_web/src/widgets/app/notify-index-view-appmenu/notify-index-view-appmenu-model.ts

@@ -15,7 +15,7 @@ export default class NotifyIndexViewModel {
      */
     public items: any[] = [
         {
-	id: '3006BFD1-CFF7-43D0-BD00-14D491D4EABD',
+	id: '46e30d9996c90c9d617fdc7d75936058',
 	name: 'menuitem1',
 	text: '接入第三方平台',
 	type: 'MENUITEM',
@@ -34,7 +34,7 @@ export default class NotifyIndexViewModel {
 	authtag:'web-NotifyIndexView-menuitem1',
 },
         {
-	id: '7E11B4BD-A48E-48A9-9010-F40C7B7C60FD',
+	id: 'bb418fcd75aff6e293b7b8b416bb01ce',
 	name: 'menuitem2',
 	text: '消息模板',
 	type: 'MENUITEM',
@@ -53,7 +53,7 @@ export default class NotifyIndexViewModel {
 	authtag:'web-NotifyIndexView-menuitem2',
 },
         {
-	id: '565D9E14-3E01-43ED-AF79-22C27416DD15',
+	id: '6199646ee62aeb492996a780d1c3365f',
 	name: 'menuitem3',
 	text: '消息账户',
 	type: 'MENUITEM',

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

@@ -4,40 +4,40 @@
   <row>
     <i-col span="20" class="form-content">
       <row>
-                    <i-col v-show="detailsModel.n_accessname_like.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_like' :itemRules="this.rules.n_accessname_like" class='' :caption="$t('entities.msgopenaccess.default_searchform.details.n_accessname_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_accessname_like.error" :isEmptyCaption="false" labelPos="LEFT"> 
-              <input-box 
-              v-model="data.n_accessname_like"  
-              @enter="onEnter($event)"  
-                
-              :disabled="detailsModel.n_accessname_like.disabled" 
-              type='text' 
-              style="">
-          </input-box>
-          
-          </app-form-item>
-          
-          </i-col>
-          <i-col v-show="detailsModel.n_open_type_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_open_type_eq' :itemRules="this.rules.n_open_type_eq" class='' :caption="$t('entities.msgopenaccess.default_searchform.details.n_open_type_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_open_type_eq.error" :isEmptyCaption="false" labelPos="LEFT"> 
-              
-           <dropdown-list 
-              v-model="data.n_open_type_eq" 
-              :data="data" 
-              :context="context"
-              :viewparams="viewparams"
-              :localContext ='{ }' 
-              :localParam ='{ }' 
-              :disabled="detailsModel.n_open_type_eq.disabled" 
-              valueType="string"
-              tag='OpenAccessType' 
-              codelistType='STATIC'
-              placeholder='请选择...' style="">
-           </dropdown-list>
-          
-          </app-form-item>
-          
-          </i-col>
+                    <i-col v-show="detailsModel.n_accessname_like.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_like' :itemRules="this.rules.n_accessname_like" class='' :caption="$t('entities.msgopenaccess.default_searchform.details.n_accessname_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_accessname_like.error" :isEmptyCaption="false" labelPos="LEFT"> 
+              <input-box 
+              v-model="data.n_accessname_like"  
+              @enter="onEnter($event)"  
+                
+              :disabled="detailsModel.n_accessname_like.disabled" 
+              type='text' 
+              style="">
+          </input-box>
+          
+          </app-form-item>
+          
+          </i-col>
+          <i-col v-show="detailsModel.n_open_type_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_open_type_eq' :itemRules="this.rules.n_open_type_eq" class='' :caption="$t('entities.msgopenaccess.default_searchform.details.n_open_type_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_open_type_eq.error" :isEmptyCaption="false" labelPos="LEFT"> 
+              
+           <dropdown-list 
+              v-model="data.n_open_type_eq" 
+              :data="data" 
+              :context="context"
+              :viewparams="viewparams"
+              :localContext ='{ }' 
+              :localParam ='{ }' 
+              :disabled="detailsModel.n_open_type_eq.disabled" 
+              valueType="string"
+              tag='OpenAccessType' 
+              codelistType='STATIC'
+              placeholder='请选择...' style="">
+           </dropdown-list>
+          
+          </app-form-item>
+          
+          </i-col>
       </row>
     </i-col>
     <i-col span="4" class="search-button">

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

@@ -1183,18 +1183,20 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public computeButtonState(data:any){
-        let targetData:any = this.transformData(data);
-        if(this.detailsModel && Object.keys(this.detailsModel).length >0){
-            Object.keys(this.detailsModel).forEach((name:any) =>{
-                if(this.detailsModel[name] && this.detailsModel[name].uiaction && this.detailsModel[name].uiaction.dataaccaction && Object.is(this.detailsModel[name].detailType,"BUTTON")){
-                    this.detailsModel[name].isPower = true;
-                    let tempUIAction:any = JSON.parse(JSON.stringify(this.detailsModel[name].uiaction));
-                    let result: any[] = ViewTool.calcActionItemAuthState(targetData,[tempUIAction],this.appUIService);
-                    this.detailsModel[name].visible = tempUIAction.visabled;
-                    this.detailsModel[name].disabled = tempUIAction.disabled;
-                    this.detailsModel[name].isPower = result[0] === 1 ? true : false;
-                }
-            })
+        if(Environment.enablePermissionValid){
+            let targetData:any = this.transformData(data);
+            if(this.detailsModel && Object.keys(this.detailsModel).length >0){
+                Object.keys(this.detailsModel).forEach((name:any) =>{
+                    if(this.detailsModel[name] && this.detailsModel[name].uiaction && this.detailsModel[name].uiaction.dataaccaction && Object.is(this.detailsModel[name].detailType,"BUTTON")){
+                        this.detailsModel[name].isPower = true;
+                        let tempUIAction:any = JSON.parse(JSON.stringify(this.detailsModel[name].uiaction));
+                        let result: any[] = ViewTool.calcActionItemAuthState(targetData,[tempUIAction],this.appUIService);
+                        this.detailsModel[name].visible = tempUIAction.visabled;
+                        this.detailsModel[name].disabled = tempUIAction.disabled;
+                        this.detailsModel[name].isPower = result[0] === 1 ? true : false;
+                    }
+                })
+            }
         }
     }
 

app_web/src/widgets/msg-open-access/main-grid/main-grid-base.vue

@@ -21,56 +21,56 @@
             <template v-if="!isSingleSelect">
                 <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
             </template>
-            <template v-if="getColumnState('accessname')">
-                <el-table-column show-overflow-tooltip :prop="'accessname'" :label="$t('entities.msgopenaccess.main_grid.columns.accessname')" :width="300"  :align="'left'" :sortable="'custom'">
-                    <template v-slot:header="{column}">
-                      <span class="column-header ">
-                        {{$t('entities.msgopenaccess.main_grid.columns.accessname')}}
-                      </span>
-                    </template>
-                    <template v-slot="{row,column,$index}">
-                        <span>{{row.accessname}}</span>
-                    </template>
-                </el-table-column>
-            </template>
-            <template v-if="getColumnState('open_type')">
-                <el-table-column show-overflow-tooltip :prop="'open_type'" :label="$t('entities.msgopenaccess.main_grid.columns.open_type')" :width="200"  :align="'left'" :sortable="'custom'">
-                    <template v-slot:header="{column}">
-                      <span class="column-header ">
-                        {{$t('entities.msgopenaccess.main_grid.columns.open_type')}}
-                      </span>
-                    </template>
-                    <template v-slot="{row,column,$index}">
-                        <template >
-            <codelist :value="row.open_type" tag='OpenAccessType' codelistType='STATIC' ></codelist>
-                        </template>
-                    </template>
-                </el-table-column>
-            </template>
-            <template v-if="getColumnState('access_key')">
-                <el-table-column show-overflow-tooltip :prop="'access_key'" :label="$t('entities.msgopenaccess.main_grid.columns.access_key')" :width="300"  :align="'left'" :sortable="'custom'">
-                    <template v-slot:header="{column}">
-                      <span class="column-header ">
-                        {{$t('entities.msgopenaccess.main_grid.columns.access_key')}}
-                      </span>
-                    </template>
-                    <template v-slot="{row,column,$index}">
-                        <span>{{row.access_key}}</span>
-                    </template>
-                </el-table-column>
-            </template>
-            <template v-if="getColumnState('region_id')">
-                <el-table-column show-overflow-tooltip :prop="'region_id'" :label="$t('entities.msgopenaccess.main_grid.columns.region_id')" :width="200"  :align="'left'" :sortable="'custom'">
-                    <template v-slot:header="{column}">
-                      <span class="column-header ">
-                        {{$t('entities.msgopenaccess.main_grid.columns.region_id')}}
-                      </span>
-                    </template>
-                    <template v-slot="{row,column,$index}">
-                        <span>{{row.region_id}}</span>
-                    </template>
-                </el-table-column>
-            </template>
+            <template v-if="getColumnState('accessname')">
+                <el-table-column show-overflow-tooltip :prop="'accessname'" :label="$t('entities.msgopenaccess.main_grid.columns.accessname')" :width="300"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.msgopenaccess.main_grid.columns.accessname')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.accessname}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('open_type')">
+                <el-table-column show-overflow-tooltip :prop="'open_type'" :label="$t('entities.msgopenaccess.main_grid.columns.open_type')" :width="200"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.msgopenaccess.main_grid.columns.open_type')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <template >
+            <codelist :value="row.open_type" tag='OpenAccessType' codelistType='STATIC' ></codelist>
+                        </template>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('access_key')">
+                <el-table-column show-overflow-tooltip :prop="'access_key'" :label="$t('entities.msgopenaccess.main_grid.columns.access_key')" :width="300"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.msgopenaccess.main_grid.columns.access_key')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.access_key}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('region_id')">
+                <el-table-column show-overflow-tooltip :prop="'region_id'" :label="$t('entities.msgopenaccess.main_grid.columns.region_id')" :width="200"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.msgopenaccess.main_grid.columns.region_id')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.region_id}}</span>
+                    </template>
+                </el-table-column>
+            </template>
             <template v-if="adaptiveState">
                 <el-table-column></el-table-column>
             </template>
@@ -661,8 +661,10 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public getActionState(data:any){
         let tempActionModel:any = JSON.parse(JSON.stringify(this.ActionModel));
-        let targetData:any = this.transformData(data);
-        ViewTool.calcActionItemAuthState(targetData,tempActionModel,this.appUIService);
+        if(Environment.enablePermissionValid){
+            let targetData:any = this.transformData(data);
+            ViewTool.calcActionItemAuthState(targetData,tempActionModel,this.appUIService);
+        }
         return tempActionModel;
     }
 

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

@@ -4,34 +4,34 @@
   <row>
     <i-col span="20" class="form-content">
       <row>
-                    <i-col v-show="detailsModel.n_accessname_like.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_like' :itemRules="this.rules.n_accessname_like" class='' :caption="$t('entities.msgtemplate.default_searchform.details.n_accessname_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_accessname_like.error" :isEmptyCaption="false" labelPos="LEFT"> 
-              <input-box 
-              v-model="data.n_accessname_like"  
-              @enter="onEnter($event)"  
-                
-              :disabled="detailsModel.n_accessname_like.disabled" 
-              type='text' 
-              style="">
-          </input-box>
-          
-          </app-form-item>
-          
-          </i-col>
-          <i-col v-show="detailsModel.n_template_name_like.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_template_name_like' :itemRules="this.rules.n_template_name_like" class='' :caption="$t('entities.msgtemplate.default_searchform.details.n_template_name_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_template_name_like.error" :isEmptyCaption="false" labelPos="LEFT"> 
-              <input-box 
-              v-model="data.n_template_name_like"  
-              @enter="onEnter($event)"  
-                
-              :disabled="detailsModel.n_template_name_like.disabled" 
-              type='text' 
-              style="">
-          </input-box>
-          
-          </app-form-item>
-          
-          </i-col>
+                    <i-col v-show="detailsModel.n_accessname_like.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_like' :itemRules="this.rules.n_accessname_like" class='' :caption="$t('entities.msgtemplate.default_searchform.details.n_accessname_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_accessname_like.error" :isEmptyCaption="false" labelPos="LEFT"> 
+              <input-box 
+              v-model="data.n_accessname_like"  
+              @enter="onEnter($event)"  
+                
+              :disabled="detailsModel.n_accessname_like.disabled" 
+              type='text' 
+              style="">
+          </input-box>
+          
+          </app-form-item>
+          
+          </i-col>
+          <i-col v-show="detailsModel.n_template_name_like.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_template_name_like' :itemRules="this.rules.n_template_name_like" class='' :caption="$t('entities.msgtemplate.default_searchform.details.n_template_name_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_template_name_like.error" :isEmptyCaption="false" labelPos="LEFT"> 
+              <input-box 
+              v-model="data.n_template_name_like"  
+              @enter="onEnter($event)"  
+                
+              :disabled="detailsModel.n_template_name_like.disabled" 
+              type='text' 
+              style="">
+          </input-box>
+          
+          </app-form-item>
+          
+          </i-col>
       </row>
     </i-col>
     <i-col span="4" class="search-button">

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

@@ -1225,18 +1225,20 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public computeButtonState(data:any){
-        let targetData:any = this.transformData(data);
-        if(this.detailsModel && Object.keys(this.detailsModel).length >0){
-            Object.keys(this.detailsModel).forEach((name:any) =>{
-                if(this.detailsModel[name] && this.detailsModel[name].uiaction && this.detailsModel[name].uiaction.dataaccaction && Object.is(this.detailsModel[name].detailType,"BUTTON")){
-                    this.detailsModel[name].isPower = true;
-                    let tempUIAction:any = JSON.parse(JSON.stringify(this.detailsModel[name].uiaction));
-                    let result: any[] = ViewTool.calcActionItemAuthState(targetData,[tempUIAction],this.appUIService);
-                    this.detailsModel[name].visible = tempUIAction.visabled;
-                    this.detailsModel[name].disabled = tempUIAction.disabled;
-                    this.detailsModel[name].isPower = result[0] === 1 ? true : false;
-                }
-            })
+        if(Environment.enablePermissionValid){
+            let targetData:any = this.transformData(data);
+            if(this.detailsModel && Object.keys(this.detailsModel).length >0){
+                Object.keys(this.detailsModel).forEach((name:any) =>{
+                    if(this.detailsModel[name] && this.detailsModel[name].uiaction && this.detailsModel[name].uiaction.dataaccaction && Object.is(this.detailsModel[name].detailType,"BUTTON")){
+                        this.detailsModel[name].isPower = true;
+                        let tempUIAction:any = JSON.parse(JSON.stringify(this.detailsModel[name].uiaction));
+                        let result: any[] = ViewTool.calcActionItemAuthState(targetData,[tempUIAction],this.appUIService);
+                        this.detailsModel[name].visible = tempUIAction.visabled;
+                        this.detailsModel[name].disabled = tempUIAction.disabled;
+                        this.detailsModel[name].isPower = result[0] === 1 ? true : false;
+                    }
+                })
+            }
         }
     }
 

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

@@ -21,70 +21,70 @@
             <template v-if="!isSingleSelect">
                 <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
             </template>
-            <template v-if="getColumnState('template_type')">
-                <el-table-column show-overflow-tooltip :prop="'template_type'" :label="$t('entities.msgtemplate.main_grid.columns.template_type')" :width="200"  :align="'left'" :sortable="'custom'">
-                    <template v-slot:header="{column}">
-                      <span class="column-header ">
-                        {{$t('entities.msgtemplate.main_grid.columns.template_type')}}
-                      </span>
-                    </template>
-                    <template v-slot="{row,column,$index}">
-                        <template >
-            <codelist :value="row.template_type" tag='TemplateType' codelistType='STATIC' ></codelist>
-                        </template>
-                    </template>
-                </el-table-column>
-            </template>
-            <template v-if="getColumnState('template_id')">
-                <el-table-column show-overflow-tooltip :prop="'template_id'" :label="$t('entities.msgtemplate.main_grid.columns.template_id')" :width="200"  :align="'left'" :sortable="'custom'">
-                    <template v-slot:header="{column}">
-                      <span class="column-header ">
-                        {{$t('entities.msgtemplate.main_grid.columns.template_id')}}
-                      </span>
-                    </template>
-                    <template v-slot="{row,column,$index}">
-                        <span>{{row.template_id}}</span>
-                    </template>
-                </el-table-column>
-            </template>
-            <template v-if="getColumnState('template_name')">
-                <el-table-column show-overflow-tooltip :prop="'template_name'" :label="$t('entities.msgtemplate.main_grid.columns.template_name')" :width="200"  :align="'left'" :sortable="'custom'">
-                    <template v-slot:header="{column}">
-                      <span class="column-header ">
-                        {{$t('entities.msgtemplate.main_grid.columns.template_name')}}
-                      </span>
-                    </template>
-                    <template v-slot="{row,column,$index}">
-                        <span>{{row.template_name}}</span>
-                    </template>
-                </el-table-column>
-            </template>
-            <template v-if="getColumnState('open_type')">
-                <el-table-column show-overflow-tooltip :prop="'open_type'" :label="$t('entities.msgtemplate.main_grid.columns.open_type')" :width="200"  :align="'left'" :sortable="'custom'">
-                    <template v-slot:header="{column}">
-                      <span class="column-header ">
-                        {{$t('entities.msgtemplate.main_grid.columns.open_type')}}
-                      </span>
-                    </template>
-                    <template v-slot="{row,column,$index}">
-                        <template >
-            <codelist :value="row.open_type" tag='OpenAccessType' codelistType='STATIC' ></codelist>
-                        </template>
-                    </template>
-                </el-table-column>
-            </template>
-            <template v-if="getColumnState('accessname')">
-                <el-table-column show-overflow-tooltip :prop="'accessname'" :label="$t('entities.msgtemplate.main_grid.columns.accessname')" :width="300"  :align="'left'" :sortable="'custom'">
-                    <template v-slot:header="{column}">
-                      <span class="column-header ">
-                        {{$t('entities.msgtemplate.main_grid.columns.accessname')}}
-                      </span>
-                    </template>
-                    <template v-slot="{row,column,$index}">
-                        <span>{{row.accessname}}</span>
-                    </template>
-                </el-table-column>
-            </template>
+            <template v-if="getColumnState('template_type')">
+                <el-table-column show-overflow-tooltip :prop="'template_type'" :label="$t('entities.msgtemplate.main_grid.columns.template_type')" :width="200"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.msgtemplate.main_grid.columns.template_type')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <template >
+            <codelist :value="row.template_type" tag='TemplateType' codelistType='STATIC' ></codelist>
+                        </template>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('template_id')">
+                <el-table-column show-overflow-tooltip :prop="'template_id'" :label="$t('entities.msgtemplate.main_grid.columns.template_id')" :width="200"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.msgtemplate.main_grid.columns.template_id')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.template_id}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('template_name')">
+                <el-table-column show-overflow-tooltip :prop="'template_name'" :label="$t('entities.msgtemplate.main_grid.columns.template_name')" :width="200"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.msgtemplate.main_grid.columns.template_name')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.template_name}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('open_type')">
+                <el-table-column show-overflow-tooltip :prop="'open_type'" :label="$t('entities.msgtemplate.main_grid.columns.open_type')" :width="200"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.msgtemplate.main_grid.columns.open_type')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <template >
+            <codelist :value="row.open_type" tag='OpenAccessType' codelistType='STATIC' ></codelist>
+                        </template>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('accessname')">
+                <el-table-column show-overflow-tooltip :prop="'accessname'" :label="$t('entities.msgtemplate.main_grid.columns.accessname')" :width="300"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.msgtemplate.main_grid.columns.accessname')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.accessname}}</span>
+                    </template>
+                </el-table-column>
+            </template>
             <template v-if="adaptiveState">
                 <el-table-column></el-table-column>
             </template>
@@ -683,8 +683,10 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public getActionState(data:any){
         let tempActionModel:any = JSON.parse(JSON.stringify(this.ActionModel));
-        let targetData:any = this.transformData(data);
-        ViewTool.calcActionItemAuthState(targetData,tempActionModel,this.appUIService);
+        if(Environment.enablePermissionValid){
+            let targetData:any = this.transformData(data);
+            ViewTool.calcActionItemAuthState(targetData,tempActionModel,this.appUIService);
+        }
         return tempActionModel;
     }