ibiz4j 发布系统代码

app_web/CHANGELOG.md

+## v7.0.0-alpha.20 [2020-10-18]
+
+### Bug修复
+
+修复获取数据对象的主状态值统一转字符串处理逻辑
+
+修复表单空输入异常问题
+
+修复下拉数据数据加载异常问题
+
+修复表单分页图标重复发布异常
+
+修复数据选择增加外键值附加数据回填逻辑
+
+修复表格行编辑可设置数据主键和清空仿真主键问题 
+
+修复代码表返回数据不合法抛出的异常
+
+修复表单值规则部分逻辑
+
+修复导航类视图修改右侧表单数据时，只能跳转第一条数据BUG
+
+### 功能新增及优化
+
+#### 模板
+
+新增动态表单支持
+
+新增视图消息支持
+
+新增表单、面板、工具栏、数据看板直接内容项支持
+
+新增日历项支持标识属性和文本属性
+
+新增应用组件包支持
+
+新增导航工具栏权限控制支持
+
+新增图表绘制最终参数
+
+新增门户部件界面行为组权限校验
+
+新增表单、表格数据对象方式新建、更新默认值
+
+新增导航视图搜索框提示可搜索字段名称
+
+新增部件逻辑插件支持
+
+新增工具栏、工具栏项插件支持
+
+优化调整代码表服务基类位置
+
+#### 基础文件
+
+新增动态表单组件、直接内容项组件、视图消息组组件和视图消息组件
+
+优化导航类部件工具栏状态逻辑
+
+修复表单空输入异常问题
+
+修复下拉数据数据加载异常
+
+修复关系页第一次进入不加载问题
+
 ## v7.0.0-alpha.19 [2020-9-13]
 
 ### Bug修复

app_web/src/authservice/auth-service.ts

 import store from '@/store';
+import { Environment } from '@/environments/environment';
+
 /**
  * 实体权限服务
  *
@@ -115,8 +117,14 @@ export default class AuthService {
         if(!this.$store.getters['authresource/getEnablePermissionValid']) {
             return true;
         }
+        if(Object.is(Environment.menuPermissionMode,"RT")){
+            return this.$store.getters['authresource/getAuthMenuWithRT'](item);
+        }else if(Object.is(Environment.menuPermissionMode,"RESOURCE")){
+            return this.$store.getters['authresource/getAuthMenuWithResource'](item);
+        }else{
             return this.$store.getters['authresource/getAuthMenu'](item);
         }
+    }
 
     /**
      * 根据统一资源标识获取统一资源权限

app_web/src/codelist/codelist-service.ts

@@ -149,10 +149,11 @@ export default class CodeListService {
                     // 启用缓存
                     if(isEnableCache){
                         const callback:Function = (context:any ={},data:any ={},tag:string,promise:Promise<any>) =>{
+                            const callbackKey:string = `${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`;
                             promise.then((result:any) =>{
                                 if(result.length > 0){
-                                    CodeListService.codelistCached.set(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`,{items:result});
-                                    CodeListService.codelistCache.delete(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`);
+                                    CodeListService.codelistCached.set(callbackKey,{items:result});
+                                    CodeListService.codelistCache.delete(callbackKey);
                                     return resolve(result);
                                 }else{
                                     return resolve([]);
@@ -162,8 +163,9 @@ export default class CodeListService {
                             })
                         }
                         // 加载完成,从本地缓存获取
-                        if(CodeListService.codelistCached.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`)){
-                            let items:any = CodeListService.codelistCached.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`).items;
+                        const key:string = `${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`;
+                        if(CodeListService.codelistCached.get(key)){
+                            let items:any = CodeListService.codelistCached.get(key).items;
                             if(items.length >0){
                                 if(new Date().getTime() <= codelist.getExpirationTime()){
                                     return resolve(items); 
@@ -172,11 +174,11 @@ export default class CodeListService {
                         }
                         if (codelist) {
                             // 加载中，UI又需要数据，解决连续加载同一代码表问题
-                            if(CodeListService.codelistCache.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`)){
-                                callback(context,data,tag,CodeListService.codelistCache.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`));
+                            if(CodeListService.codelistCache.get(key)){
+                                callback(context,data,tag,CodeListService.codelistCache.get(key));
                             }else{
                                 let result:Promise<any> = codelist.getItems(context,data,isloading);
-                                CodeListService.codelistCache.set(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`,result);
+                                CodeListService.codelistCache.set(key,result);
                                 codelist.setExpirationTime(new Date().getTime() + cacheTimeout);
                                 callback(context,data,tag,result);
                             }

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

@@ -66,7 +66,7 @@ export default class AppActionBar extends Vue {
   public created(){
     if (this.viewState) {
         this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
-            if (!Object.is(tag, "app-actionbar")) {
+            if (!Object.is(tag, "all-portlet")) {
                 return;
             }
             if(Object.is(action,'loadmodel')){
@@ -107,7 +107,7 @@ export default class AppActionBar extends Vue {
         const _item = ActionModel[key];
         if(_item && _item['dataaccaction'] && UIService){
             let dataActionResult:any;
-            if(Object.is(_item['actiontarget'],"NONE")){
+            if(Object.is(_item['actiontarget'],"NONE") || Object.is(_item['actiontarget'],"")){
                 dataActionResult = UIService.getResourceOPPrivs(_item['dataaccaction']);
             }else{
                 if(data && Object.keys(data).length >0){

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

@@ -4,7 +4,11 @@
             <app-alert
                 :key="index"
                 :tag="item.tag"
-                :position="item.position"/>   
+                :context="context"
+                :viewparam="viewparam" 
+                :position="item.position"
+                :infoGroup="infoGroup"
+                :viewname="viewname"/>   
         </template>
     </div>
 
@@ -32,6 +36,23 @@ export default class AppAlertGroup extends Vue {
      */
     @Prop() infoGroup: any;
 
+    /**
+     * 应用上下文
+     * 
+     * @type {any}
+     * @memberof AppAlertGroup
+     */
+    @Prop() context: any;
+
+    /**
+     * 视图参数
+     * 
+     * @type {any}
+     * @memberof AppAlertGroup
+     */
+    @Prop() viewparam: any;
+
+
     /**
      * 视图消息组显示位置
      * 
@@ -40,6 +61,14 @@ export default class AppAlertGroup extends Vue {
      */
     @Prop() position: any;
 
+    /**
+     * 视图名称
+     * 
+     * @type {any}
+     * @memberof AppAlertGroup
+     */
+    @Prop() viewname: any;
+
     /**
      * 当前位置视图消息集合
      * 

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

@@ -44,6 +44,39 @@ export default class AppAlert extends Vue {
      */
     @Prop() position: any;
 
+    /**
+     * 应用上下文
+     * 
+     * @type {any}
+     * @memberof AppAlert
+     */
+    @Prop() context: any;
+
+    /**
+     * 视图参数
+     * 
+     * @type {any}
+     * @memberof AppAlert
+     */
+    @Prop() viewparam: any;
+
+
+    /**
+     * 视图消息组tag
+     * 
+     * @type {any}
+     * @memberof AppAlert
+     */
+    @Prop() infoGroup!: any;
+
+    /**
+     * 视图名称
+     * 
+     * @type {any}
+     * @memberof AppAlert
+     */
+    @Prop() viewname!: any;
+    
     /**
      * 视图消息对象
      * 
@@ -79,7 +112,7 @@ export default class AppAlert extends Vue {
      * @memberof AppAlert
      */
     public async getData() {
-        let response: any = await this.viewMessageService.getViewMessageByTag(this.tag, null, null)
+        let response: any = await this.viewMessageService.getViewMessageByTag(this.tag, this.context, this.viewparam);
         if(response && response.length > 0) {
             response.forEach((item: any) => {
                 let tempData: any = JSON.parse(JSON.stringify(item));
@@ -118,7 +151,8 @@ export default class AppAlert extends Vue {
         data.showState = true; 
         if(data.closeMode || data.closeMode == 0) {
             if(data.closeMode == 1) {
-                const id = this.$store.getters.getViewMessage(data.codename);
+                const tag = this.viewname + '_' + this.infoGroup + '_' + data.codename;
+                const id = localStorage.getItem(tag);
                 if(id) {
                     data.showState = false;
                     flag = false;
@@ -182,14 +216,14 @@ export default class AppAlert extends Vue {
             let tempArr: any[] = data.customClass.toString().split(',');
             if(tempArr && tempArr.length > 0) {
                 if(Object.is("1", tempArr[1])) {
-                    const args = { tag: tempArr[0], id: data.customClass };
-                    this.$store.commit('addViewMessage', args);
+                    const tag = this.viewname + '_' + this.infoGroup + '_' + tempArr[0];
+                    localStorage.setItem(tag, data.customClass);
                 }
             } 
         }
         if(data.closeMode && data.closeMode == 1) {
-            const args = {tag: data.codename, id: data.id};
-            this.$store.commit('addViewMessage', args);
+            const tag = this.viewname + '_' + this.infoGroup + '_' + data.codename;
+            localStorage.setItem(tag,data.id);
         }
     }
 

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

 <template>
-    <el-breadcrumb class="app-breadcrumb"  separator="/">
+    <el-breadcrumb class="app-breadcrumb"  :separator="separator">
     <transition-group name="breadcrumb">
       <template v-if="Object.is(this.navModel,'route')">
         <el-breadcrumb-item v-for="(item, index) in breadcrumbs"  :key="item.id">
@@ -34,6 +34,7 @@
 import { Component, Vue, Watch, Prop } from 'vue-property-decorator'
 import { RouteRecord, Route } from 'vue-router'
 import { Environment } from "@/environments/environment";
+import { appConfig } from '@/config/appConfig';
 import NavDataService from '@/service/app/navdata-service';
 import {Subscription } from 'rxjs';
 
@@ -48,6 +49,13 @@ export default class Breadcrumb extends Vue {
    */
   private breadcrumbs: Array<any> = [];
 
+  /**
+   * 面包屑分隔符
+   *
+   * @memberof Breadcrumb
+   */
+  private separator:string = appConfig.breadcrumbSeparator;
+
   /**
    * 导航服务
    *

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

@@ -165,7 +165,7 @@ export default class AppFormGroup extends Vue {
             const _item = ActionModel[key];
             if(_item && _item['dataaccaction'] && UIService){
                 let dataActionResult:any;
-                if(Object.is(_item['actiontarget'],"NONE")){
+                if(Object.is(_item['actiontarget'],"NONE") || Object.is(_item['actiontarget'],"")){
                     dataActionResult = UIService.getResourceOPPrivs(_item['dataaccaction']);
                 }else{
                     if(data && Object.keys(data).length >0){

app_web/src/components/app-image-preview/app-image-preview.vue

@@ -21,7 +21,7 @@
     </ul>
     <!-- 预览 -->
     <modal v-model="dialogVisible" footer-hide width="auto" class-name='app-image-preview-model'>
-      <el-image src="dialogImageUrl">
+      <el-image :src="dialogImageUrl">
           <div slot='error' class='image-slot'>
               <img src="/assets/img/picture.png">
           </div>

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

@@ -49,7 +49,7 @@
     </el-upload>
     <!-- 预览 -->
     <modal v-model="dialogVisible" footer-hide class-name='app-image-upload-model'>
-      <el-image src="dialogImageUrl">
+      <el-image :src="dialogImageUrl">
           <div slot='error' class='image-slot'>
               <i class='el-icon-picture-outline'></i>
           </div>

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

@@ -65,7 +65,7 @@ export default class AppPicker extends Vue {
      * 视图上下文
      *
      * @type {*}
-     * @memberof AppFormDRUIPart
+     * @memberof AppPicker
      */
     @Prop() public context!: any;
 
@@ -73,7 +73,7 @@ export default class AppPicker extends Vue {
      * 视图参数
      *
      * @type {*}
-     * @memberof AppFormDRUIPart
+     * @memberof AppPicker
      */
     @Prop() public viewparams!: any;
 
@@ -81,15 +81,23 @@ export default class AppPicker extends Vue {
      * AC参数
      *
      * @type {*}
-     * @memberof AppFormDRUIPart
+     * @memberof AppPicker
      */
     @Prop({default: () => {}}) public acParams?: any;
 
+    /**
+     * 外键值附加数据
+     *
+     * @type {*}
+     * @memberof AppPicker
+     */
+    @Prop() public pickUpData?: string;
+
     /**
      * 表单服务
      *
      * @type {*}
-     * @memberof AppFormDRUIPart
+     * @memberof AppPicker
      */
     @Prop() public service?: any;
 
@@ -97,7 +105,7 @@ export default class AppPicker extends Vue {
      * 应用实体主信息属性名称
      *
      * @type {string}
-     * @memberof AppAutocomplete
+     * @memberof AppPicker
      */
     @Prop({default: 'srfmajortext'}) public deMajorField!: string;
 
@@ -105,7 +113,7 @@ export default class AppPicker extends Vue {
      * 应用实体主键属性名称
      *
      * @type {string}
-     * @memberof AppAutocomplete
+     * @memberof AppPicker
      */
     @Prop({default: 'srfkey'}) public deKeyField!: string;
 
@@ -240,7 +248,7 @@ export default class AppPicker extends Vue {
      * 输入状态
      *
      * @type {boolean}
-     * @memberof AppAutocomplete
+     * @memberof AppPicker
      */
     public inputState: boolean = false;
 
@@ -397,6 +405,7 @@ export default class AppPicker extends Vue {
         if (this.name) {
             this.$emit('formitemvaluechange', { name: this.name, value: item[this.deMajorField] });
         }
+        this.fillPickUpData(item);
     }
 
     /**
@@ -430,6 +439,7 @@ export default class AppPicker extends Vue {
         if (this.name) {
             this.$emit('formitemvaluechange', { name: this.name, value: '' });
         }
+        this.fillPickUpData();
         this.$forceUpdate();
     }
 
@@ -672,6 +682,7 @@ export default class AppPicker extends Vue {
             if (this.name) {
                 this.$emit('formitemvaluechange', { name: this.name, value: item[this.deMajorField]?item[this.deMajorField]:item["srfmajortext"] });
             }
+            this.fillPickUpData(item);
         }
     }
 
@@ -752,7 +763,7 @@ export default class AppPicker extends Vue {
     /**
      * 输入过程中
      *
-     * @memberof AppAutocomplete
+     * @memberof AppPicker
      */
     public onInput($event: any) {
         if (Object.is($event, this.value)) {
@@ -784,6 +795,34 @@ export default class AppPicker extends Vue {
         }
     }
 
+  /**
+   * 填充外键值附加数据
+   *
+   * @param {item} 数据集
+   * @memberof AppPicker
+   */
+  public fillPickUpData(item?:any){
+    if(this.pickUpData){
+        let pickUpDataArray:Array<any> = this.pickUpData.split(";")
+        if(pickUpDataArray && pickUpDataArray.length >0){
+            for(let i=0;i<pickUpDataArray.length;i++){
+               if(item){
+                    this.$emit("formitemvaluechange", {
+                        name: pickUpDataArray[i],
+                        value: item[pickUpDataArray[i]],
+                    });
+               }else{
+                    this.$emit("formitemvaluechange", {
+                        name: pickUpDataArray[i],
+                        value: "",
+                    });
+               }
+            }
+        }
+    }
+  }
+
+    
 
 }
 </script>

app_web/src/components/avue-custom-form/avue-custom-form.vue

@@ -20,10 +20,10 @@ export default class AvueCustomForm extends Vue {
   /**
    * 编辑器参数传入组件配置
    *
-   * @type {any}
+   * @type {*}
    * @memberof AvueCustomForm
    */
-  @Prop() public options?: any;
+  public options: any;
 
   /**
    * 是否需要转换为string类型
@@ -47,7 +47,7 @@ export default class AvueCustomForm extends Vue {
    * @type {any}
    * @memberof AvueCustomForm
    */
-  @Model('change') public value: any;
+  @Model("change") public value: any;
 
   /**
    * 是否将表单数据通过组件配置带入组件中
@@ -57,13 +57,22 @@ export default class AvueCustomForm extends Vue {
    */
   @Prop() public isFormData?: boolean;
 
+  /**
+   * 是否为子表单
+   *
+   * @type {boolean}
+   * @memberof AvueCustomForm
+   */
+  @Prop() public isSubForm?: boolean;
+
   /**
    * 表单数据
    *
-   * @type {any}
+   * @type {*}
    * @memberof AvueCustomForm
    */
-  @Prop() public formData: any;
+  @Prop()
+  public formData?: any;
 
   /**
    * 表单状态
@@ -84,6 +93,8 @@ export default class AvueCustomForm extends Vue {
     if (this.value) {
       if (this.isParseString) obj = JSON.parse(this.value);
       else obj = this.value;
+      if (this.isSubForm && obj instanceof Array)
+        obj = this.loadSubFormData(obj);
     }
     return obj;
   }
@@ -110,7 +121,7 @@ export default class AvueCustomForm extends Vue {
   /**
    * 当前组件配置设置属性
    *
-   * @type {any}
+   * @type {*}
    * @memberof AvueCustomForm
    */
   public formOption: any = null;
@@ -118,7 +129,7 @@ export default class AvueCustomForm extends Vue {
   /**
    * avue-form默认配置
    *
-   * @type {any}
+   * @type {*}
    * @memberof AvueCustomForm
    */
   public defaultOptions: any = {
@@ -185,22 +196,26 @@ export default class AvueCustomForm extends Vue {
    *
    * @memberof AvueCustomForm
    */
-  public load() {
+  public async load() {
     let that: any = this;
     if (!this.options && this.options == null) {
       if (this.url && this.options == null) {
         const get: Promise<any> = this.$http.get(this.url);
-        get.then((response: any) => {
+        await get.then((response: any) => {
           if (response && response.data) {
-            that.formOption = response.data;
-            if (this.isFormData) that.getFormData();
+            let options: any = response.data;
+            this.transitionDicUrlCondition(options);
+            that.formOption = options;
+            if (that.isFormData) that.getFormData();
           }
         });
       } else {
+        this.transitionDicUrlCondition(this.defaultOptions);
         this.formOption = this.defaultOptions;
         if (this.isFormData) that.getFormData();
       }
     } else {
+      this.transitionDicUrlCondition(this.options);
       this.formOption = this.options;
       if (this.isFormData) that.getFormData();
     }
@@ -239,18 +254,77 @@ export default class AvueCustomForm extends Vue {
    * @memberof AvueCustomForm
    */
   public setValue(value: any) {
+    if (this.isSubForm) value = this.getSubFormData(value);
     if (this.isParseString) this.$emit("change", JSON.stringify(value));
     else this.$emit("change", value);
   }
 
+  /**
+   * 提取第一个属性值
+   *
+   * @memberof AvueCustomForm
+   * @return {Array<any>}
+   */
+  public getSubFormData(value: any): Array<any> {
+    let arr: Array<any> = [];
+    for (let val in value) {
+      arr = value[val];
+      break;
+    }
+    return arr;
+  }
+
+  /**
+   * 加载子表单值
+   *
+   * @memberof AvueCustomForm
+   * @return {*}
+   */
+  public loadSubFormData(arr: Array<any>): any {
+    let value: any = {};
+    value[this.formOption.column[0].prop] = arr;
+    return value;
+  }
+
+  /**
+   * 配置的下拉列表转换符号支持动态配置
+   *
+   * @memberof AvueCustomForm
+   * @param {*}
+   */
+  public transitionDicUrlCondition(options: any) {
+    let that: any = this;
+    let recursive: any = function (obj: any) {
+      if (obj.column && obj.column.length > 0) {
+        obj.column.forEach((col: any) => {
+          if (col.dicUrl && col.dicUrl.indexOf("$") > 0) {
+            let g = /\${[^+]+}/;
+            let dicGroup = col.dicUrl.match(g);
+            dicGroup.forEach((dic: any) => {
+              col.dicUrl = col.dicUrl.replace(
+                dic,
+                that.formData[dic.substring(2, dic.length - 1)]
+              );
+            });
+          }
+          if (col.children) recursive(col.children);
+          if (col.group) recursive(col.group);
+        });
+      }
+      if (obj.children) recursive(obj.children);
+      if (obj.group) recursive(obj.group);
+    };
+    recursive(options);
+  }
+
   /**
    * 销毁组件(vue生命周期)
    *
    * @type {Subject<any>}
    * @memberof AvueCustomForm
    */
-  public destroy(){
-    if(this.formStateEvent){
+  public destroy() {
+    if (this.formStateEvent) {
       this.formStateEvent.unsubscribe();
     }
   }

app_web/src/components/disk-file-upload/disk-file-upload.vue

@@ -12,7 +12,6 @@
                         :headers="myHeaders"
                         :file-list="uploadFileList"
                         :show-file-list="false"
-                        :limit="limit"
                         :http-request="customUploadFile">
                     <div>
                         <i class="el-icon-upload"></i>
@@ -20,7 +19,6 @@
                             <span>{{$t('components.diskFileUpload.fileDrag')}}</span>
                             <span style="color:#409EFF;">{{$t('components.diskFileUpload.clickUpload')}}</span>
                         </div>
-                        <div slot="tip" class="el-upload__tip">{{uploadTip}}</div>
                     </div>
                 </el-upload>
             </el-col>
@@ -34,10 +32,10 @@
                         :headers="myHeaders"
                         :file-list="uploadFileList"
                         :show-file-list="false"
-                        :limit="limit"
                         :http-request="customUploadFile">
-                    <el-button type="primary" size="small" icon="el-icon-upload">{{$t('components.diskFileUpload.clickUpload')}}</el-button>
-                    <div slot="tip" class="el-upload__tip">{{uploadTip}}</div>
+                    <el-button type="primary" size="small" icon="el-icon-upload">
+                        {{$t('components.diskFileUpload.clickUpload')}}
+                    </el-button>
                 </el-upload>
             </el-col>
             <!--文件操作-->
@@ -47,8 +45,11 @@
                     <span>{{item.name}}</span>
                 </div>
                 <div class="fileMain">
-                    <el-link type="success" icon="el-icon-download" @click="onDownload(item)">{{$t('components.diskFileUpload.load')}}</el-link>
-                    <el-link type="warning" icon="el-icon-view" v-show="showPreview" @click="onPreview(item)">{{$t('components.diskFileUpload.preview')}}
+                    <el-link type="success" icon="el-icon-download" @click="onDownload(item)">
+                        {{$t('components.diskFileUpload.load')}}
+                    </el-link>
+                    <el-link type="warning" icon="el-icon-view" v-show="showPreview" @click="onPreview(item)">
+                        {{$t('components.diskFileUpload.preview')}}
                     </el-link>
                     <el-link type="primary" icon="el-icon-edit"
                              v-show="showEdit && (item.name.match(/^.+\.(doc|DOC|docx|DOCX|wps|WPS|xls|XLS|xlsx|XLSX|ppt|PPT|et|ET)$/))"
@@ -58,21 +59,40 @@
                              v-show="showOcrview && (item.name.match(/^.+\.(gif|GIF|jpg|JPG|jpeg|JPEG|png|PNG|bmp|BMP|pdf|PDF)$/))"
                              @click="onOcr(item)">OCR
                     </el-link>
-                    <el-link type="danger" icon="el-icon-delete" @click="onRemove(item,index)">{{$t('components.diskFileUpload.delete')}}</el-link>
+                    <el-link type="danger" icon="el-icon-delete" @click="onRemove(item,index)">
+                        {{$t('components.diskFileUpload.delete')}}
+                    </el-link>
                 </div>
             </el-col>
         </el-row>
+        <!-- 自定义弹框 -->
+        <div class="dialogDiv">
+            <el-dialog
+                    :title="dialogTitle"
+                    center
+                    width="70%"
+                    top="5vh"
+                    :visible="showDialog"
+                    :close-on-click-modal="true"
+                    :show-close="true"
+                    :before-close="dialogClose"
+                    :modal-append-to-body="false">
+                <div style="height: 100%;">
+                    <iframe id="fileIframe" :src="iframeUrl" frameborder="0" width="100%"></iframe>
+                </div>
+            </el-dialog>
+        </div>
     </div>
 </template>
 
 <script lang="ts">
-import { Component, Vue, Prop, Watch } from 'vue-property-decorator';
-import {Button, Row, Col, Link, Icon, Upload, Message, MessageBox} from 'element-ui';
-import Axios from 'axios';
-import {Subject, Unsubscribable} from 'rxjs';
+    import {Component, Vue, Prop, Watch} from 'vue-property-decorator';
+    import {Button, Row, Col, Link, Icon, Upload, Message, MessageBox} from 'element-ui';
+    import Axios from 'axios';
+    import {Subject, Unsubscribable} from 'rxjs';
 
-@Component({})
-export default class DiskFileUpload extends Vue {
+    @Component({})
+    export default class DiskFileUpload extends Vue {
 
         /**
          * 当前表单对象
@@ -170,22 +190,6 @@ export default class DiskFileUpload extends Vue {
          */
         @Prop({default: false}) public showOcrview?: boolean;
 
-    /**
-     * 单文件大小
-     *
-     * @type {number}
-     * @memberof DiskFileUpload
-     */  
-    @Prop({default: 1}) public size!: number;
-
-    /**
-     * 文件上传个数
-     *
-     * @type {number}
-     * @memberof DiskFileUpload
-     */  
-    @Prop({default: 5}) public limit!: number;
-
         /**
          * 表单是否处于编辑状态（有真实主键,srfuf='1';srfuf='0'时处于新建未保存）
          *
@@ -194,15 +198,6 @@ export default class DiskFileUpload extends Vue {
          */
         public srfuf: string = '0';
 
-    /**
-     * 上传提示语
-     *
-     * @type {string}
-     * @memberof DiskFileUpload
-     */  
-    get uploadTip(): string {
-       return this.$t('components.diskFileUpload.clues')+this.size.toString()+"M，"+this.$t('components.diskFileUpload.clues1')+this.limit;
-    }
 
         /**
          * 文件列表
@@ -252,14 +247,50 @@ export default class DiskFileUpload extends Vue {
          */
         public isCreate: boolean = true;
 
+        /**
+         * 自定义弹框标题
+         *
+         * @type {*}
+         * @memberof DiskFileUpload
+         */
+        public dialogTitle: any = '';
+
+        /**
+         * 是否显示自定义弹框
+         *
+         * @type {boolean}
+         * @memberof DiskFileUpload
+         */
+        public showDialog: boolean = false;
+
+        /**
+         * 嵌入自定义弹框中iframe的url
+         *
+         * @type {*}
+         * @memberof DiskFileUpload
+         */
+        public iframeUrl: any = '';
+
+        /**
+         * 关闭自定义弹框
+         *
+         * @memberof DiskFileUpload
+         */
+        public dialogClose() {
+            this.dialogTitle = '';
+            this.showDialog = false;
+            this.iframeUrl = '';
+            let iframe: any = document.getElementById("fileIframe");
+            iframe.parentNode.removeChild("fileIframe");
+        }
+
         /**
          * 拼接上传路径
          *
          * @memberof DiskFileUpload
          */
         public getAction() {
-        const uploadUrl = '/net-disk/upload/' + this.getFolder() + '?ownertype=' + this.getOwnertype() + '&ownerid=' + this.getOwnerid();
-        return uploadUrl;
+            return '/net-disk/upload/' + this.getFolder() + '?ownertype=' + this.getOwnertype() + '&ownerid=' + this.getOwnerid();
         }
 
         /**
@@ -268,8 +299,7 @@ export default class DiskFileUpload extends Vue {
          * @memberof DiskFileUpload
          */
         public getFolder() {
-        const folder = typeof this.folder == "string" ? this.folder : JSON.stringify(this.folder);
-        return folder;
+            return typeof this.folder == "string" ? this.folder : JSON.stringify(this.folder);
         }
 
         /**
@@ -278,8 +308,7 @@ export default class DiskFileUpload extends Vue {
          * @memberof DiskFileUpload
          */
         public getOwnertype() {
-        const ownertype = typeof this.ownertype == "string" ? this.ownertype : JSON.stringify(this.ownertype);
-        return ownertype;
+            return typeof this.ownertype == "string" ? this.ownertype : JSON.stringify(this.ownertype);
         }
 
         /**
@@ -288,16 +317,15 @@ export default class DiskFileUpload extends Vue {
          * @memberof DiskFileUpload
          */
         public getOwnerid() {
-        const ownerid = typeof this.ownerid == "string" ? this.ownerid : JSON.stringify(this.ownerid);
-        return ownerid;
+            return typeof this.ownerid == "string" ? this.ownerid : JSON.stringify(this.ownerid);
         }
 
         /**
-     * 
+         * vue创建
          *
          * @memberof DiskFileUpload
          */
-    public created(){
+        public created() {
             this.formStateEvent = this.formState.subscribe(($event: any) => {
                 // 表单加载完成
                 if (Object.is($event.type, 'load')) {
@@ -325,7 +353,7 @@ export default class DiskFileUpload extends Vue {
                 if (Object.is($event.type, 'save')) {
                     // 批量更新文件表中的ownerid
                     if (this.isUpdateBatch == true && this.uploadFileList.length > 0) {
-                    this.updateFileBatch(this.uploadFileList, 'update');
+                        this.updateFileBatch(this.uploadFileList);
                     }
                 }
             });
@@ -336,9 +364,9 @@ export default class DiskFileUpload extends Vue {
          *
          * @memberof DiskFileUpload
          */
-    public getFiles(){
+        public getFiles() {
             // 拼接url
-            let _this:any = this;
+            let _this: any = this;
             const getUrl = '/net-disk/files/' + this.getFolder();
             // 发送get请求
             Axios.get(getUrl, {
@@ -346,9 +374,9 @@ export default class DiskFileUpload extends Vue {
                     ownertype: this.getOwnertype(),
                     ownerid: this.getOwnerid(),
                 },
-            }).then(response => {
+            }).then((response: any) => {
                 if (!response || response.status != 200) {
-                    Message.error(_this.$t('components.diskFileUpload.getFileFailure')+'!');
+                    Message.error(_this.$t('components.diskFileUpload.getFileFailure') + '!');
                     return;
                 }
                 // 返回的是一个jsonArray
@@ -358,8 +386,8 @@ export default class DiskFileUpload extends Vue {
                         this.uploadFileList.push.apply(this.uploadFileList, files);
                     }
                 }
-            }).catch(error => {
-                Message.error(_this.$t('components.diskFileUpload.getFileFailure')+':'+ error);
+            }).catch((error: any) => {
+                Message.error(_this.$t('components.diskFileUpload.getFileFailure') + ':' + error);
             });
         }
 
@@ -373,21 +401,15 @@ export default class DiskFileUpload extends Vue {
             // 上传的文件
             let _this: any = this;
             let file = param.file;
-        // 文件大小
-        const isSize = file.size / 1024 / 1024 < this.size;
-        if (!isSize) {
-            Message.error(_this.$t('components.diskFileUpload.loadFailure1')+_this.size.toString()+"M!");
-            return;
-        }
             // formData传参
             let formData = new FormData();
             formData.append('file', file);
             // 拼接url
             const uploadUrl = this.getAction();
             // 发送post请求
-        Axios.post(uploadUrl, formData, {timeout: 2000}).then(response => {
+            Axios.post(uploadUrl, formData, {timeout: 2000}).then((response: any) => {
                 if (!response || response.status != 200) {
-                Message.error(_this.$t('components.diskFileUpload.loadFailure')+'!');
+                    Message.error(_this.$t('components.diskFileUpload.loadFailure') + '!');
                 }
                 // 返回的是一个jsonobject
                 if (response.data) {
@@ -403,8 +425,8 @@ export default class DiskFileUpload extends Vue {
                         this.$emit('formitemvaluechange', {name: this.formItemName, value: value});
                     }
                 }
-        }).catch(err => {
-            Message.error(_this.$t('components.diskFileUpload.loadFailure')+':'+ err);
+            }).catch((error: any) => {
+                Message.error(_this.$t('components.diskFileUpload.loadFailure') + ':' + error);
             })
         }
 
@@ -423,12 +445,12 @@ export default class DiskFileUpload extends Vue {
             // 发送get请求
             Axios.get(downloadUrl, {
                 headers: {
-                'authcode': item.authcode
+                    'authcode': item.authcode,
                 },
                 responseType: 'arraybuffer',
-        }).then(response => {
+            }).then((response: any) => {
                 if (!response || response.status != 200) {
-                Message.error(_this.$t('components.diskFileUpload.downloadFile')+'!');
+                    Message.error(_this.$t('components.diskFileUpload.downloadFile') + '!');
                     return;
                 }
                 // 请求成功，后台返回的是一个文件流
@@ -437,13 +459,17 @@ export default class DiskFileUpload extends Vue {
                     const disposition = response.headers['content-disposition'];
                     const filename = disposition.split('filename=')[1];
                     // 用blob对象获取文件流
-                var blob = new Blob([response.data], {type: response.headers['content-type']});
-                // 创建下载链接
+                    let blob = new Blob([response.data], {type: response.headers['content-type']});
+                    // 通过文件流创建下载链接
                     var href = URL.createObjectURL(blob);
                     // 创建一个a元素并设置相关属性
-                var a = document.createElement('a');
+                    let a = document.createElement('a');
                     a.href = href;
+                    if (name) {
+                        a.download = name;
+                    } else {
                         a.download = filename;
+                    }
                     // 添加a元素到当前网页
                     document.body.appendChild(a);
                     // 触发a元素的点击事件，实现下载
@@ -455,8 +481,8 @@ export default class DiskFileUpload extends Vue {
                 } else {
                     Message.error(_this.$t('components.diskFileUpload.downloadFile1'));
                 }
-        }).catch(error => {
-            Message.error(_this.$t('components.diskFileUpload.downloadFile')+':'+ error);
+            }).catch((error: any) => {
+                Message.error(_this.$t('components.diskFileUpload.downloadFile') + ':' + error);
             });
         }
 
@@ -470,9 +496,20 @@ export default class DiskFileUpload extends Vue {
             // 拼接url
             const id = typeof item.id == "string" ? item.id : JSON.stringify(item.id);
             const name = typeof item.name == "string" ? item.name : JSON.stringify(item.name);
-        const previewUrl = '/net-disk/preview/' + this.getFolder() + '/' + id + '/' + name + '?authcode=' + item.authcode;
-        // 新窗口打开url
-        window.open(previewUrl);
+            let previewUrl = '/net-disk/preview/' + this.getFolder() + '/' + id + '/' + name + '?authcode=' + item.authcode;
+            Axios.get(previewUrl).then((response: any) => {
+                if (!response || response.status != 200) {
+                    return;
+                }
+                // 返回一个url，通过自定义弹框打开
+                if (response.data) {
+                    this.dialogTitle = name;
+                    this.showDialog = true;
+                    this.iframeUrl = response.data;
+                }
+            }).catch((error: any) => {
+                Message.error(error);
+            });
         }
 
         /**
@@ -485,8 +522,8 @@ export default class DiskFileUpload extends Vue {
             // 拼接url
             const id = typeof item.id == "string" ? item.id : JSON.stringify(item.id);
             const name = typeof item.name == "string" ? item.name : JSON.stringify(item.name);
-        const editUrl = '/net-disk/edit/' + this.getFolder() + '/' + id + '/' + name + '?authcode=' + item.authcode;
-        // 新窗口打开url
+            const editUrl = '/net-disk/editview/' + this.getFolder() + '/' + id + '/' + name + '?authcode=' + item.authcode;
+            // TODO:暂时用window.open
             window.open(editUrl);
         }
 
@@ -501,8 +538,19 @@ export default class DiskFileUpload extends Vue {
             const id = typeof item.id == "string" ? item.id : JSON.stringify(item.id);
             const name = typeof item.name == "string" ? item.name : JSON.stringify(item.name);
             const ocrUrl = '/net-disk/ocrview/' + this.getFolder() + '/' + id + '/' + name + '?authcode=' + item.authcode;
-        // 新窗口打开url
-        window.open(ocrUrl);
+            Axios.get(ocrUrl).then((response: any) => {
+                if (!response || response.status != 200) {
+                    return;
+                }
+                // 返回一个url，通过自定义弹框打开
+                if (response.data) {
+                    this.dialogTitle = name;
+                    this.showDialog = true;
+                    this.iframeUrl = response.data;
+                }
+            }).catch((error: any) => {
+                Message.error(error);
+            });
         }
 
         /**
@@ -513,7 +561,7 @@ export default class DiskFileUpload extends Vue {
          * @memberof DiskFileUpload
          */
         public onRemove(item: any, index: number) {
-        let _this:any = this;
+            let _this: any = this;
             if (item) {
                 MessageBox.confirm(_this.$t('components.diskFileUpload.deleteFile'), _this.$t('components.diskFileUpload.deleteFilePrompt'), {
                     confirmButtonText: _this.$t('components.diskFileUpload.true'),
@@ -523,9 +571,9 @@ export default class DiskFileUpload extends Vue {
                     //　拼接url
                     const deleteUrl = '/net-disk/files/' + item.id;
                     // 发送delete请求
-                Axios.delete(deleteUrl).then(response => {
+                    Axios.delete(deleteUrl).then((response: any) => {
                         if (!response || response.status != 200) {
-                        Message.error(_this.$t('components.diskFileUpload.deleteFileFailure')+'!');
+                            Message.error(_this.$t('components.diskFileUpload.deleteFileFailure') + '!');
                         }
                         // 从文件列表中删除
                         this.uploadFileList.splice(index, 1);
@@ -534,9 +582,9 @@ export default class DiskFileUpload extends Vue {
                             const value = JSON.stringify(this.uploadFileList);
                             this.$emit('formitemvaluechange', {name: this.formItemName, value: value});
                         }
-                }).catch(error => {
+                    }).catch((error: any) => {
                         // 提示删除失败
-                    Message.error(_this.$t('components.diskFileUpload.deleteFileFailure')+':'+ error);
+                        Message.error(_this.$t('components.diskFileUpload.deleteFileFailure') + ':' + error);
                     });
                 });
             }
@@ -547,8 +595,8 @@ export default class DiskFileUpload extends Vue {
          *
          * @memberof DiskFileUpload
          */
-    public updateFileBatch(files: any, opt: any) {
-        let _this:any = this;
+        public updateFileBatch(files: any) {
+            let _this: any = this;
             // 拼接url
             const updateUrl = '/net-disk/files/' + this.getFolder() + '?ownertype=' + this.getOwnertype() + "&ownerid=" + this.getOwnerid();
             // requestBody参数
@@ -562,69 +610,93 @@ export default class DiskFileUpload extends Vue {
                     "Content-Type": "application/json;charset=UTF-8"
                 },
                 timeout: 2000
-        }).then(response => {
+            }).then((response: any) => {
                 if (!response || response.status != 200) {
-                Message.error(_this.$t('components.diskFileUpload.updateFailure')+'!');
+                    Message.error(_this.$t('components.diskFileUpload.updateFailure') + '!');
                     return;
                 }
-        }).catch(error => {
-            Message.error(_this.$t('components.diskFileUpload.updateFailure')+':'+ error);
+            }).catch((error: any) => {
+                Message.error(_this.$t('components.diskFileUpload.updateFailure') + ':' + error);
             });
         }
-}
+    }
 </script>
 <style lang="less">
-#file-upload {
+    #file-upload {
         width: auto;
         height: auto;
         border: 0px solid black;
-}
+    }
 
-#el-row {
+    #el-row {
         border: 0px solid red;
         width: 400px;
-}
+    }
 
-.withDrag {
+    .withDrag {
         border: 0px solid grey;
         width: 400px;
-}
+    }
 
-.withoutDrag {
+    .withoutDrag {
         border: 0px solid grey;
         width: 400px;
         text-align: left;
         padding-left: 0px;
         padding-top: 0px;
         margin-top: 0px;
-}
-
-.el-upload__tip {
-    margin-top: 0px;
-}
+    }
 
-.fileList {
+    .fileList {
         width: 400px;
         border: 0px solid grey;
         margin-top: 0px;
-}
+    }
 
-.fileTitle {
+    .fileTitle {
         text-align: left;
         margin-left: 0px;
-}
+    }
 
-.fileTitle i {
+    .fileTitle i {
         margin-right: 5px;
-}
+    }
 
-.fileMain {
+    .fileMain {
         text-align: left;
         margin-left: 0px;
         margin-top: -10px;
-}
+    }
 
-.fileMain .el-link:nth-child(n+2) {
+    .fileMain .el-link:nth-child(n+2) {
         margin-left: 10px;
-}
+    }
+
+    .dialogDiv {
+        // el-dialog头部
+        .el-dialog__header {
+            height: 40px;
+        }
+
+        // el-dialog面板
+        .el-dialog__wrapper {
+            height: 90vh;
+            overflow: visible;
+        }
+
+        // el-dialog
+        .el-dialog {
+            height: 100%;
+        }
+
+        // el-dailog内容
+        .el-dialog__body {
+            height: inherit;
+        }
+
+        #fileIframe {
+            height: calc(100% - 40px);
+        }
+    }
+
 </style>
\ No newline at end of file

app_web/src/components/disk-image-upload/disk-image-upload.vue

@@ -7,7 +7,6 @@
                 list-type="picture-card"
                 :action="getAction()"
                 :headers="myHeaders"
-                :limit="limit"
                 :before-upload="beforeUpload"
                 :http-request="customImageUpload">
             <i class="el-icon-plus"></i>
@@ -15,40 +14,62 @@
                 <img class="el-upload-list__item-thumbnail" :src="file.url">
                 <span class="el-upload-list__item-actions">
                     <!--预览按钮-->
-                    <span class="el-upload-list__item-preview" @click="onPreview(file)" :title="$t('components.diskImageUpload.preview')"
+                    <span class="el-upload-list__item-preview" @click="onPreview(file)"
+                          :title="$t('components.diskImageUpload.preview')"
                           v-show="showPreview">
                         <i class="el-icon-view"></i>
                     </span>
                     <!--OCR按钮-->
-                    <span class="el-upload-list__item-delete" @click="onOcr(file)" :title="$t('components.diskImageUpload.OCRdiscern')"
+                    <span class="el-upload-list__item-delete" @click="onOcr(file)"
+                          :title="$t('components.diskImageUpload.OCRdiscern')"
                           v-show="showOcrview && (file.name.match(/^.+\.(gif|GIF|jpg|JPG|jpeg|JPEG|png|PNG|bmp|BMP)$/))">
                       <i class="el-icon-camera"></i>
                     </span>
                     <!--下载按钮-->
-                    <span class="el-upload-list__item-delete" @click="onDownload(file)" :title="$t('components.diskImageUpload.load')">
+                    <span class="el-upload-list__item-delete" @click="onDownload(file)"
+                          :title="$t('components.diskImageUpload.load')">
                       <i class="el-icon-download"></i>
                     </span>
                     <!--删除按钮-->
-                    <span class="el-upload-list__item-delete" @click="onRemove(file)" :title="$t('components.diskImageUpload.delete')">
+                    <span class="el-upload-list__item-delete" @click="onRemove(file)"
+                          :title="$t('components.diskImageUpload.delete')">
                       <i class="el-icon-delete"></i>
                     </span>
               </span>
             </div>
         </el-upload>
+        <!-- 预览弹框 -->
         <el-dialog :visible.sync="dialogVisible" :modal="false">
             <img width="100%" :src="dialogImageUrl" alt="">
         </el-dialog>
+        <!-- 自定义弹框 -->
+        <div class="dialogDiv">
+            <el-dialog
+                    :title="dialogTitle"
+                    center
+                    width="70%"
+                    top="5vh"
+                    :visible="showDialog"
+                    :close-on-click-modal="true"
+                    :show-close="true"
+                    :before-close="dialogClose"
+                    :modal-append-to-body="false">
+                <div style="height: 100%;">
+                    <iframe id="fileIframe" :src="iframeUrl" frameborder="0" width="100%"></iframe>
+                </div>
+            </el-dialog>
+        </div>
     </div>
 </template>
 
 <script lang="ts">
-import {Component, Vue, Prop, Watch} from 'vue-property-decorator';
-import {Message, MessageBox} from 'element-ui';
-import Axios from 'axios';
-import {Subject, Unsubscribable} from 'rxjs';
+    import {Component, Vue, Prop, Watch} from 'vue-property-decorator';
+    import {Message, MessageBox} from 'element-ui';
+    import Axios from 'axios';
+    import {Subject, Unsubscribable} from 'rxjs';
 
-@Component({})
-export default class DiskImageUplaod extends Vue {
+    @Component({})
+    export default class DiskImageUplaod extends Vue {
 
         /**
          * 当前表单对象
@@ -131,21 +152,6 @@ export default class DiskImageUplaod extends Vue {
          */
         @Prop({default: false}) public showOcrview?: boolean;
 
-    /**
-     * 单文件大小
-     *
-     * @type {number}
-     * @memberof DiskImageUplaod
-     */
-    @Prop({default: 1}) public size!: number;
-
-    /**
-     * 文件上传个数
-     *
-     * @type {number}
-     * @memberof DiskImageUplaod
-     */
-    @Prop({default: 5}) public limit!: number;
 
         /**
          * 表单是否处于编辑状态（有真实主键,srfuf='1';srfuf='0'时处于新建未保存）
@@ -227,6 +233,43 @@ export default class DiskImageUplaod extends Vue {
          */
         public imageFileids: Array<any> = [];
 
+        /**
+         * 自定义弹框标题
+         *
+         * @type {*}
+         * @memberof DiskImageUplaod
+         */
+        public dialogTitle: any = '';
+
+        /**
+         * 是否显示自定义弹框
+         *
+         * @type {boolean}
+         * @memberof DiskImageUplaod
+         */
+        public showDialog: boolean = false;
+
+        /**
+         * 嵌入自定义弹框中iframe的url
+         *
+         * @type {*}
+         * @memberof DiskImageUplaod
+         */
+        public iframeUrl: any = '';
+
+        /**
+         * 关闭自定义弹框
+         *
+         * @memberof DiskImageUplaod
+         */
+        public dialogClose() {
+            this.dialogTitle = '';
+            this.showDialog = false;
+            this.iframeUrl = '';
+            let iframe: any = document.getElementById("fileIframe");
+            iframe.parentNode.removeChild("fileIframe");
+        }
+
         /**
          * 拼接上传路径
          *
@@ -264,7 +307,7 @@ export default class DiskImageUplaod extends Vue {
         }
 
         /**
-     * vue生命周期create
+         * vue创建
          *
          * @memberof DiskImageUplaod
          */
@@ -312,7 +355,7 @@ export default class DiskImageUplaod extends Vue {
          */
         public getFiles() {
             // 拼接url
-        let _this:any = this;
+            let _this: any = this;
             const getUrl = '/net-disk/files/' + this.getFolder();
             // 发送get请求
             Axios.get(getUrl, {
@@ -320,9 +363,9 @@ export default class DiskImageUplaod extends Vue {
                     ownertype: this.getOwnertype(),
                     ownerid: this.getOwnerid(),
                 },
-        }).then(response => {
+            }).then((response: any) => {
                 if (!response || response.status != 200) {
-                Message.error(_this.$t('components.diskImageUpload.getImageFailure')+"!");
+                    Message.error(_this.$t('components.diskImageUpload.getImageFailure') + "!");
                     return;
                 }
                 // 返回的是一个jsonArray
@@ -337,8 +380,8 @@ export default class DiskImageUplaod extends Vue {
                         });
                     }
                 }
-        }).catch(error => {
-            Message.error(_this.$t('components.diskImageUpload.getImageFailure')+':'+ error);
+            }).catch((error: any) => {
+                Message.error(_this.$t('components.diskImageUpload.getImageFailure') + ':' + error);
             });
         }
 
@@ -358,14 +401,14 @@ export default class DiskImageUplaod extends Vue {
                     'authcode': fileData.authcode
                 },
                 responseType: 'blob',
-        }).then(res => {
-            if (!res || res.status != 200) {
-                Message.error(_this.$t('components.diskImageUpload.loadImageFailure')+'!');
+            }).then((response: any) => {
+                if (!response || response.status != 200) {
+                    Message.error(_this.$t('components.diskImageUpload.loadImageFailure') + '!');
                 }
                 // 请求成功，后台返回的是一个文件流
-            if (res.data) {
+                if (response.data) {
                     // 用blob对象获取文件流
-                var blob = new Blob([res.data], {type: res.headers['content-type']});
+                    var blob = new Blob([response.data], {type: response.headers['content-type']});
                     // 通过文件流创建下载链接
                     var href = URL.createObjectURL(blob);
                     // 将下载链接保存到图片中
@@ -384,8 +427,8 @@ export default class DiskImageUplaod extends Vue {
                 } else {
                     Message.error(_this.$t('components.diskImageUpload.loadImageFailure1'));
                 }
-        }).catch(error => {
-            Message.error(_this.$t('components.diskImageUpload.loadImageFailure')+':' + error);
+            }).catch((error: any) => {
+                Message.error(_this.$t('components.diskImageUpload.loadImageFailure') + ':' + error);
             });
         }
 
@@ -401,12 +444,6 @@ export default class DiskImageUplaod extends Vue {
                 Message.error(_this.$t('components.diskImageUpload.uploadImageFailure1'));
                 return false;
             }
-        // 文件大小
-        const isSize = file.size / 1024 / 1024 < this.size;
-        if (!isSize) {
-            Message.error(_this.$t('components.diskImageUpload.uploadFailure')+this.size.toString()+"M!");
-            return false;
-        }
         }
 
         /**
@@ -424,9 +461,9 @@ export default class DiskImageUplaod extends Vue {
             // 拼接url
             const uploadUrl = this.getAction();
             // 发送post请求
-        Axios.post(uploadUrl, formData, {timeout: 2000}).then(response => {
+            Axios.post(uploadUrl, formData, {timeout: 2000}).then((response: any) => {
                 if (!response || response.status != 200) {
-                Message.error(_this.$t('components.diskImageUpload.uploadImageFailure')+"!");
+                    Message.error(_this.$t('components.diskImageUpload.uploadImageFailure') + "!");
                 }
                 // 返回的是一个jsonobject
                 if (response.data) {
@@ -439,15 +476,15 @@ export default class DiskImageUplaod extends Vue {
                             'authcode': returnData.authcode
                         },
                         responseType: 'blob',
-                }).then(res => {
-                    if (!res || res.status != 200) {
-                        Message.error(_this.$t('components.diskImageUpload.loadImageFailure')+"!");
+                    }).then((response2) => {
+                        if (!response2 || response2.status != 200) {
+                            Message.error(_this.$t('components.diskImageUpload.loadImageFailure') + "!");
                             return;
                         }
                         // 请求成功，后台返回的是一个文件流
-                    if (res.data) {
+                        if (response2.data) {
                             // 用blob对象获取文件流
-                        var blob = new Blob([res.data], {type: res.headers['content-type']});
+                            var blob = new Blob([response2.data], {type: response2.headers['content-type']});
                             // 通过文件流创建下载链接
                             var href = URL.createObjectURL(blob);
                             // 将下载链接保存到本次上传成功后返回的jsonobject中
@@ -475,12 +512,12 @@ export default class DiskImageUplaod extends Vue {
                         } else {
                             Message.error(_this.$t('components.diskImageUpload.loadImageFailure1'));
                         }
-                }).catch(error => {
-                    Message.error(_this.$t('components.diskImageUpload.loadImageFailure')+':' + error);
+                    }).catch((error2: any) => {
+                        Message.error(_this.$t('components.diskImageUpload.loadImageFailure') + ':' + error2);
                     });
                 }
-        }).catch(err => {
-            Message.error(_this.$t('components.diskImageUpload.uploadImageFailure')+':' + err);
+            }).catch((error: any) => {
+                Message.error(_this.$t('components.diskImageUpload.uploadImageFailure') + ':' + error);
             });
         }
 
@@ -510,8 +547,19 @@ export default class DiskImageUplaod extends Vue {
             const id = typeof file.id == "string" ? file.id : JSON.stringify(file.id);
             const name = typeof file.name == "string" ? file.name : JSON.stringify(file.name);
             const ocrUrl = '/net-disk/ocrview/' + this.getFolder() + '/' + id + '/' + name + '?authcode=' + file.authcode;
-        // 新窗口打开url
-        window.open(ocrUrl);
+            Axios.get(ocrUrl).then((response: any) => {
+                if (!response || response.status != 200) {
+                    return;
+                }
+                // 返回一个url，通过自定义弹框打开
+                if (response.data) {
+                    this.dialogTitle = name;
+                    this.showDialog = true;
+                    this.iframeUrl = response.data;
+                }
+            }).catch((error: any) => {
+                Message.error(error);
+            });
         }
 
         /**
@@ -531,9 +579,9 @@ export default class DiskImageUplaod extends Vue {
                     'authcode': file.authcode
                 },
                 responseType: 'blob',
-        }).then(response => {
+            }).then((response: any) => {
                 if (!response || response.status != 200) {
-                Message.error(_this.$t('components.diskImageUpload.loadImageFailure2')+'!');
+                    Message.error(_this.$t('components.diskImageUpload.loadImageFailure2') + '!');
                     return;
                 }
                 // 请求成功，后台返回的是一个文件流
@@ -548,7 +596,11 @@ export default class DiskImageUplaod extends Vue {
                     // 创建一个a元素并设置相关属性
                     var a = document.createElement('a');
                     a.href = href;
+                    if (name) {
+                        a.download = name;
+                    } else {
                         a.download = filename;
+                    }
                     // 添加a元素到当前网页
                     document.body.appendChild(a);
                     // 触发a元素的点击事件，实现下载
@@ -560,8 +612,8 @@ export default class DiskImageUplaod extends Vue {
                 } else {
                     Message.error(_this.$t('components.diskImageUpload.loadImageFailure3'));
                 }
-        }).catch(error => {
-            Message.error(_this.$t('components.diskImageUpload.loadImageFailure2')+':' + error);
+            }).catch((error: any) => {
+                Message.error(_this.$t('components.diskImageUpload.loadImageFailure2') + ':' + error);
             });
         }
 
@@ -574,7 +626,7 @@ export default class DiskImageUplaod extends Vue {
         public onRemove(file: any) {
             let _this: any = this;
             if (file) {
-            MessageBox.confirm(_this.$t('components.diskImageUpload.deleteFile'),_this.$t('components.diskImageUpload.deleteFilePrompt'), {
+                MessageBox.confirm(_this.$t('components.diskImageUpload.deleteFile'), _this.$t('components.diskImageUpload.deleteFilePrompt'), {
                     confirmButtonText: _this.$t('components.diskImageUpload.true'),
                     cancelButtonText: _this.$t('components.diskImageUpload.false'),
                     type: 'warning'
@@ -585,9 +637,9 @@ export default class DiskImageUplaod extends Vue {
                         //　拼接url
                         const deleteUrl = '/net-disk/files/' + file.id;
                         // 发送delete请求
-                    Axios.delete(deleteUrl).then(response => {
+                        Axios.delete(deleteUrl).then((response: any) => {
                             if (!response || response.status != 200) {
-                            Message.error(_this.$t('components.diskImageUpload.deleteImageFailure')+'!');
+                                Message.error(_this.$t('components.diskImageUpload.deleteImageFailure') + '!');
                             }
                             // 从fileid数组中删除
                             this.imageFileids.splice(index, 1);
@@ -598,9 +650,9 @@ export default class DiskImageUplaod extends Vue {
                                 const value = JSON.stringify(this.imageList);
                                 this.$emit('formitemvaluechange', {name: this.formItemName, value: value});
                             }
-                    }).catch(error => {
+                        }).catch((error: any) => {
                             // 提示删除失败
-                        Message.error(_this.$t('components.diskImageUpload.deleteImageFailure')+':' + error);
+                            Message.error(_this.$t('components.diskImageUpload.deleteImageFailure') + ':' + error);
                         });
                     }
                 });
@@ -628,20 +680,46 @@ export default class DiskImageUplaod extends Vue {
                     "Content-Type": "application/json;charset=UTF-8"
                 },
                 timeout: 2000
-        }).then(response => {
+            }).then((response: any) => {
                 if (!response || response.status != 200) {
-                Message.error(_this.$t('components.diskImageUpload.updateFailure')+'!');
+                    Message.error(_this.$t('components.diskImageUpload.updateFailure') + '!');
                     return;
                 }
-        }).catch(error => {
-            Message.error(_this.$t('components.diskImageUpload.updateFailure')+':' + error);
+            }).catch((error: any) => {
+                Message.error(_this.$t('components.diskImageUpload.updateFailure') + ':' + error);
             });
         }
 
 
-}
+    }
 </script>
 
-<style scoped>
+<style lang="less">
+    .dialogDiv {
+        // el-dialog头部
+        .el-dialog__header {
+            height: 40px;
+        }
 
+        // el-dialog面板
+        .el-dialog__wrapper {
+            height: 90vh;
+            overflow: visible;
+        }
+
+        // el-dialog
+        .el-dialog {
+            height: 100%;
+        }
+
+        // el-dailog内容
+        .el-dialog__body {
+            height: inherit;
+        }
+
+        // iframe
+        #fileIframe {
+            height: calc(100% - 40px);
+        }
+    }
 </style>
\ No newline at end of file

app_web/src/config/appConfig.ts

@@ -35,5 +35,7 @@ export const appConfig = {
             label: 'YouYuan',
             value: 'YouYuan',
         },
-    ]
+    ],
+    // 面包屑分隔符
+    breadcrumbSeparator:"/"
 }
\ No newline at end of file

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

@@ -401,10 +401,10 @@ export default class MDViewEngine extends ViewEngine {
         if (this.view.viewparams && Object.keys(this.view.viewparams).length > 0) {
             Object.assign(arg, this.view.viewparams);
         }
-        if (this.getSearchForm() && this.view.isExpandSearchForm) {
+        if (this.getSearchForm()) {
             Object.assign(arg, this.getSearchForm().getData());
         }
-        if (this.view && this.view.$refs.searchbar && this.view.isExpandSearchForm) {
+        if (this.view && this.view.$refs.searchbar) {
             Object.assign(arg, this.view.$refs.searchbar.getData());
         }
         if (this.view && !this.view.isExpandSearchForm) {

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

@@ -194,7 +194,7 @@ export default class ViewEngine {
             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'))){
+                if (_item.uiaction && (Object.is(_item.uiaction.target, "NONE") || Object.is(_item.uiaction.target, ""))){
                     dataActionResult = _this.view.appUIService.getResourceOPPrivs(_item['dataaccaction']);
                 }else{
                     if(data && Object.keys(data).length >0){

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

@@ -78,7 +78,11 @@ export default class WizardViewEngine extends ViewEngine {
      */
     public onfinish(args: any): void {
         this.view.$emit('viewdataschange', [args]);
+        if(!this.view.viewDefaultUsage){
             this.view.$emit('close', null);
+        }else{
+            this.view.$tabPageExp.onClose(this.view.$route.fullPath);
+        }  
     }
 
     /**

app_web/src/environments/environment.ts

@@ -25,6 +25,8 @@ export const Environment = {
     devMode: true,
     // 是否开启权限认证
     enablePermissionValid:false,
+    // 菜单权限模式，可选值：RT(RT模式),RESOURCE(资源模式),MINIX(混合模式),默认MINIX
+    menuPermissionMode:"MINIX",
     // 项目模板地址
     ProjectUrl: "http://demo.ibizlab.cn/ibizr7pfstdtempl/ibizvuer7",
     // 打开目标工具，可选参数：sln、mos

app_web/src/message/view-message-service.ts

@@ -201,7 +201,7 @@ export default class ViewMessageService {
     public async getViewMessageByTag(tag:string,context:any = {},viewparam:any = {}){
         let messageService:any = await this.getService(tag);
         if(messageService.dynamicMode && Object.is(messageService.dynamicMode,"STATIC")){
-            return messageService.getStaticViewMessage();
+            return messageService.getStaticViewMessage(context,viewparam);
         }else{
             return messageService.getDynamicViewMessage(tag,messageService,context,viewparam);
         }
@@ -210,9 +210,14 @@ export default class ViewMessageService {
     /**
      * 转化消息模板标题和内容
      *      
+     * @target {*} target 返回目标数据
+     * @param {*} context 应用上下文
+     * @param {*} viewparam 视图参数
+     * @param {*} item 源数据
+     * 
      * @memberof ViewMessageService
      */
-    public translateMessageTemp(target:any,item?:any){
+    public translateMessageTemp(target:any,context:any,viewparam:any,item?:any){
         
     }
 
@@ -221,7 +226,7 @@ export default class ViewMessageService {
      * 
      * @memberof ViewMessageService
      */
-    public getStaticViewMessage():Array<ViewMessage>{
+    public getStaticViewMessage(context:any,viewparam:any):Array<ViewMessage>{
         let returnViewMessage:ViewMessage ={
             id:this.id,
             name:this.name,
@@ -236,7 +241,7 @@ export default class ViewMessageService {
             dynamicMode:this.dynamicMode,
             messageType:this.messageType
         };
-        this.translateMessageTemp(returnViewMessage);
+        this.translateMessageTemp(returnViewMessage,context,viewparam);
         return [returnViewMessage];
     }
 
@@ -259,10 +264,11 @@ export default class ViewMessageService {
             // 启用缓存
             if(isEnableCache){
                 const callback:Function = (context:any ={},data:any ={},tag:string,promise:Promise<any>) =>{
+                    const callbackKey:string = `${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`;
                     promise.then((result:any) =>{
                         if(result.length > 0){
-                            ViewMessageService.messageCached.set(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`,{items:result});
-                            ViewMessageService.messageCache.delete(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`);
+                            ViewMessageService.messageCached.set(callbackKey,{items:result});
+                            ViewMessageService.messageCache.delete(callbackKey);
                             return resolve(result);
                         }else{
                             return resolve([]);
@@ -271,9 +277,10 @@ export default class ViewMessageService {
                         return reject(result);
                     })
                 }
+                const key:string = `${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`;
                 // 加载完成,从本地缓存获取
-                if(ViewMessageService.messageCached.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`)){
-                    let items:any = ViewMessageService.messageCached.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`).items;
+                if(ViewMessageService.messageCached.get(key)){
+                    let items:any = ViewMessageService.messageCached.get(key).items;
                     if(items.length >0){
                         if(new Date().getTime() <= messageService.getExpirationTime()){
                             return resolve(items); 
@@ -282,11 +289,11 @@ export default class ViewMessageService {
                 }
                 if (messageService) {
                     // 加载中，UI又需要数据，解决连续加载同一代码表问题
-                    if(ViewMessageService.messageCache.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`)){
-                        callback(context,data,tag,ViewMessageService.messageCache.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`));
+                    if(ViewMessageService.messageCache.get(key)){
+                        callback(context,data,tag,ViewMessageService.messageCache.get(key));
                     }else{
                         let result:Promise<any> = messageService.getItems(context,data,isloading);
-                        ViewMessageService.messageCache.set(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`,result);
+                        ViewMessageService.messageCache.set(key,result);
                         messageService.setExpirationTime(new Date().getTime() + cacheTimeout);
                         callback(context,data,tag,result);
                     }

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

@@ -262,6 +262,23 @@ export default class PayIndexViewBase extends Vue {
     */
     public serviceStateEvent: Subscription | undefined;
 
+    /**
+     * 门户部件状态对象
+     *
+     * @type {*}
+     * @memberof PayIndexViewBase
+     */
+    @Prop() public portletState?: any;
+
+   /**
+   * 门户部件状态事件
+   *
+   * @public
+   * @type {(Subscription | undefined)}
+   * @memberof PayIndexViewBase
+   */
+    public portletStateEvent: Subscription | undefined;
+
     /**
      * 应用上下文
      *
@@ -470,6 +487,16 @@ export default class PayIndexViewBase extends Vue {
                 }); 
             }
         });
+        if(_this.portletState){
+            _this.portletStateEvent = _this.portletState.subscribe((res:any) =>{
+                if(!Object.is(res.name,'calendar-view9')){
+                    return;
+                }
+                if(Object.is(res.action,'refresh') && _this.refresh && _this.refresh instanceof Function){
+                    _this.refresh();
+                }
+            })
+        }
         
     }
 

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

@@ -27,28 +27,32 @@
                 </i-button>
             <div slot='content'>{{$t('entities.payopenaccess.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
         </tooltip>
-        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
+        <span class='seperator'>|</span>
+        <tooltip :transfer="true" :max-width="600">
                 <i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)">
                     <i class='fa fa-remove'></i>
                     <span class='caption'>{{$t('entities.payopenaccess.editviewtoolbar_toolbar.tbitem7.caption')}}</span>
                 </i-button>
             <div slot='content'>{{$t('entities.payopenaccess.editviewtoolbar_toolbar.tbitem7.tip')}}</div>
         </tooltip>
-        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
+        <span class='seperator'>|</span>
+        <tooltip :transfer="true" :max-width="600">
                 <i-button v-show="toolBarModels.tbitem12.visabled" :disabled="toolBarModels.tbitem12.disabled" class='' @click="toolbar_click({ tag: 'tbitem12' }, $event)">
                     <i class='fa fa-file-text-o'></i>
                     <span class='caption'>{{$t('entities.payopenaccess.editviewtoolbar_toolbar.tbitem12.caption')}}</span>
                 </i-button>
             <div slot='content'>{{$t('entities.payopenaccess.editviewtoolbar_toolbar.tbitem12.tip')}}</div>
         </tooltip>
-        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
+        <span class='seperator'>|</span>
+        <tooltip :transfer="true" :max-width="600">
                 <i-button v-show="toolBarModels.tbitem14.visabled" :disabled="toolBarModels.tbitem14.disabled" class='' @click="toolbar_click({ tag: 'tbitem14' }, $event)">
                     <i class='fa fa-copy'></i>
                     <span class='caption'>{{$t('entities.payopenaccess.editviewtoolbar_toolbar.tbitem14.caption')}}</span>
                 </i-button>
             <div slot='content'>{{$t('entities.payopenaccess.editviewtoolbar_toolbar.tbitem14.tip')}}</div>
         </tooltip>
-        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
+        <span class='seperator'>|</span>
+        <tooltip :transfer="true" :max-width="600">
                 <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' @click="toolbar_click({ tag: 'tbitem23' }, $event)">
                     <i class='fa fa-fast-backward'></i>
                     
@@ -76,7 +80,8 @@
                 </i-button>
             <div slot='content'>{{$t('entities.payopenaccess.editviewtoolbar_toolbar.tbitem26.tip')}}</div>
         </tooltip>
-        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
+        <span class='seperator'>|</span>
+        <tooltip :transfer="true" :max-width="600">
                 <i-button v-show="toolBarModels.tbitem22.visabled" :disabled="toolBarModels.tbitem22.disabled" class='' @click="toolbar_click({ tag: 'tbitem22' }, $event)">
                     <i class='fa fa-question'></i>
                     <span class='caption'>{{$t('entities.payopenaccess.editviewtoolbar_toolbar.tbitem22.caption')}}</span>
@@ -86,9 +91,11 @@
     </div>
 </div>
 
-        <div class="content-container">
         <div class='view-top-messages'>
         </div>
+        <div class="content-container">
+        <div class='view-body-messages'>
+        </div>
         <view_form 
             :viewState="viewState"  
             :viewparams="viewparams" 
@@ -111,8 +118,8 @@
             @load="form_load($event)"  
             @closeview="closeView($event)">
         </view_form>
-        <div class='view-bottom-messages'>
         </div>
+        <div class='view-bottom-messages'>
         </div>
     </card>
 </div>
@@ -289,6 +296,18 @@ export default class PayOpenAccessEditViewBase extends Vue {
         view_form: { name: 'form', type: 'FORM' },
     };
 
+    /**
+     * 视图刷新
+     *
+     * @param {*} args
+     * @memberof PayOpenAccessEditViewBase
+     */
+    public refresh(args?: any): void {
+        const refs: any = this.$refs;
+        if (refs && refs.form) {
+            refs.form.refresh();
+        }
+    }
     /**
      *  计数器刷新
      *
@@ -320,32 +339,32 @@ export default class PayOpenAccessEditViewBase extends Vue {
      * @memberof PayOpenAccessEditView
      */
     public toolBarModels: any = {
-        tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
+        tbitem3: { name: 'tbitem3', actiontarget: 'NONE', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem4: { name: 'tbitem4', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
+        tbitem4: { name: 'tbitem4', actiontarget: 'NONE', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
 
-        tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+        tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
 
         tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
+        tbitem7: { name: 'tbitem7', actiontarget: 'NONE', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
 
         tbitem8: {  name: 'tbitem8', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem12: { name: 'tbitem12', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
+        tbitem12: { name: 'tbitem12', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
         tbitem13: {  name: 'tbitem13', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem14: { name: 'tbitem14', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
+        tbitem14: { name: 'tbitem14', actiontarget: 'NONE', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
 
         tbitem16: {  name: 'tbitem16', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem23: { name: 'tbitem23', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
+        tbitem23: { name: 'tbitem23', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
 
-        tbitem24: { name: 'tbitem24', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'PrevRecord', target: 'SINGLEKEY' } },
+        tbitem24: { name: 'tbitem24', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'PrevRecord', target: 'SINGLEKEY' } },
 
-        tbitem25: { name: 'tbitem25', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'NextRecord', target: 'SINGLEKEY' } },
+        tbitem25: { name: 'tbitem25', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'NextRecord', target: 'SINGLEKEY' } },
 
-        tbitem26: { name: 'tbitem26', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'LastRecord', target: 'SINGLEKEY' } },
+        tbitem26: { name: 'tbitem26', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'LastRecord', target: 'SINGLEKEY' } },
 
         tbitem21: {  name: 'tbitem21', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem22: { name: 'tbitem22', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
+        tbitem22: { name: 'tbitem22', actiontarget: 'NONE', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
 
     };
 
@@ -395,6 +414,23 @@ export default class PayOpenAccessEditViewBase extends Vue {
     */
     public serviceStateEvent: Subscription | undefined;
 
+    /**
+     * 门户部件状态对象
+     *
+     * @type {*}
+     * @memberof PayOpenAccessEditViewBase
+     */
+    @Prop() public portletState?: any;
+
+   /**
+   * 门户部件状态事件
+   *
+   * @public
+   * @type {(Subscription | undefined)}
+   * @memberof PayOpenAccessEditViewBase
+   */
+    public portletStateEvent: Subscription | undefined;
+
     /**
      * 应用上下文
      *
@@ -608,6 +644,16 @@ export default class PayOpenAccessEditViewBase extends Vue {
                 }); 
             }
         });
+        if(_this.portletState){
+            _this.portletStateEvent = _this.portletState.subscribe((res:any) =>{
+                if(!Object.is(res.name,'calendar-view9')){
+                    return;
+                }
+                if(Object.is(res.action,'refresh') && _this.refresh && _this.refresh instanceof Function){
+                    _this.refresh();
+                }
+            })
+        }
         
     }
 
@@ -1569,6 +1615,9 @@ export default class PayOpenAccessEditViewBase extends Vue {
                 }
             })
         }
+        if(this.portletStateEvent){
+            this.portletStateEvent.unsubscribe();
+        }
     }
 
 

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

@@ -5,9 +5,9 @@
         <div slot='title' class="header-container">
         <span class='caption-info'>{{$t(model.srfCaption)}}</span>
         </div>
-        <div class='content-container'>
             <div class='view-top-messages'>
             </div>
+        <div class='content-container'>
             <div style='margin-bottom: 6px;'>
                 <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="开放平台" />
                 <div class='pull-right'>
@@ -33,18 +33,21 @@
                                 </i-button>
                             <div slot='content'>{{$t('entities.payopenaccess.gridviewtoolbar_toolbar.tbitem6.tip')}}</div>
                         </tooltip>
-                        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
+                        <span class='seperator'>|</span>
+                        <tooltip :transfer="true" :max-width="600">
                                 <i-button v-show="toolBarModels.tbitem8.visabled" :disabled="toolBarModels.tbitem8.disabled" class='' @click="toolbar_click({ tag: 'tbitem8' }, $event)">
                                     <i class='fa fa-remove'></i>
                                     <span class='caption'>{{$t('entities.payopenaccess.gridviewtoolbar_toolbar.tbitem8.caption')}}</span>
                                 </i-button>
                             <div slot='content'>{{$t('entities.payopenaccess.gridviewtoolbar_toolbar.tbitem8.tip')}}</div>
                         </tooltip>
-                        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
+                        <span class='seperator'>|</span>
+                        <tooltip :transfer="true" :max-width="600">
                             <app-export-excel :item="toolBarModels.tbitem13" :caption="$t('entities.payopenaccess.gridviewtoolbar_toolbar.tbitem13.caption')" @exportexcel="toolbar_click({ tag: 'tbitem13' }, $event)"></app-export-excel>
                             <div slot='content'>{{$t('entities.payopenaccess.gridviewtoolbar_toolbar.tbitem13.tip')}}</div>
                         </tooltip>
-                        <span class='seperator'>|</span>    <dropdown v-show="toolBarModels.tbitem16.visabled" trigger='click'>
+                        <span class='seperator'>|</span>
+                        <dropdown v-show="toolBarModels.tbitem16.visabled" trigger='click'>
                             <tooltip :transfer="true" :max-width="600">
                                     <i-button class=''>
                                         <i class=''></i>
@@ -78,7 +81,8 @@
                                 </dropdown-item>
                             </dropdown-menu>
                         </dropdown>
-                        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
+                        <span class='seperator'>|</span>
+                        <tooltip :transfer="true" :max-width="600">
                                 <i-button v-show="toolBarModels.tbitem19.visabled" :disabled="toolBarModels.tbitem19.disabled" class='' @click="toolbar_click({ tag: 'tbitem19' }, $event)">
                                     <i class='fa fa-filter'></i>
                                     <span class='caption'>{{$t('entities.payopenaccess.gridviewtoolbar_toolbar.tbitem19.caption')}}</span>
@@ -111,6 +115,8 @@
                 @load="searchform_load($event)"  
                 @closeview="closeView($event)">
             </view_searchform>
+                    <div class='view-body-messages'>
+                    </div>
             <view_grid 
                 :viewState="viewState"  
                 :viewparams="viewparams" 
@@ -138,8 +144,8 @@
                 @load="grid_load($event)"  
                 @closeview="closeView($event)">
             </view_grid>
-            <div class='view-bottom-messages'>
         </div>
+            <div class='view-bottom-messages'>
             </div>
     </card>
 </div>
@@ -320,6 +326,18 @@ export default class PayOpenAccessGridViewBase extends Vue {
         view_searchform: { name: 'searchform', type: 'SEARCHFORM' },
     };
 
+    /**
+     * 视图刷新
+     *
+     * @param {*} args
+     * @memberof PayOpenAccessGridViewBase
+     */
+    public refresh(args?: any): void {
+        const refs: any = this.$refs;
+        if (refs && refs.grid) {
+            refs.grid.refresh();
+        }
+    }
     /**
      *  计数器刷新
      *
@@ -351,29 +369,29 @@ export default class PayOpenAccessGridViewBase extends Vue {
      * @memberof PayOpenAccessGridView
      */
     public toolBarModels: any = {
-        tbitem3: { name: 'tbitem3', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
+        tbitem3: { name: 'tbitem3', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
-        tbitem4: { name: 'tbitem4', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
+        tbitem4: { name: 'tbitem4', actiontarget: 'NONE', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
 
-        tbitem6: { name: 'tbitem6', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
+        tbitem6: { name: 'tbitem6', actiontarget: 'NONE', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
 
         tbitem7: {  name: 'tbitem7', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem8: { name: 'tbitem8', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } },
+        tbitem8: { name: 'tbitem8', actiontarget: 'NONE', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } },
 
         tbitem9: {  name: 'tbitem9', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem13: { name: 'tbitem13', caption: '导出', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'ExportExcel', target: '' }, MaxRowCount: 1000  },
+        tbitem13: { name: 'tbitem13', actiontarget: 'NONE', caption: '导出', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'ExportExcel', target: '' }, MaxRowCount: 1000  },
 
         tbitem10: {  name: 'tbitem10', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem16: { name: 'tbitem16', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } }, 
- tbitem21: { name: 'tbitem21', caption: '导出数据模型', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'ExportModel', target: '' } },
+ tbitem21: { name: 'tbitem21', actiontarget: 'NONE', caption: '导出数据模型', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'ExportModel', target: '' } },
 
- tbitem23: { name: 'tbitem23', caption: '数据导入', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Import', target: '' } },
+ tbitem23: { name: 'tbitem23', actiontarget: 'NONE', caption: '数据导入', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Import', target: '' } },
 
 
         tbitem17: {  name: 'tbitem17', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem19: { name: 'tbitem19', caption: '过滤', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'ToggleFilter', target: '' } },
+        tbitem19: { name: 'tbitem19', actiontarget: 'NONE', caption: '过滤', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'ToggleFilter', target: '' } },
 
-        tbitem18: { name: 'tbitem18', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
+        tbitem18: { name: 'tbitem18', actiontarget: 'NONE', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
 
     };
 
@@ -430,6 +448,23 @@ export default class PayOpenAccessGridViewBase extends Vue {
     */
     public serviceStateEvent: Subscription | undefined;
 
+    /**
+     * 门户部件状态对象
+     *
+     * @type {*}
+     * @memberof PayOpenAccessGridViewBase
+     */
+    @Prop() public portletState?: any;
+
+   /**
+   * 门户部件状态事件
+   *
+   * @public
+   * @type {(Subscription | undefined)}
+   * @memberof PayOpenAccessGridViewBase
+   */
+    public portletStateEvent: Subscription | undefined;
+
     /**
      * 应用上下文
      *
@@ -643,6 +678,16 @@ export default class PayOpenAccessGridViewBase extends Vue {
                 }); 
             }
         });
+        if(_this.portletState){
+            _this.portletStateEvent = _this.portletState.subscribe((res:any) =>{
+                if(!Object.is(res.name,'calendar-view9')){
+                    return;
+                }
+                if(Object.is(res.action,'refresh') && _this.refresh && _this.refresh instanceof Function){
+                    _this.refresh();
+                }
+            })
+        }
         if(this.formDruipart){
             this.formDruipart.subscribe((res:any) =>{
                 if(Object.is(res.action,'save')){
@@ -1592,6 +1637,9 @@ export default class PayOpenAccessGridViewBase extends Vue {
                 }
             })
         }
+        if(this.portletStateEvent){
+            this.portletStateEvent.unsubscribe();
+        }
     }
 
     /**

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

@@ -2,6 +2,8 @@
 <div class='view-container depickupgridview pay-open-access-pickup-grid-view'>
     <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="payopenaccesspickupgridview"></app-studioaction>
     <card class='view-card view-no-caption  view-no-toolbar' :dis-hover="true" :bordered="false">
+        <div class='view-top-messages'>
+        </div>
         <div class='content-container pickup-grid-view'>
             <view_searchform 
                 :viewState="viewState"  
@@ -19,7 +21,7 @@
                 @load="searchform_load($event)"  
                 @closeview="closeView($event)">
             </view_searchform>
-            <view_grid 
+                    <div class='view-body-messages'>                    </div>            <view_grid 
                 :viewState="viewState"  
                 :viewparams="viewparams" 
                 :context="context" 
@@ -41,6 +43,8 @@
                 @closeview="closeView($event)">
             </view_grid>
         </div>
+        <div class='view-bottom-messages'>
+        </div>
     </card>
 </div>
 </template>
@@ -216,6 +220,18 @@ export default class PayOpenAccessPickupGridViewBase extends Vue {
         view_searchform: { name: 'searchform', type: 'SEARCHFORM' },
     };
 
+    /**
+     * 视图刷新
+     *
+     * @param {*} args
+     * @memberof PayOpenAccessPickupGridViewBase
+     */
+    public refresh(args?: any): void {
+        const refs: any = this.$refs;
+        if (refs && refs.grid) {
+            refs.grid.refresh();
+        }
+    }
     /**
      *  计数器刷新
      *
@@ -285,6 +301,23 @@ export default class PayOpenAccessPickupGridViewBase extends Vue {
     */
     public serviceStateEvent: Subscription | undefined;
 
+    /**
+     * 门户部件状态对象
+     *
+     * @type {*}
+     * @memberof PayOpenAccessPickupGridViewBase
+     */
+    @Prop() public portletState?: any;
+
+   /**
+   * 门户部件状态事件
+   *
+   * @public
+   * @type {(Subscription | undefined)}
+   * @memberof PayOpenAccessPickupGridViewBase
+   */
+    public portletStateEvent: Subscription | undefined;
+
     /**
      * 应用上下文
      *
@@ -498,6 +531,16 @@ export default class PayOpenAccessPickupGridViewBase extends Vue {
                 }); 
             }
         });
+        if(_this.portletState){
+            _this.portletStateEvent = _this.portletState.subscribe((res:any) =>{
+                if(!Object.is(res.name,'calendar-view9')){
+                    return;
+                }
+                if(Object.is(res.action,'refresh') && _this.refresh && _this.refresh instanceof Function){
+                    _this.refresh();
+                }
+            })
+        }
         
     }
 
@@ -675,6 +718,9 @@ export default class PayOpenAccessPickupGridViewBase extends Vue {
                 }
             })
         }
+        if(this.portletStateEvent){
+            this.portletStateEvent.unsubscribe();
+        }
     }
     /**
      * 选中数据字符串

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

@@ -2,7 +2,11 @@
 <div class="view-container depickupview pay-open-access-pickup-view">
     <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="payopenaccesspickupview"></app-studioaction>
     <card class='view-card view-no-caption  view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false">
+        <div class='view-top-messages'>
+        </div>
         <div class="content-container pickup-view">
+        <div class='view-body-messages'>
+        </div>
             <view_pickupviewpanel 
                 :viewState="viewState"  
                 :viewparams="JSON.parse(JSON.stringify(viewparams))" 
@@ -25,6 +29,8 @@
                 </row>
             </card>
         </div>
+        <div class='view-bottom-messages'>
+        </div>
     </card>
 </div>
 </template>
@@ -278,6 +284,23 @@ export default class PayOpenAccessPickupViewBase extends Vue {
     */
     public serviceStateEvent: Subscription | undefined;
 
+    /**
+     * 门户部件状态对象
+     *
+     * @type {*}
+     * @memberof PayOpenAccessPickupViewBase
+     */
+    @Prop() public portletState?: any;
+
+   /**
+   * 门户部件状态事件
+   *
+   * @public
+   * @type {(Subscription | undefined)}
+   * @memberof PayOpenAccessPickupViewBase
+   */
+    public portletStateEvent: Subscription | undefined;
+
     /**
      * 应用上下文
      *
@@ -491,6 +514,16 @@ export default class PayOpenAccessPickupViewBase extends Vue {
                 }); 
             }
         });
+        if(_this.portletState){
+            _this.portletStateEvent = _this.portletState.subscribe((res:any) =>{
+                if(!Object.is(res.name,'calendar-view9')){
+                    return;
+                }
+                if(Object.is(res.action,'refresh') && _this.refresh && _this.refresh instanceof Function){
+                    _this.refresh();
+                }
+            })
+        }
         
     }
 
@@ -623,6 +656,9 @@ export default class PayOpenAccessPickupViewBase extends Vue {
                 }
             })
         }
+        if(this.portletStateEvent){
+            this.portletStateEvent.unsubscribe();
+        }
     }
     /**
      * 选中数据的字符串

app_web/src/pages/pay/pay-trade-edit-view/pay-trade-edit-view-base.vue

@@ -27,28 +27,32 @@
                 </i-button>
             <div slot='content'>{{$t('entities.paytrade.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
         </tooltip>
-        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
+        <span class='seperator'>|</span>
+        <tooltip :transfer="true" :max-width="600">
                 <i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)">
                     <i class='fa fa-remove'></i>
                     <span class='caption'>{{$t('entities.paytrade.editviewtoolbar_toolbar.tbitem7.caption')}}</span>
                 </i-button>
             <div slot='content'>{{$t('entities.paytrade.editviewtoolbar_toolbar.tbitem7.tip')}}</div>
         </tooltip>
-        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
+        <span class='seperator'>|</span>
+        <tooltip :transfer="true" :max-width="600">
                 <i-button v-show="toolBarModels.tbitem12.visabled" :disabled="toolBarModels.tbitem12.disabled" class='' @click="toolbar_click({ tag: 'tbitem12' }, $event)">
                     <i class='fa fa-file-text-o'></i>
                     <span class='caption'>{{$t('entities.paytrade.editviewtoolbar_toolbar.tbitem12.caption')}}</span>
                 </i-button>
             <div slot='content'>{{$t('entities.paytrade.editviewtoolbar_toolbar.tbitem12.tip')}}</div>
         </tooltip>
-        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
+        <span class='seperator'>|</span>
+        <tooltip :transfer="true" :max-width="600">
                 <i-button v-show="toolBarModels.tbitem14.visabled" :disabled="toolBarModels.tbitem14.disabled" class='' @click="toolbar_click({ tag: 'tbitem14' }, $event)">
                     <i class='fa fa-copy'></i>
                     <span class='caption'>{{$t('entities.paytrade.editviewtoolbar_toolbar.tbitem14.caption')}}</span>
                 </i-button>
             <div slot='content'>{{$t('entities.paytrade.editviewtoolbar_toolbar.tbitem14.tip')}}</div>
         </tooltip>
-        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
+        <span class='seperator'>|</span>
+        <tooltip :transfer="true" :max-width="600">
                 <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' @click="toolbar_click({ tag: 'tbitem23' }, $event)">
                     <i class='fa fa-fast-backward'></i>
                     
@@ -76,7 +80,8 @@
                 </i-button>
             <div slot='content'>{{$t('entities.paytrade.editviewtoolbar_toolbar.tbitem26.tip')}}</div>
         </tooltip>
-        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
+        <span class='seperator'>|</span>
+        <tooltip :transfer="true" :max-width="600">
                 <i-button v-show="toolBarModels.tbitem22.visabled" :disabled="toolBarModels.tbitem22.disabled" class='' @click="toolbar_click({ tag: 'tbitem22' }, $event)">
                     <i class='fa fa-question'></i>
                     <span class='caption'>{{$t('entities.paytrade.editviewtoolbar_toolbar.tbitem22.caption')}}</span>
@@ -86,9 +91,11 @@
     </div>
 </div>
 
-        <div class="content-container">
         <div class='view-top-messages'>
         </div>
+        <div class="content-container">
+        <div class='view-body-messages'>
+        </div>
         <view_form 
             :viewState="viewState"  
             :viewparams="viewparams" 
@@ -111,8 +118,8 @@
             @load="form_load($event)"  
             @closeview="closeView($event)">
         </view_form>
-        <div class='view-bottom-messages'>
         </div>
+        <div class='view-bottom-messages'>
         </div>
     </card>
 </div>
@@ -289,6 +296,18 @@ export default class PayTradeEditViewBase extends Vue {
         view_form: { name: 'form', type: 'FORM' },
     };
 
+    /**
+     * 视图刷新
+     *
+     * @param {*} args
+     * @memberof PayTradeEditViewBase
+     */
+    public refresh(args?: any): void {
+        const refs: any = this.$refs;
+        if (refs && refs.form) {
+            refs.form.refresh();
+        }
+    }
     /**
      *  计数器刷新
      *
@@ -320,32 +339,32 @@ export default class PayTradeEditViewBase extends Vue {
      * @memberof PayTradeEditView
      */
     public toolBarModels: any = {
-        tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
+        tbitem3: { name: 'tbitem3', actiontarget: 'NONE', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem4: { name: 'tbitem4', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
+        tbitem4: { name: 'tbitem4', actiontarget: 'NONE', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
 
-        tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+        tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
 
         tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
+        tbitem7: { name: 'tbitem7', actiontarget: 'NONE', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
 
         tbitem8: {  name: 'tbitem8', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem12: { name: 'tbitem12', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
+        tbitem12: { name: 'tbitem12', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
         tbitem13: {  name: 'tbitem13', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem14: { name: 'tbitem14', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
+        tbitem14: { name: 'tbitem14', actiontarget: 'NONE', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
 
         tbitem16: {  name: 'tbitem16', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem23: { name: 'tbitem23', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
+        tbitem23: { name: 'tbitem23', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
 
-        tbitem24: { name: 'tbitem24', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'PrevRecord', target: 'SINGLEKEY' } },
+        tbitem24: { name: 'tbitem24', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'PrevRecord', target: 'SINGLEKEY' } },
 
-        tbitem25: { name: 'tbitem25', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'NextRecord', target: 'SINGLEKEY' } },
+        tbitem25: { name: 'tbitem25', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'NextRecord', target: 'SINGLEKEY' } },
 
-        tbitem26: { name: 'tbitem26', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'LastRecord', target: 'SINGLEKEY' } },
+        tbitem26: { name: 'tbitem26', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'LastRecord', target: 'SINGLEKEY' } },
 
         tbitem21: {  name: 'tbitem21', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem22: { name: 'tbitem22', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
+        tbitem22: { name: 'tbitem22', actiontarget: 'NONE', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
 
     };
 
@@ -395,6 +414,23 @@ export default class PayTradeEditViewBase extends Vue {
     */
     public serviceStateEvent: Subscription | undefined;
 
+    /**
+     * 门户部件状态对象
+     *
+     * @type {*}
+     * @memberof PayTradeEditViewBase
+     */
+    @Prop() public portletState?: any;
+
+   /**
+   * 门户部件状态事件
+   *
+   * @public
+   * @type {(Subscription | undefined)}
+   * @memberof PayTradeEditViewBase
+   */
+    public portletStateEvent: Subscription | undefined;
+
     /**
      * 应用上下文
      *
@@ -608,6 +644,16 @@ export default class PayTradeEditViewBase extends Vue {
                 }); 
             }
         });
+        if(_this.portletState){
+            _this.portletStateEvent = _this.portletState.subscribe((res:any) =>{
+                if(!Object.is(res.name,'calendar-view9')){
+                    return;
+                }
+                if(Object.is(res.action,'refresh') && _this.refresh && _this.refresh instanceof Function){
+                    _this.refresh();
+                }
+            })
+        }
         
     }
 
@@ -1569,6 +1615,9 @@ export default class PayTradeEditViewBase extends Vue {
                 }
             })
         }
+        if(this.portletStateEvent){
+            this.portletStateEvent.unsubscribe();
+        }
     }
 
 

app_web/src/pages/pay/pay-trade-grid-view/pay-trade-grid-view-base.vue

@@ -5,9 +5,9 @@
         <div slot='title' class="header-container">
         <span class='caption-info'>{{$t(model.srfCaption)}}</span>
         </div>
-        <div class='content-container'>
             <div class='view-top-messages'>
             </div>
+        <div class='content-container'>
             <div style='margin-bottom: 6px;'>
                 <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="交易名称" />
                 <div class='pull-right'>
@@ -33,18 +33,21 @@
                                 </i-button>
                             <div slot='content'>{{$t('entities.paytrade.gridviewtoolbar_toolbar.tbitem6.tip')}}</div>
                         </tooltip>
-                        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
+                        <span class='seperator'>|</span>
+                        <tooltip :transfer="true" :max-width="600">
                                 <i-button v-show="toolBarModels.tbitem8.visabled" :disabled="toolBarModels.tbitem8.disabled" class='' @click="toolbar_click({ tag: 'tbitem8' }, $event)">
                                     <i class='fa fa-remove'></i>
                                     <span class='caption'>{{$t('entities.paytrade.gridviewtoolbar_toolbar.tbitem8.caption')}}</span>
                                 </i-button>
                             <div slot='content'>{{$t('entities.paytrade.gridviewtoolbar_toolbar.tbitem8.tip')}}</div>
                         </tooltip>
-                        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
+                        <span class='seperator'>|</span>
+                        <tooltip :transfer="true" :max-width="600">
                             <app-export-excel :item="toolBarModels.tbitem13" :caption="$t('entities.paytrade.gridviewtoolbar_toolbar.tbitem13.caption')" @exportexcel="toolbar_click({ tag: 'tbitem13' }, $event)"></app-export-excel>
                             <div slot='content'>{{$t('entities.paytrade.gridviewtoolbar_toolbar.tbitem13.tip')}}</div>
                         </tooltip>
-                        <span class='seperator'>|</span>    <dropdown v-show="toolBarModels.tbitem16.visabled" trigger='click'>
+                        <span class='seperator'>|</span>
+                        <dropdown v-show="toolBarModels.tbitem16.visabled" trigger='click'>
                             <tooltip :transfer="true" :max-width="600">
                                     <i-button class=''>
                                         <i class=''></i>
@@ -78,7 +81,8 @@
                                 </dropdown-item>
                             </dropdown-menu>
                         </dropdown>
-                        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
+                        <span class='seperator'>|</span>
+                        <tooltip :transfer="true" :max-width="600">
                                 <i-button v-show="toolBarModels.tbitem19.visabled" :disabled="toolBarModels.tbitem19.disabled" class='' @click="toolbar_click({ tag: 'tbitem19' }, $event)">
                                     <i class='fa fa-filter'></i>
                                     <span class='caption'>{{$t('entities.paytrade.gridviewtoolbar_toolbar.tbitem19.caption')}}</span>
@@ -111,6 +115,8 @@
                 @load="searchform_load($event)"  
                 @closeview="closeView($event)">
             </view_searchform>
+                    <div class='view-body-messages'>
+                    </div>
             <view_grid 
                 :viewState="viewState"  
                 :viewparams="viewparams" 
@@ -138,8 +144,8 @@
                 @load="grid_load($event)"  
                 @closeview="closeView($event)">
             </view_grid>
-            <div class='view-bottom-messages'>
         </div>
+            <div class='view-bottom-messages'>
             </div>
     </card>
 </div>
@@ -320,6 +326,18 @@ export default class PayTradeGridViewBase extends Vue {
         view_searchform: { name: 'searchform', type: 'SEARCHFORM' },
     };
 
+    /**
+     * 视图刷新
+     *
+     * @param {*} args
+     * @memberof PayTradeGridViewBase
+     */
+    public refresh(args?: any): void {
+        const refs: any = this.$refs;
+        if (refs && refs.grid) {
+            refs.grid.refresh();
+        }
+    }
     /**
      *  计数器刷新
      *
@@ -351,29 +369,29 @@ export default class PayTradeGridViewBase extends Vue {
      * @memberof PayTradeGridView
      */
     public toolBarModels: any = {
-        tbitem3: { name: 'tbitem3', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
+        tbitem3: { name: 'tbitem3', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
-        tbitem4: { name: 'tbitem4', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
+        tbitem4: { name: 'tbitem4', actiontarget: 'NONE', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
 
-        tbitem6: { name: 'tbitem6', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
+        tbitem6: { name: 'tbitem6', actiontarget: 'NONE', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
 
         tbitem7: {  name: 'tbitem7', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem8: { name: 'tbitem8', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } },
+        tbitem8: { name: 'tbitem8', actiontarget: 'NONE', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } },
 
         tbitem9: {  name: 'tbitem9', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem13: { name: 'tbitem13', caption: '导出', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'ExportExcel', target: '' }, MaxRowCount: 1000  },
+        tbitem13: { name: 'tbitem13', actiontarget: 'NONE', caption: '导出', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'ExportExcel', target: '' }, MaxRowCount: 1000  },
 
         tbitem10: {  name: 'tbitem10', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem16: { name: 'tbitem16', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } }, 
- tbitem21: { name: 'tbitem21', caption: '导出数据模型', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'ExportModel', target: '' } },
+ tbitem21: { name: 'tbitem21', actiontarget: 'NONE', caption: '导出数据模型', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'ExportModel', target: '' } },
 
- tbitem23: { name: 'tbitem23', caption: '数据导入', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Import', target: '' } },
+ tbitem23: { name: 'tbitem23', actiontarget: 'NONE', caption: '数据导入', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Import', target: '' } },
 
 
         tbitem17: {  name: 'tbitem17', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem19: { name: 'tbitem19', caption: '过滤', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'ToggleFilter', target: '' } },
+        tbitem19: { name: 'tbitem19', actiontarget: 'NONE', caption: '过滤', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'ToggleFilter', target: '' } },
 
-        tbitem18: { name: 'tbitem18', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
+        tbitem18: { name: 'tbitem18', actiontarget: 'NONE', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
 
     };
 
@@ -430,6 +448,23 @@ export default class PayTradeGridViewBase extends Vue {
     */
     public serviceStateEvent: Subscription | undefined;
 
+    /**
+     * 门户部件状态对象
+     *
+     * @type {*}
+     * @memberof PayTradeGridViewBase
+     */
+    @Prop() public portletState?: any;
+
+   /**
+   * 门户部件状态事件
+   *
+   * @public
+   * @type {(Subscription | undefined)}
+   * @memberof PayTradeGridViewBase
+   */
+    public portletStateEvent: Subscription | undefined;
+
     /**
      * 应用上下文
      *
@@ -643,6 +678,16 @@ export default class PayTradeGridViewBase extends Vue {
                 }); 
             }
         });
+        if(_this.portletState){
+            _this.portletStateEvent = _this.portletState.subscribe((res:any) =>{
+                if(!Object.is(res.name,'calendar-view9')){
+                    return;
+                }
+                if(Object.is(res.action,'refresh') && _this.refresh && _this.refresh instanceof Function){
+                    _this.refresh();
+                }
+            })
+        }
         if(this.formDruipart){
             this.formDruipart.subscribe((res:any) =>{
                 if(Object.is(res.action,'save')){
@@ -1592,6 +1637,9 @@ export default class PayTradeGridViewBase extends Vue {
                 }
             })
         }
+        if(this.portletStateEvent){
+            this.portletStateEvent.unsubscribe();
+        }
     }
 
     /**

app_web/src/store/getters.ts

@@ -47,12 +47,21 @@ export const getLocalData = (state: any) => () => {
  * @param state 
  */
 export const getAppData = (state: any) => () => {
+    if(!state.appdata){
+        state.appdata = {};
+    }
     let result:any = JSON.parse(JSON.stringify(state.appdata));
-    if(state.localdata && Object.keys(state.localdata).length >0){
     let copyContext:any = result.context?result.context:{};
+    if(state.localdata && Object.keys(state.localdata).length >0){
         Object.assign(copyContext,state.localdata);
-        result.context = copyContext;
+    }else if(localStorage.getItem('localdata')){
+        try{
+            Object.assign(copyContext,JSON.parse(localStorage.getItem('localdata') as string));
+        }catch(error){
+            console.warn(error);
+        }
     }
+    result.context = copyContext;
     return result;
 }
 

app_web/src/store/modules/auth-resource/getters.ts

@@ -32,23 +32,56 @@ export const getEnablePermissionValid = (state: any) => {
 }
 
 /**
- * 判断指定菜单是否显示
+ * 判断指定菜单是否显示(混合模式)
  * 
  * @param state 
  */
-export const getAuthMenu = (state: any) => (menu:any) =>{
-    // 存在权限
+export const getAuthMenu = (state: any) => (menu: any) => {
+    if (state.enablePermissionValid) {
         let resourceIndex: any;
-    let menuIndex:any;
-    if(state.enablePermissionValid){
-        resourceIndex= state.resourceData.findIndex((resourcetag: any, objIndex: any, objs: any) => {
+        let menuIndex: any;
+        resourceIndex = state.resourceData.findIndex((resourcetag: any, objIndex: any, objs: any) => {
             return Object.is(menu.resourcetag, resourcetag);
         })
-        menuIndex= state.menuData.findIndex((menutag: any, objIndex: any, objs: any) => {
+        menuIndex = state.menuData.findIndex((menutag: any, objIndex: any, objs: any) => {
             return Object.is(menu.authtag, menutag);
         })
-        return (resourceIndex !== -1 || menuIndex !== -1)?true:false;
-    }else{
+        return (resourceIndex !== -1 || menuIndex !== -1) ? true : false;
+    } else {
+        return true;
+    }
+}
+
+/**
+ * 判断指定菜单是否显示(资源模式)
+ * 
+ * @param state 
+ */
+export const getAuthMenuWithResource = (state: any) => (menu: any) => {
+    if (state.enablePermissionValid && menu.resourcetag) {
+        let resourceIndex: any;
+        resourceIndex = state.resourceData.findIndex((resourcetag: any, objIndex: any, objs: any) => {
+            return Object.is(menu.resourcetag, resourcetag);
+        })
+        return resourceIndex !== -1 ? true : false;
+    } else {
+        return true;
+    }
+}
+
+/**
+ * 判断指定菜单是否显示(RT模式)
+ * 
+ * @param state 
+ */
+export const getAuthMenuWithRT = (state: any) => (menu: any) => {
+    if (state.enablePermissionValid) {
+        let menuIndex: any;
+        menuIndex = state.menuData.findIndex((menutag: any, objIndex: any, objs: any) => {
+            return Object.is(menu.authtag, menutag);
+        })
+        return menuIndex !== -1 ? true : false;
+    } else {
         return true;
     }
 }
\ No newline at end of file

app_web/src/styles/default.less

@@ -124,11 +124,14 @@
             // flex-grow: 1;
             height: calc(100% - 74px);
             padding: 0px;
+            display: flex;
+            flex-direction: column;
             > .content-container {
                 height: 100%;
                 display: flex;
                 margin: 0;
                 flex-direction: column;
+                overflow: auto;
             }
         }
     }

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

@@ -89,10 +89,10 @@ export default class PayOpenAccessUIServiceBase extends UIService {
      * @memberof  PayOpenAccessUIServiceBase
      */  
     public initViewMap(){
-        this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'payopenaccesses'});
-        this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'payopenaccesses'});
-        this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'payopenaccesses'});
-        this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'payopenaccesses'});
+        this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'payopenaccesses',component:'pay-open-access-grid-view'});
+        this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'payopenaccesses',component:'pay-open-access-pickup-grid-view'});
+        this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'payopenaccesses',component:'pay-open-access-pickup-view'});
+        this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'payopenaccesses',component:'pay-open-access-edit-view'});
     }
 
     /**
@@ -201,17 +201,17 @@ export default class PayOpenAccessUIServiceBase extends UIService {
 
         this.mainStateFields.forEach((singleMainField:any) =>{
             if(!(singleMainField in curData)){
-                console.warn(`当前数据对象不包含属性${singleMainField}，可能会发生错误`);
+                console.warn(`当前数据对象不包含属性「${singleMainField}」，根据「${singleMainField}」属性进行的主状态计算默认为空值`);
             }
         })
         for (let i = 0; i <= 1; i++) {
-            let strTag:string = (curData[this.mainStateFields[0]])?(i == 0) ? `${curData[this.mainStateFields[0]]}` : "":"";
+            let strTag:string = (curData[this.mainStateFields[0]] != null && curData[this.mainStateFields[0]] !== "")?(i == 0) ? `${curData[this.mainStateFields[0]]}` : "":"";
             if (this.mainStateFields.length >= 2) {
                 for (let j = 0; j <= 1; j++) {
-                    let strTag2:string = (curData[this.mainStateFields[1]])?`${strTag}__${(j == 0) ? `${curData[this.mainStateFields[1]]}` : ""}`:strTag;
+                    let strTag2:string = (curData[this.mainStateFields[1]] != null && curData[this.mainStateFields[1]] !== "")?`${strTag}__${(j == 0) ? `${curData[this.mainStateFields[1]]}` : ""}`:strTag;
                     if (this.mainStateFields.length >= 3) {
                         for (let k = 0; k <= 1; k++) {
-                            let strTag3:string = (curData[this.mainStateFields[2]])?`${strTag2}__${(k == 0) ? `${curData[this.mainStateFields[2]]}` : ""}`:strTag2;
+                            let strTag3:string = (curData[this.mainStateFields[2]] != null && curData[this.mainStateFields[2]] !== "")?`${strTag2}__${(k == 0) ? `${curData[this.mainStateFields[2]]}` : ""}`:strTag2;
                             // 判断是否存在
                             return this.allDeMainStateMap.get(strTag3);
                         }

app_web/src/uiservice/pay-trade/pay-trade-ui-service-base.ts

@@ -89,8 +89,8 @@ export default class PayTradeUIServiceBase extends UIService {
      * @memberof  PayTradeUIServiceBase
      */  
     public initViewMap(){
-        this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'paytrades'});
-        this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'paytrades'});
+        this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'paytrades',component:'pay-trade-edit-view'});
+        this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'paytrades',component:'pay-trade-grid-view'});
     }
 
     /**
@@ -199,17 +199,17 @@ export default class PayTradeUIServiceBase extends UIService {
 
         this.mainStateFields.forEach((singleMainField:any) =>{
             if(!(singleMainField in curData)){
-                console.warn(`当前数据对象不包含属性${singleMainField}，可能会发生错误`);
+                console.warn(`当前数据对象不包含属性「${singleMainField}」，根据「${singleMainField}」属性进行的主状态计算默认为空值`);
             }
         })
         for (let i = 0; i <= 1; i++) {
-            let strTag:string = (curData[this.mainStateFields[0]])?(i == 0) ? `${curData[this.mainStateFields[0]]}` : "":"";
+            let strTag:string = (curData[this.mainStateFields[0]] != null && curData[this.mainStateFields[0]] !== "")?(i == 0) ? `${curData[this.mainStateFields[0]]}` : "":"";
             if (this.mainStateFields.length >= 2) {
                 for (let j = 0; j <= 1; j++) {
-                    let strTag2:string = (curData[this.mainStateFields[1]])?`${strTag}__${(j == 0) ? `${curData[this.mainStateFields[1]]}` : ""}`:strTag;
+                    let strTag2:string = (curData[this.mainStateFields[1]] != null && curData[this.mainStateFields[1]] !== "")?`${strTag}__${(j == 0) ? `${curData[this.mainStateFields[1]]}` : ""}`:strTag;
                     if (this.mainStateFields.length >= 3) {
                         for (let k = 0; k <= 1; k++) {
-                            let strTag3:string = (curData[this.mainStateFields[2]])?`${strTag2}__${(k == 0) ? `${curData[this.mainStateFields[2]]}` : ""}`:strTag2;
+                            let strTag3:string = (curData[this.mainStateFields[2]] != null && curData[this.mainStateFields[2]] !== "")?`${strTag2}__${(k == 0) ? `${curData[this.mainStateFields[2]]}` : ""}`:strTag2;
                             // 判断是否存在
                             return this.allDeMainStateMap.get(strTag3);
                         }

app_web/src/uiservice/ui-service.ts

 import { Store } from 'vuex';
+import AuthService from '@/authservice/auth-service';
 
 /**
  * 界面服务基类
@@ -63,6 +64,9 @@ export default class UIService {
     * @memberof  UIService
     */
    public getResourceOPPrivs(tag:any){
+        if(!this.authService) {
+            this.authService = new AuthService(this.getStore());
+        }
         return this.authService.getResourcePermission(this.authService.sysOPPrivsMap.get(tag))?1:0;
    }
 

app_web/src/utils/view-tool/view-tool.ts

@@ -260,7 +260,7 @@ export class ViewTool {
             const _item = ActionModel[key];
             if(_item && _item['dataaccaction'] && UIService){
                 let dataActionResult:any;
-                if(Object.is(_item['actiontarget'],"NONE")){
+                if(Object.is(_item['actiontarget'],"NONE") || Object.is(_item['actiontarget'],"")){
                     dataActionResult = UIService.getResourceOPPrivs(_item['dataaccaction']);
                 }else{
                     if(data && Object.keys(data).length >0){

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

@@ -223,6 +223,7 @@ export default class PayIndexViewBase extends Vue implements ControlInterface {
     }
 
 
+
     /**
      * 获取多项数据
      *

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

@@ -158,6 +158,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
     }
 
 
+
     /**
      * 获取多项数据
      *

app_web/src/widgets/pay-open-access/default-searchform/default-searchform-service.ts

@@ -41,6 +41,14 @@ export default class DefaultService extends ControlService {
         this.model = new DefaultModel();
     }
 
+    /**
+     * 远端数据
+     *
+     * @type {*}
+     * @memberof DefaultService
+     */
+    private remoteCopyData:any = {};
+
     /**
      * 处理数据
      *
@@ -271,6 +279,7 @@ export default class DefaultService extends ControlService {
                 result = this.appEntityService.Get(Context,Data, isloading);
             }
             result.then((response) => {
+                this.setRemoteCopyData(response);
                 this.handleResponse(action, response);
                 resolve(response);
             }).catch(response => {
@@ -301,6 +310,7 @@ export default class DefaultService extends ControlService {
                 result = this.appEntityService.GetDraft(Context,Data, isloading);
             }
             result.then((response) => {
+                this.setRemoteCopyData(response);
                 this.handleResponse(action, response, true);
                 resolve(response);
             }).catch(response => {
@@ -434,5 +444,24 @@ export default class DefaultService extends ControlService {
         return item;
     }
 
+    /**
+     * 设置远端数据
+     * 
+     * @param result 远端请求结果 
+     * @memberof DefaultService
+     */
+    public setRemoteCopyData(result:any){
+        if (result && result.status === 200) {
+            this.remoteCopyData = Util.deepCopy(result.data);
+        }
+    }
 
+    /**
+     * 获取远端数据
+     * 
+     * @memberof DefaultService
+     */
+    public getRemoteCopyData(){
+        return this.remoteCopyData;
+    }
 }
\ No newline at end of file

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

@@ -2,8 +2,7 @@
     <i-form :model="this.data" class='app-form' ref='form'  id='payopenaccess_main' style="">
     <input style="display:none;" />
     <row >
-            
-<i-col v-show="detailsModel.accessname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+            <i-col v-show="detailsModel.accessname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='accessname' :itemRules="this.rules().accessname" class='' :caption="$t('entities.payopenaccess.main_form.details.accessname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.accessname.error" :isEmptyCaption="false" labelPos="LEFT">
     <input-box 
     v-model="data.accessname"  
@@ -265,6 +264,7 @@ export default class MainBase extends Vue implements ControlInterface {
     }
 
 
+
     /**
      * 视图默认使用
      *
@@ -514,102 +514,38 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public rules() :any {
     return {
-        srforikey: [
-            { type: 'string', message: ' 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: ' 值必须为字符串类型', trigger: 'blur' },
-            { required: this.detailsModel.srforikey.required, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.srforikey.required, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { type: 'string', message: '开放平台接入标识 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '开放平台接入标识 值必须为字符串类型', trigger: 'blur' },
-            { required: this.detailsModel.srfkey.required, type: 'string', message: '开放平台接入标识 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.srfkey.required, type: 'string', message: '开放平台接入标识 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { type: 'string', message: '开放平台 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '开放平台 值必须为字符串类型', trigger: 'blur' },
-            { required: this.detailsModel.srfmajortext.required, type: 'string', message: '开放平台 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.srfmajortext.required, type: 'string', message: '开放平台 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { type: 'string', message: ' 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: ' 值必须为字符串类型', trigger: 'blur' },
-            { required: this.detailsModel.srftempmode.required, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.srftempmode.required, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { type: 'string', message: ' 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: ' 值必须为字符串类型', trigger: 'blur' },
-            { required: this.detailsModel.srfuf.required, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.srfuf.required, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { type: 'string', message: ' 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: ' 值必须为字符串类型', trigger: 'blur' },
-            { required: this.detailsModel.srfdeid.required, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.srfdeid.required, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { type: 'string', message: ' 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: ' 值必须为字符串类型', trigger: 'blur' },
-            { required: this.detailsModel.srfsourcekey.required, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.srfsourcekey.required, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
         accessname: [
-            { type: 'string', message: '开放平台 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '开放平台 值必须为字符串类型', trigger: 'blur' },
             { required: this.detailsModel.accessname.required, type: 'string', message: '开放平台 值不能为空', trigger: 'change' },
             { required: this.detailsModel.accessname.required, type: 'string', message: '开放平台 值不能为空', trigger: 'blur' },
         ],
         open_type: [
-            { type: 'string', message: '开放平台类型 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '开放平台类型 值必须为字符串类型', trigger: 'blur' },
             { required: this.detailsModel.open_type.required, type: 'string', message: '开放平台类型 值不能为空', trigger: 'change' },
             { required: this.detailsModel.open_type.required, type: 'string', message: '开放平台类型 值不能为空', trigger: 'blur' },
         ],
         access_key: [
-            { type: 'string', message: 'AccessKey(AppId) 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: 'AccessKey(AppId) 值必须为字符串类型', trigger: 'blur' },
             { required: this.detailsModel.access_key.required, type: 'string', message: 'AccessKey(AppId) 值不能为空', trigger: 'change' },
             { required: this.detailsModel.access_key.required, type: 'string', message: 'AccessKey(AppId) 值不能为空', trigger: 'blur' },
         ],
         secret_key: [
-            { type: 'string', message: 'SecretKey(AppSecret) 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: 'SecretKey(AppSecret) 值必须为字符串类型', trigger: 'blur' },
             { required: this.detailsModel.secret_key.required, type: 'string', message: 'SecretKey(AppSecret) 值不能为空', trigger: 'change' },
             { required: this.detailsModel.secret_key.required, type: 'string', message: 'SecretKey(AppSecret) 值不能为空', trigger: 'blur' },
         ],
         region_id: [
-            { type: 'string', message: 'RegionId 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: 'RegionId 值必须为字符串类型', trigger: 'blur' },
             { required: this.detailsModel.region_id.required, type: 'string', message: 'RegionId 值不能为空', trigger: 'change' },
             { required: this.detailsModel.region_id.required, type: 'string', message: 'RegionId 值不能为空', trigger: 'blur' },
         ],
         access_token: [
-            { type: 'string', message: '管理账号token 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '管理账号token 值必须为字符串类型', trigger: 'blur' },
             { required: this.detailsModel.access_token.required, type: 'string', message: '管理账号token 值不能为空', trigger: 'change' },
             { required: this.detailsModel.access_token.required, type: 'string', message: '管理账号token 值不能为空', trigger: 'blur' },
         ],
         expires_time: [
-            { type: 'string', message: '管理账号token过期时间 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '管理账号token过期时间 值必须为字符串类型', trigger: 'blur' },
             { required: this.detailsModel.expires_time.required, type: 'string', message: '管理账号token过期时间 值不能为空', trigger: 'change' },
             { required: this.detailsModel.expires_time.required, type: 'string', message: '管理账号token过期时间 值不能为空', trigger: 'blur' },
         ],
         redirect_uri: [
-            { type: 'string', message: 'RedirectURI 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: 'RedirectURI 值必须为字符串类型', trigger: 'blur' },
             { required: this.detailsModel.redirect_uri.required, type: 'string', message: 'RedirectURI 值不能为空', trigger: 'change' },
             { required: this.detailsModel.redirect_uri.required, type: 'string', message: 'RedirectURI 值不能为空', trigger: 'blur' },
         ],
-        accessid: [
-            { type: 'string', message: '开放平台接入标识 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '开放平台接入标识 值必须为字符串类型', trigger: 'blur' },
-            { required: this.detailsModel.accessid.required, type: 'string', message: '开放平台接入标识 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.accessid.required, type: 'string', message: '开放平台接入标识 值不能为空', trigger: 'blur' },
-        ],
         }
     }
 
@@ -646,32 +582,38 @@ export default class MainBase extends Vue implements ControlInterface {
                 falg.isPast = val;
             }
         }
-        rule[name].forEach((item:any) => {
+        for(let i=0;i<rule[name].length;i++){
+            let item:any = rule[name][i];
             let dataValue = item.deName?this.data[this.service.getItemNameByDeName(item.deName)]:"";
             // 常规规则
             if(item.type == 'SIMPLE'){
                 startOp(!this.$verify.checkFieldSimpleRule(dataValue,item.condOP,item.paramValue,item.ruleInfo,item.paramType,this.data,item.isKeyCond));
                 falg.infoMessage = item.ruleInfo;
+                if(!falg.isPast) return falg;
             }
             // 数值范围
             if(item.type == 'VALUERANGE2'){
                 startOp( !this.$verify.checkFieldValueRangeRule(dataValue,item.minValue,item.isIncludeMinValue,item.maxValue,item.isIncludeMaxValue,item.ruleInfo,item.isKeyCond));
                 falg.infoMessage = item.ruleInfo;
+                if(!falg.isPast) return falg;
             }
             // 正则式
             if (item.type == "REGEX") {
                 startOp(!this.$verify.checkFieldRegExRule(dataValue,item.regExCode,item.ruleInfo,item.isKeyCond));
                 falg.infoMessage = item.ruleInfo;
+                if(!falg.isPast) return falg;
             }
             // 长度
             if (item.type == "STRINGLENGTH") {
                 startOp(!this.$verify.checkFieldStringLengthRule(dataValue,item.minValue,item.isIncludeMinValue,item.maxValue,item.isIncludeMaxValue,item.ruleInfo,item.isKeyCond)); 
                 falg.infoMessage = item.ruleInfo;
+                if(!falg.isPast) return falg;
             }
             // 系统值规则
             if(item.type == "SYSVALUERULE") {
                 startOp(!this.$verify.checkFieldSysValueRule(dataValue,item.sysRule.regExCode,item.ruleInfo,item.isKeyCond));
                 falg.infoMessage = item.ruleInfo;
+                if(!falg.isPast) return falg;
             }
             // 分组
             if(item.type == 'GROUP'){
@@ -679,9 +621,9 @@ export default class MainBase extends Vue implements ControlInterface {
                 if(item.isNotMode){
                    falg.isPast = !falg.isPast;
                 }
+                if(!falg.isPast) return falg;
+            }   
         }
-            
-        });
         if(!falg.hasOwnProperty("isPast")){
             falg.isPast = true;
         }
@@ -1355,12 +1297,12 @@ export default class MainBase extends Vue implements ControlInterface {
     /**
      * 部件刷新
      *
-     * @param {any[]} args
+     * @param {any} args
      * @memberof MainBase
      */
-    public refresh(args: any[]): void {
+    public refresh(args?: any): void {
         let arg: any = {};
-        Object.assign(arg,args[0]);
+        Object.assign(arg,args?args[0]:{});
         if (this.data.srfkey && !Object.is(this.data.srfkey, '')) {
             Object.assign(arg, { srfkey: this.data.srfkey });
             this.load(arg);

app_web/src/widgets/pay-open-access/main-form/main-form-service.ts

@@ -41,6 +41,14 @@ export default class MainService extends ControlService {
         this.model = new MainModel();
     }
 
+    /**
+     * 远端数据
+     *
+     * @type {*}
+     * @memberof MainService
+     */
+    private remoteCopyData:any = {};
+
     /**
      * 处理数据
      *
@@ -271,6 +279,7 @@ export default class MainService extends ControlService {
                 result = this.appEntityService.Get(Context,Data, isloading);
             }
             result.then((response) => {
+                this.setRemoteCopyData(response);
                 this.handleResponse(action, response);
                 resolve(response);
             }).catch(response => {
@@ -305,6 +314,7 @@ export default class MainService extends ControlService {
                 result = this.appEntityService.GetDraft(Context,Data, isloading);
             }
             result.then((response) => {
+                this.setRemoteCopyData(response);
                 response.data.id = PrimaryKey;
                 this.handleResponse(action, response, true);
                 resolve(response);
@@ -439,5 +449,24 @@ export default class MainService extends ControlService {
         return item;
     }
 
+    /**
+     * 设置远端数据
+     * 
+     * @param result 远端请求结果 
+     * @memberof MainService
+     */
+    public setRemoteCopyData(result:any){
+        if (result && result.status === 200) {
+            this.remoteCopyData = Util.deepCopy(result.data);
+        }
+    }
 
+    /**
+     * 获取远端数据
+     * 
+     * @memberof MainService
+     */
+    public getRemoteCopyData(){
+        return this.remoteCopyData;
+    }
 }
\ No newline at end of file

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

@@ -255,6 +255,7 @@ export default class MainBase extends Vue implements ControlInterface {
     }
 
 
+
     /**
      * 代码表服务对象
      *
@@ -568,10 +569,10 @@ export default class MainBase extends Vue implements ControlInterface {
     /**
      * 部件刷新
      *
-     * @param {any[]} args
+     * @param {any} args
      * @memberof MainBase
      */
-    public refresh(args: any[]): void {
+    public refresh(args?: any): void {
         this.load();
     }
 
@@ -797,7 +798,7 @@ export default class MainBase extends Vue implements ControlInterface {
             this.totalrow = response.total;
             this.items = JSON.parse(JSON.stringify(data));
             // 清空selections,gridItemsModel
-            this.selections = [];
+            //this.selections = [];
             this.gridItemsModel = [];
             this.items.forEach(()=>{this.gridItemsModel.push(this.getGridRowModel())});
             this.items.forEach((item:any)=>{
@@ -807,8 +808,18 @@ export default class MainBase extends Vue implements ControlInterface {
             // 设置默认选中
             let _this = this;
             setTimeout(() => {
+                //在导航视图中，如已有选中数据，则右侧展开已选中数据的视图，如无选中数据则默认选中第一条
                 if(_this.isSelectFirstDefault){
-                  _this.rowClick(_this.items[0]);
+                    if(_this.selections && _this.selections.length > 0){
+                        _this.selections.forEach((select: any)=>{
+                            const index = _this.items.findIndex((item:any) => Object.is(item.srfkey,select.srfkey));
+                            if(index != -1){
+                                _this.rowClick(_this.items[index]);
+                            }
+                        })
+                    }else{
+                        _this.rowClick(this.items[0]);
+                    }
                 }
                 if(_this.selectedData){
                     const refs: any = _this.$refs;
@@ -1936,6 +1947,33 @@ export default class MainBase extends Vue implements ControlInterface {
     public updateDefault(row: any){                    
     }
 
+    /**
+     * 计算数据对象类型的默认值
+     * @param {string}  action 行为
+     * @param {string}  param 默认值参数
+     * @param {*}  data 当前行数据
+     * @memberof MainBase
+     */
+    public computeDefaultValueWithParam(action:string,param:string,data:any){
+        if(Object.is(action,"UPDATE")){
+            const nativeData:any = this.service.getCopynativeData();
+            if(nativeData && (nativeData instanceof Array) && nativeData.length >0){
+                let targetData:any = nativeData.find((item:any) =>{
+                    return item.id === data.srfkey;
+                })
+                if(targetData){
+                    return targetData[param]?targetData[param]:null;
+                }else{
+                    return null;
+                }
+            }else{
+                return null;
+            }
+        }else{
+           return this.service.getRemoteCopyData()[param]?this.service.getRemoteCopyData()[param]:null;
+        }
+    }
+
     /**
      * 校验属性值规则
      *

app_web/src/widgets/pay-open-access/main-grid/main-grid-service.ts

@@ -47,7 +47,15 @@ export default class MainService extends ControlService {
      * @type {*}
      * @memberof MainService
      */
-    public copynativeData:any;
+    private copynativeData:any;
+
+    /**
+     * 远端数据
+     *
+     * @type {*}
+     * @memberof MainService
+     */
+    private remoteCopyData:any = {};
 
 
     /**
@@ -239,7 +247,7 @@ export default class MainService extends ControlService {
                 result =_appEntityService.FetchDefault(Context,Data, isloading);
             }
             result.then((response) => {
-                this.copynativeData = Util.deepCopy(response.data);
+                this.setCopynativeData(response.data);
                 this.handleResponse(action, response);
                 resolve(response);
             }).catch(response => {
@@ -277,6 +285,7 @@ export default class MainService extends ControlService {
                     //仿真主键数据
                     response.data.id = Util.createUUID();
                 }
+                this.setRemoteCopyData(response);
                 this.handleResponse(action, response, true);
                 resolve(response);
             }).catch(response => {
@@ -443,4 +452,43 @@ export default class MainService extends ControlService {
         });
     }
 
+    /**
+     * 设置远端数据
+     * 
+     * @param result 远端请求结果 
+     * @memberof MainService
+     */
+    public setRemoteCopyData(result:any){
+        if (result && result.status === 200) {
+            this.remoteCopyData = Util.deepCopy(result.data);
+        }
+    }
+
+    /**
+     * 获取远端数据
+     * 
+     * @memberof MainService
+     */
+    public getRemoteCopyData(){
+        return this.remoteCopyData;
+    }
+
+    /**
+     * 设置备份原生数据
+     * 
+     * @param data 远端请求结果 
+     * @memberof MainService
+     */
+    public setCopynativeData(data:any){
+        this.copynativeData = Util.deepCopy(data);
+    }
+
+    /**
+     * 获取备份原生数据
+     * 
+     * @memberof MainService
+     */
+    public getCopynativeData(){
+        return this.copynativeData;
+    }    
 }
\ No newline at end of file

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

@@ -151,6 +151,7 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro
 
 
 
+
     /**
      * 选中数据字符串
      *

app_web/src/widgets/pay-trade/default-searchform/default-searchform-base.vue

@@ -158,6 +158,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
     }
 
 
+
     /**
      * 获取多项数据
      *

app_web/src/widgets/pay-trade/default-searchform/default-searchform-service.ts

@@ -41,6 +41,14 @@ export default class DefaultService extends ControlService {
         this.model = new DefaultModel();
     }
 
+    /**
+     * 远端数据
+     *
+     * @type {*}
+     * @memberof DefaultService
+     */
+    private remoteCopyData:any = {};
+
     /**
      * 处理数据
      *
@@ -271,6 +279,7 @@ export default class DefaultService extends ControlService {
                 result = this.appEntityService.Get(Context,Data, isloading);
             }
             result.then((response) => {
+                this.setRemoteCopyData(response);
                 this.handleResponse(action, response);
                 resolve(response);
             }).catch(response => {
@@ -301,6 +310,7 @@ export default class DefaultService extends ControlService {
                 result = this.appEntityService.GetDraft(Context,Data, isloading);
             }
             result.then((response) => {
+                this.setRemoteCopyData(response);
                 this.handleResponse(action, response, true);
                 resolve(response);
             }).catch(response => {
@@ -434,5 +444,24 @@ export default class DefaultService extends ControlService {
         return item;
     }
 
+    /**
+     * 设置远端数据
+     * 
+     * @param result 远端请求结果 
+     * @memberof DefaultService
+     */
+    public setRemoteCopyData(result:any){
+        if (result && result.status === 200) {
+            this.remoteCopyData = Util.deepCopy(result.data);
+        }
+    }
 
+    /**
+     * 获取远端数据
+     * 
+     * @memberof DefaultService
+     */
+    public getRemoteCopyData(){
+        return this.remoteCopyData;
+    }
 }
\ No newline at end of file

app_web/src/widgets/pay-trade/main-form/main-form-base.vue

@@ -2,8 +2,7 @@
     <i-form :model="this.data" class='app-form' ref='form'  id='paytrade_main' style="">
     <input style="display:none;" />
     <row >
-            
-<i-col v-show="detailsModel.tradename.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+            <i-col v-show="detailsModel.tradename.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='tradename' :itemRules="this.rules().tradename" class='' :caption="$t('entities.paytrade.main_form.details.tradename')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.tradename.error" :isEmptyCaption="false" labelPos="LEFT">
     <input-box 
     v-model="data.tradename"  
@@ -71,6 +70,7 @@
   :localParam ='{ }' 
   :disabled="detailsModel.accessname.disabled"
   name='accessname'
+  
   deMajorField='name'
   deKeyField='payopenaccess'
   :service="service"
@@ -236,6 +236,7 @@ export default class MainBase extends Vue implements ControlInterface {
     }
 
 
+
     /**
      * 视图默认使用
      *
@@ -483,90 +484,26 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public rules() :any {
     return {
-        srforikey: [
-            { type: 'string', message: ' 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: ' 值必须为字符串类型', trigger: 'blur' },
-            { required: this.detailsModel.srforikey.required, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.srforikey.required, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfkey: [
-            { type: 'string', message: '交易标识 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '交易标识 值必须为字符串类型', trigger: 'blur' },
-            { required: this.detailsModel.srfkey.required, type: 'string', message: '交易标识 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.srfkey.required, type: 'string', message: '交易标识 值不能为空', trigger: 'blur' },
-        ],
-        srfmajortext: [
-            { type: 'string', message: '交易名称 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '交易名称 值必须为字符串类型', trigger: 'blur' },
-            { required: this.detailsModel.srfmajortext.required, type: 'string', message: '交易名称 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.srfmajortext.required, type: 'string', message: '交易名称 值不能为空', trigger: 'blur' },
-        ],
-        srftempmode: [
-            { type: 'string', message: ' 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: ' 值必须为字符串类型', trigger: 'blur' },
-            { required: this.detailsModel.srftempmode.required, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.srftempmode.required, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfuf: [
-            { type: 'string', message: ' 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: ' 值必须为字符串类型', trigger: 'blur' },
-            { required: this.detailsModel.srfuf.required, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.srfuf.required, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfdeid: [
-            { type: 'string', message: ' 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: ' 值必须为字符串类型', trigger: 'blur' },
-            { required: this.detailsModel.srfdeid.required, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.srfdeid.required, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
-        srfsourcekey: [
-            { type: 'string', message: ' 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: ' 值必须为字符串类型', trigger: 'blur' },
-            { required: this.detailsModel.srfsourcekey.required, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.srfsourcekey.required, type: 'string', message: ' 值不能为空', trigger: 'blur' },
-        ],
         tradename: [
-            { type: 'string', message: '交易名称 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '交易名称 值必须为字符串类型', trigger: 'blur' },
             { required: this.detailsModel.tradename.required, type: 'string', message: '交易名称 值不能为空', trigger: 'change' },
             { required: this.detailsModel.tradename.required, type: 'string', message: '交易名称 值不能为空', trigger: 'blur' },
         ],
         outtradeno: [
-            { type: 'string', message: '订单号 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '订单号 值必须为字符串类型', trigger: 'blur' },
             { required: this.detailsModel.outtradeno.required, type: 'string', message: '订单号 值不能为空', trigger: 'change' },
             { required: this.detailsModel.outtradeno.required, type: 'string', message: '订单号 值不能为空', trigger: 'blur' },
         ],
         subject: [
-            { type: 'string', message: '订单标题 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '订单标题 值必须为字符串类型', trigger: 'blur' },
             { required: this.detailsModel.subject.required, type: 'string', message: '订单标题 值不能为空', trigger: 'change' },
             { required: this.detailsModel.subject.required, type: 'string', message: '订单标题 值不能为空', trigger: 'blur' },
         ],
         totalamount: [
-            { type: 'string', message: '订单金额 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '订单金额 值必须为字符串类型', trigger: 'blur' },
             { required: this.detailsModel.totalamount.required, type: 'string', message: '订单金额 值不能为空', trigger: 'change' },
             { required: this.detailsModel.totalamount.required, type: 'string', message: '订单金额 值不能为空', trigger: 'blur' },
         ],
         accessname: [
-            { type: 'string', message: '支付平台 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '支付平台 值必须为字符串类型', trigger: 'blur' },
             { required: this.detailsModel.accessname.required, type: 'string', message: '支付平台 值不能为空', trigger: 'change' },
             { required: this.detailsModel.accessname.required, type: 'string', message: '支付平台 值不能为空', trigger: 'blur' },
         ],
-        tradeid: [
-            { type: 'string', message: '交易标识 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '交易标识 值必须为字符串类型', trigger: 'blur' },
-            { required: this.detailsModel.tradeid.required, type: 'string', message: '交易标识 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.tradeid.required, type: 'string', message: '交易标识 值不能为空', trigger: 'blur' },
-        ],
-        accessid: [
-            { type: 'string', message: '支付平台接入标识 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '支付平台接入标识 值必须为字符串类型', trigger: 'blur' },
-            { required: this.detailsModel.accessid.required, type: 'string', message: '支付平台接入标识 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.accessid.required, type: 'string', message: '支付平台接入标识 值不能为空', trigger: 'blur' },
-        ],
         }
     }
 
@@ -603,32 +540,38 @@ export default class MainBase extends Vue implements ControlInterface {
                 falg.isPast = val;
             }
         }
-        rule[name].forEach((item:any) => {
+        for(let i=0;i<rule[name].length;i++){
+            let item:any = rule[name][i];
             let dataValue = item.deName?this.data[this.service.getItemNameByDeName(item.deName)]:"";
             // 常规规则
             if(item.type == 'SIMPLE'){
                 startOp(!this.$verify.checkFieldSimpleRule(dataValue,item.condOP,item.paramValue,item.ruleInfo,item.paramType,this.data,item.isKeyCond));
                 falg.infoMessage = item.ruleInfo;
+                if(!falg.isPast) return falg;
             }
             // 数值范围
             if(item.type == 'VALUERANGE2'){
                 startOp( !this.$verify.checkFieldValueRangeRule(dataValue,item.minValue,item.isIncludeMinValue,item.maxValue,item.isIncludeMaxValue,item.ruleInfo,item.isKeyCond));
                 falg.infoMessage = item.ruleInfo;
+                if(!falg.isPast) return falg;
             }
             // 正则式
             if (item.type == "REGEX") {
                 startOp(!this.$verify.checkFieldRegExRule(dataValue,item.regExCode,item.ruleInfo,item.isKeyCond));
                 falg.infoMessage = item.ruleInfo;
+                if(!falg.isPast) return falg;
             }
             // 长度
             if (item.type == "STRINGLENGTH") {
                 startOp(!this.$verify.checkFieldStringLengthRule(dataValue,item.minValue,item.isIncludeMinValue,item.maxValue,item.isIncludeMaxValue,item.ruleInfo,item.isKeyCond)); 
                 falg.infoMessage = item.ruleInfo;
+                if(!falg.isPast) return falg;
             }
             // 系统值规则
             if(item.type == "SYSVALUERULE") {
                 startOp(!this.$verify.checkFieldSysValueRule(dataValue,item.sysRule.regExCode,item.ruleInfo,item.isKeyCond));
                 falg.infoMessage = item.ruleInfo;
+                if(!falg.isPast) return falg;
             }
             // 分组
             if(item.type == 'GROUP'){
@@ -636,9 +579,9 @@ export default class MainBase extends Vue implements ControlInterface {
                 if(item.isNotMode){
                    falg.isPast = !falg.isPast;
                 }
+                if(!falg.isPast) return falg;
+            }   
         }
-            
-        });
         if(!falg.hasOwnProperty("isPast")){
             falg.isPast = true;
         }
@@ -1282,12 +1225,12 @@ export default class MainBase extends Vue implements ControlInterface {
     /**
      * 部件刷新
      *
-     * @param {any[]} args
+     * @param {any} args
      * @memberof MainBase
      */
-    public refresh(args: any[]): void {
+    public refresh(args?: any): void {
         let arg: any = {};
-        Object.assign(arg,args[0]);
+        Object.assign(arg,args?args[0]:{});
         if (this.data.srfkey && !Object.is(this.data.srfkey, '')) {
             Object.assign(arg, { srfkey: this.data.srfkey });
             this.load(arg);

app_web/src/widgets/pay-trade/main-form/main-form-service.ts

@@ -50,6 +50,14 @@ export default class MainService extends ControlService {
      */
     public payopenaccessService: PayOpenAccessService = new PayOpenAccessService();
 
+    /**
+     * 远端数据
+     *
+     * @type {*}
+     * @memberof MainService
+     */
+    private remoteCopyData:any = {};
+
     /**
      * 处理数据
      *
@@ -283,6 +291,7 @@ export default class MainService extends ControlService {
                 result = this.appEntityService.Get(Context,Data, isloading);
             }
             result.then((response) => {
+                this.setRemoteCopyData(response);
                 this.handleResponse(action, response);
                 resolve(response);
             }).catch(response => {
@@ -317,6 +326,7 @@ export default class MainService extends ControlService {
                 result = this.appEntityService.GetDraft(Context,Data, isloading);
             }
             result.then((response) => {
+                this.setRemoteCopyData(response);
                 response.data.trade_id = PrimaryKey;
                 this.handleResponse(action, response, true);
                 resolve(response);
@@ -451,5 +461,24 @@ export default class MainService extends ControlService {
         return item;
     }
 
+    /**
+     * 设置远端数据
+     * 
+     * @param result 远端请求结果 
+     * @memberof MainService
+     */
+    public setRemoteCopyData(result:any){
+        if (result && result.status === 200) {
+            this.remoteCopyData = Util.deepCopy(result.data);
+        }
+    }
 
+    /**
+     * 获取远端数据
+     * 
+     * @memberof MainService
+     */
+    public getRemoteCopyData(){
+        return this.remoteCopyData;
+    }
 }
\ No newline at end of file

app_web/src/widgets/pay-trade/main-grid/main-grid-base.vue

@@ -265,6 +265,7 @@ export default class MainBase extends Vue implements ControlInterface {
     }
 
 
+
     /**
      * 代码表服务对象
      *
@@ -592,10 +593,10 @@ export default class MainBase extends Vue implements ControlInterface {
     /**
      * 部件刷新
      *
-     * @param {any[]} args
+     * @param {any} args
      * @memberof MainBase
      */
-    public refresh(args: any[]): void {
+    public refresh(args?: any): void {
         this.load();
     }
 
@@ -829,7 +830,7 @@ export default class MainBase extends Vue implements ControlInterface {
             this.totalrow = response.total;
             this.items = JSON.parse(JSON.stringify(data));
             // 清空selections,gridItemsModel
-            this.selections = [];
+            //this.selections = [];
             this.gridItemsModel = [];
             this.items.forEach(()=>{this.gridItemsModel.push(this.getGridRowModel())});
             this.items.forEach((item:any)=>{
@@ -839,8 +840,18 @@ export default class MainBase extends Vue implements ControlInterface {
             // 设置默认选中
             let _this = this;
             setTimeout(() => {
+                //在导航视图中，如已有选中数据，则右侧展开已选中数据的视图，如无选中数据则默认选中第一条
                 if(_this.isSelectFirstDefault){
-                  _this.rowClick(_this.items[0]);
+                    if(_this.selections && _this.selections.length > 0){
+                        _this.selections.forEach((select: any)=>{
+                            const index = _this.items.findIndex((item:any) => Object.is(item.srfkey,select.srfkey));
+                            if(index != -1){
+                                _this.rowClick(_this.items[index]);
+                            }
+                        })
+                    }else{
+                        _this.rowClick(this.items[0]);
+                    }
                 }
                 if(_this.selectedData){
                     const refs: any = _this.$refs;
@@ -1961,6 +1972,33 @@ export default class MainBase extends Vue implements ControlInterface {
     public updateDefault(row: any){                    
     }
 
+    /**
+     * 计算数据对象类型的默认值
+     * @param {string}  action 行为
+     * @param {string}  param 默认值参数
+     * @param {*}  data 当前行数据
+     * @memberof MainBase
+     */
+    public computeDefaultValueWithParam(action:string,param:string,data:any){
+        if(Object.is(action,"UPDATE")){
+            const nativeData:any = this.service.getCopynativeData();
+            if(nativeData && (nativeData instanceof Array) && nativeData.length >0){
+                let targetData:any = nativeData.find((item:any) =>{
+                    return item.trade_id === data.srfkey;
+                })
+                if(targetData){
+                    return targetData[param]?targetData[param]:null;
+                }else{
+                    return null;
+                }
+            }else{
+                return null;
+            }
+        }else{
+           return this.service.getRemoteCopyData()[param]?this.service.getRemoteCopyData()[param]:null;
+        }
+    }
+
     /**
      * 校验属性值规则
      *

app_web/src/widgets/pay-trade/main-grid/main-grid-service.ts

@@ -47,7 +47,15 @@ export default class MainService extends ControlService {
      * @type {*}
      * @memberof MainService
      */
-    public copynativeData:any;
+    private copynativeData:any;
+
+    /**
+     * 远端数据
+     *
+     * @type {*}
+     * @memberof MainService
+     */
+    private remoteCopyData:any = {};
 
 
     /**
@@ -239,7 +247,7 @@ export default class MainService extends ControlService {
                 result =_appEntityService.FetchDefault(Context,Data, isloading);
             }
             result.then((response) => {
-                this.copynativeData = Util.deepCopy(response.data);
+                this.setCopynativeData(response.data);
                 this.handleResponse(action, response);
                 resolve(response);
             }).catch(response => {
@@ -277,6 +285,7 @@ export default class MainService extends ControlService {
                     //仿真主键数据
                     response.data.trade_id = Util.createUUID();
                 }
+                this.setRemoteCopyData(response);
                 this.handleResponse(action, response, true);
                 resolve(response);
             }).catch(response => {
@@ -443,4 +452,43 @@ export default class MainService extends ControlService {
         });
     }
 
+    /**
+     * 设置远端数据
+     * 
+     * @param result 远端请求结果 
+     * @memberof MainService
+     */
+    public setRemoteCopyData(result:any){
+        if (result && result.status === 200) {
+            this.remoteCopyData = Util.deepCopy(result.data);
+        }
+    }
+
+    /**
+     * 获取远端数据
+     * 
+     * @memberof MainService
+     */
+    public getRemoteCopyData(){
+        return this.remoteCopyData;
+    }
+
+    /**
+     * 设置备份原生数据
+     * 
+     * @param data 远端请求结果 
+     * @memberof MainService
+     */
+    public setCopynativeData(data:any){
+        this.copynativeData = Util.deepCopy(data);
+    }
+
+    /**
+     * 获取备份原生数据
+     * 
+     * @memberof MainService
+     */
+    public getCopynativeData(){
+        return this.copynativeData;
+    }    
 }
\ No newline at end of file

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

@@ -28,7 +28,7 @@ zuul:
       serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
       stripPrefix: false
     config:
-      path: /config/**
+      path: /configs/**
       serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
       stripPrefix: false
     oucore:

ibzpay-boot/src/main/resources/application-dev.yml

@@ -17,7 +17,7 @@ zuul:
         serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
         stripPrefix: false
       config:
-        path: /config/**
+        path: /configs/**
         serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
         stripPrefix: false
       oucore:

ibzpay-core/src/main/java/cn/ibizlab/core/pay/domain/PayOpenAccess.java

@@ -18,6 +18,7 @@ import cn.ibizlab.util.domain.EntityBase;
 import cn.ibizlab.util.annotation.DEField;
 import cn.ibizlab.util.enums.DEPredefinedFieldType;
 import cn.ibizlab.util.enums.DEFieldDefaultValueType;
+import cn.ibizlab.util.helper.DataObject;
 import java.io.Serializable;
 import lombok.*;
 import org.springframework.data.annotation.Transient;

ibzpay-core/src/main/java/cn/ibizlab/core/pay/domain/PayTrade.java

@@ -18,6 +18,7 @@ import cn.ibizlab.util.domain.EntityBase;
 import cn.ibizlab.util.annotation.DEField;
 import cn.ibizlab.util.enums.DEPredefinedFieldType;
 import cn.ibizlab.util.enums.DEFieldDefaultValueType;
+import cn.ibizlab.util.helper.DataObject;
 import java.io.Serializable;
 import lombok.*;
 import org.springframework.data.annotation.Transient;

ibzpay-core/src/main/java/cn/ibizlab/core/pay/service/impl/PayOpenAccessServiceImpl.java

@@ -193,6 +193,7 @@ public class PayOpenAccessServiceImpl extends ServiceImpl<PayOpenAccessMapper, P
 
 
 
+
 }
 
 

ibzpay-core/src/main/java/cn/ibizlab/core/pay/service/impl/PayTradeServiceImpl.java

@@ -189,9 +189,7 @@ public class PayTradeServiceImpl extends ServiceImpl<PayTradeMapper, PayTrade> i
         if(!ObjectUtils.isEmpty(et.getAccessId())){
             cn.ibizlab.core.pay.domain.PayOpenAccess openaccess=et.getOpenaccess();
             if(ObjectUtils.isEmpty(openaccess)){
-                cn.ibizlab.core.pay.domain.PayOpenAccess majorEntity=payopenaccessService.getById(et.getAccessId());
-                if(ObjectUtils.isEmpty(majorEntity))
-                    return;
+                cn.ibizlab.core.pay.domain.PayOpenAccess majorEntity=payopenaccessService.get(et.getAccessId());
                 et.setOpenaccess(majorEntity);
                 openaccess=majorEntity;
             }
@@ -229,6 +227,7 @@ public class PayTradeServiceImpl extends ServiceImpl<PayTradeMapper, PayTrade> i
 
 
 
+
 }
 
 

ibzpay-core/src/main/resources/liquibase/changelog/20200620200620_init_ibzcfg2.xml

+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.9.xsd">
+    <changeSet author="Think (generated)" id="1592547336292-1">
+        <preConditions onFail="MARK_RAN"  >
+            <not >
+                <tableExists tableName="IBZCFG" />
+            </not>
+        </preConditions>
+        <createTable remarks="配置" tableName="IBZCFG">
+            <column name="CFGID" remarks="配置标识" type="VARCHAR(100)">
+                <constraints primaryKey="true"/>
+            </column>
+            <column name="SYSTEMID" remarks="系统标识" type="VARCHAR(100)"/>
+            <column name="CFGTYPE" remarks="配置类型" type="VARCHAR(100)"/>
+            <column name="TARGETTYPE" remarks="引用对象" type="VARCHAR(100)"/>
+            <column name="USERID" remarks="用户标识" type="VARCHAR(100)"/>
+            <column name="CFG" remarks="配置" type="MEDIUMTEXT"/>
+            <column name="UPDATEDATE" remarks="更新时间" type="datetime"/>
+        </createTable>
+    </changeSet>
+</databaseChangeLog>

ibzpay-core/src/main/resources/sysmodel/ibzpay.json

@@ -158,8 +158,8 @@
     {"name":"DER1N_PAY_TRADE_PAY_OPEN_ACCESS_ACCESSID",
      "relation_type":"DER1N",
      "code_name":"OpenAccess",
-     "entity_name":"PAY_OPEN_ACCESS",
-     "ref_entity_name":"PAY_TRADE"
+     "entity_name":"PAY_TRADE",
+     "ref_entity_name":"PAY_OPEN_ACCESS"
     }
     ],
     "parentEntitys":[
@@ -327,8 +327,8 @@
     {"name":"DER1N_PAY_TRADE_PAY_OPEN_ACCESS_ACCESSID",
      "relation_type":"DER1N",
      "code_name":"OpenAccess",
-     "entity_name":"PAY_OPEN_ACCESS",
-     "ref_entity_name":"PAY_TRADE"
+     "entity_name":"PAY_TRADE",
+     "ref_entity_name":"PAY_OPEN_ACCESS"
     }
     ]
  }

ibzpay-provider/ibzpay-provider-api/src/main/java/cn/ibizlab/api/dto/PayOpenAccessDTO.java

@@ -11,6 +11,8 @@ import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.alibaba.fastjson.annotation.JSONField;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;

ibzpay-provider/ibzpay-provider-api/src/main/java/cn/ibizlab/api/dto/PayTradeDTO.java

@@ -11,6 +11,8 @@ import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.alibaba.fastjson.annotation.JSONField;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;

ibzpay-provider/ibzpay-provider-api/src/main/java/cn/ibizlab/api/rest/PayOpenAccessResource.java

@@ -156,5 +156,7 @@ public class PayOpenAccessResource {
 	    return ResponseEntity.status(HttpStatus.OK)
                 .body(new PageImpl(payopenaccessMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
 	}
+
+
 }
 

ibzpay-provider/ibzpay-provider-api/src/main/java/cn/ibizlab/api/rest/PayTradeResource.java

@@ -156,5 +156,7 @@ public class PayTradeResource {
 	    return ResponseEntity.status(HttpStatus.OK)
                 .body(new PageImpl(paytradeMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
 	}
+
+
 }
 

ibzpay-util/src/main/java/cn/ibizlab/util/aspect/AuditAspect.java

@@ -54,6 +54,7 @@ public class AuditAspect
             return;
 
         Object serviceParam =args[0];
+        if(serviceParam instanceof EntityBase){
             EntityBase entity=(EntityBase)serviceParam;//创建数据
             Map<String, Audit> auditFields= DEFieldCacheMap.getAuditFields(entity.getClass());
             if(auditFields.size()==0)//是否有审计属性
@@ -66,7 +67,7 @@ public class AuditAspect
             }
             //记录审计日志
             dataAuditService.createAudit(request,entity,idValue,auditFields);
-        return;
+        }
     }
 
     /**
@@ -88,6 +89,7 @@ public class AuditAspect
             return point.proceed();
 
         Object arg=args[0];
+        if(arg instanceof EntityBase){
             EntityBase entity= (EntityBase) arg;
             Map<String, Audit> auditFields= DEFieldCacheMap.getAuditFields(entity.getClass());
 
@@ -110,6 +112,8 @@ public class AuditAspect
             dataAuditService.updateAudit(request,beforeEntity,serviceObj,idValue,auditFields);
             return true;
         }
+        return point.proceed();
+    }
 
     /**
      * 实体数据更新切面，在成功更新数据后将新增数据内容记录审计日志内（审计明细【AuditInfo】中只记录审计属性变化情况，审计属性在平台属性中配置）

ibzpay-util/src/main/java/cn/ibizlab/util/cache/cache/LayeringCache.java

@@ -11,6 +11,7 @@ import java.util.Map;
 import java.util.concurrent.Callable;
 import cn.ibizlab.util.cache.listener.RedisPublisher;
 import cn.ibizlab.util.enums.RedisChannelTopic;
+import org.springframework.util.ObjectUtils;
 
 /**
  * 缓存分层类
@@ -58,11 +59,16 @@ public class LayeringCache extends AbstractValueAdaptingCache {
     @Override
     public ValueWrapper get(Object key) {
         ValueWrapper wrapper = caffeineCache.get(key);
-        log.debug("查询一级缓存 key:{}，value:{}", key,wrapper);
-        if (wrapper == null) {
+        Object value=ObjectUtils.isEmpty(wrapper)?null:wrapper.get();
+        log.debug("查询一级缓存 key:{} ，value:{}", key,value);
+        if (ObjectUtils.isEmpty(value)) {
             wrapper = redisCache.get(key);
-            caffeineCache.put(key, wrapper == null ? null : wrapper.get());
-            log.debug("查询二级缓存,并将数据放到一级缓存。 key:{}", key);
+            value=ObjectUtils.isEmpty(wrapper)?null:wrapper.get();
+            log.debug("查询二级缓存 key:{} ，value:{}", key,value);
+            if(!ObjectUtils.isEmpty(value)){
+                caffeineCache.put(key, value);
+                log.debug("查询二级缓存，并将数据放到一级缓存。 key:{} ，value:{}", key,value);
+            }
         }
         return wrapper;
     }

ibzpay-util/src/main/java/cn/ibizlab/util/filter/SearchContextBase.java

@@ -67,7 +67,6 @@ public class SearchContextBase implements ISearchContext{
      * 工作流流程标识
      */
     public String processDefinitionKey;
-
     /**
      * 获取工作流步骤标识
      */

ibzpay-util/src/main/java/cn/ibizlab/util/service/SimpleFileService.java

@@ -38,7 +38,7 @@ public class SimpleFileService implements FileService {
             FileCopyUtils.copy(multipartFile.getInputStream(),Files.newOutputStream(file.toPath()));
             item=new FileItem(fileid,fileName,fileid,fileName,(int)multipartFile.getSize(),extname);
         } catch (IOException e) {
-            throw new InternalServerErrorException("文件上传失败");
+            throw new InternalServerErrorException("文件上传失败，"+e);
         }
         return item;
     }

ibzpay-util/src/main/resources/application-sys.yml

-
 #缓存、数据源
 spring:
   cache: