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/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/dict/app-index-view/app-index-view-base.vue

@@ -262,6 +262,23 @@ export default class AppIndexViewBase extends Vue {
     */
     public serviceStateEvent: Subscription | undefined;
 
+    /**
+     * 门户部件状态对象
+     *
+     * @type {*}
+     * @memberof AppIndexViewBase
+     */
+    @Prop() public portletState?: any;
+
+   /**
+   * 门户部件状态事件
+   *
+   * @public
+   * @type {(Subscription | undefined)}
+   * @memberof AppIndexViewBase
+   */
+    public portletStateEvent: Subscription | undefined;
+
     /**
      * 应用上下文
      *
@@ -470,6 +487,16 @@ export default class AppIndexViewBase 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/dict/dict-catalog-pickup-grid-view/dict-catalog-pickup-grid-view-base.vue

@@ -2,6 +2,8 @@
 <div class='view-container depickupgridview dict-catalog-pickup-grid-view'>
     <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="dictcatalogpickupgridview"></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 DictCatalogPickupGridViewBase extends Vue {
         view_searchform: { name: 'searchform', type: 'SEARCHFORM' },
     };
 
+    /**
+     * 视图刷新
+     *
+     * @param {*} args
+     * @memberof DictCatalogPickupGridViewBase
+     */
+    public refresh(args?: any): void {
+        const refs: any = this.$refs;
+        if (refs && refs.grid) {
+            refs.grid.refresh();
+        }
+    }
     /**
      *  计数器刷新
      *
@@ -285,6 +301,23 @@ export default class DictCatalogPickupGridViewBase extends Vue {
     */
     public serviceStateEvent: Subscription | undefined;
 
+    /**
+     * 门户部件状态对象
+     *
+     * @type {*}
+     * @memberof DictCatalogPickupGridViewBase
+     */
+    @Prop() public portletState?: any;
+
+   /**
+   * 门户部件状态事件
+   *
+   * @public
+   * @type {(Subscription | undefined)}
+   * @memberof DictCatalogPickupGridViewBase
+   */
+    public portletStateEvent: Subscription | undefined;
+
     /**
      * 应用上下文
      *
@@ -498,6 +531,16 @@ export default class DictCatalogPickupGridViewBase 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 DictCatalogPickupGridViewBase extends Vue {
                 }
             })
         }
+        if(this.portletStateEvent){
+            this.portletStateEvent.unsubscribe();
+        }
     }
     /**
      * 选中数据字符串

app_web/src/pages/dict/dict-catalog-pickup-view/dict-catalog-pickup-view-base.vue

@@ -2,7 +2,11 @@
 <div class="view-container depickupview dict-catalog-pickup-view">
     <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="dictcatalogpickupview"></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 DictCatalogPickupViewBase extends Vue {
     */
     public serviceStateEvent: Subscription | undefined;
 
+    /**
+     * 门户部件状态对象
+     *
+     * @type {*}
+     * @memberof DictCatalogPickupViewBase
+     */
+    @Prop() public portletState?: any;
+
+   /**
+   * 门户部件状态事件
+   *
+   * @public
+   * @type {(Subscription | undefined)}
+   * @memberof DictCatalogPickupViewBase
+   */
+    public portletStateEvent: Subscription | undefined;
+
     /**
      * 应用上下文
      *
@@ -491,6 +514,16 @@ export default class DictCatalogPickupViewBase 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 DictCatalogPickupViewBase extends Vue {
                 }
             })
         }
+        if(this.portletStateEvent){
+            this.portletStateEvent.unsubscribe();
+        }
     }
     /**
      * 选中数据的字符串

app_web/src/pages/dict/dict-option-edit-view/dict-option-edit-view-base.vue

@@ -23,9 +23,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" 
@@ -48,8 +50,8 @@
             @load="form_load($event)"  
             @closeview="closeView($event)">
         </view_form>
-        <div class='view-bottom-messages'>
         </div>
+        <div class='view-bottom-messages'>
         </div>
     </card>
 </div>
@@ -226,6 +228,18 @@ export default class DictOptionEditViewBase extends Vue {
         view_form: { name: 'form', type: 'FORM' },
     };
 
+    /**
+     * 视图刷新
+     *
+     * @param {*} args
+     * @memberof DictOptionEditViewBase
+     */
+    public refresh(args?: any): void {
+        const refs: any = this.$refs;
+        if (refs && refs.form) {
+            refs.form.refresh();
+        }
+    }
     /**
      *  计数器刷新
      *
@@ -257,9 +271,9 @@ export default class DictOptionEditViewBase extends Vue {
      * @memberof DictOptionEditView
      */
     public toolBarModels: any = {
-        tbitem1: { name: 'tbitem1', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+        tbitem1: { name: 'tbitem1', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
 
-        tbitem2: { name: 'tbitem2', caption: '关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Exit', target: '' } },
+        tbitem2: { name: 'tbitem2', actiontarget: 'NONE', caption: '关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Exit', target: '' } },
 
     };
 
@@ -309,6 +323,23 @@ export default class DictOptionEditViewBase extends Vue {
     */
     public serviceStateEvent: Subscription | undefined;
 
+    /**
+     * 门户部件状态对象
+     *
+     * @type {*}
+     * @memberof DictOptionEditViewBase
+     */
+    @Prop() public portletState?: any;
+
+   /**
+   * 门户部件状态事件
+   *
+   * @public
+   * @type {(Subscription | undefined)}
+   * @memberof DictOptionEditViewBase
+   */
+    public portletStateEvent: Subscription | undefined;
+
     /**
      * 应用上下文
      *
@@ -522,6 +553,16 @@ export default class DictOptionEditViewBase 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();
+                }
+            })
+        }
         
     }
 
@@ -775,6 +816,9 @@ export default class DictOptionEditViewBase 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/dict-catalog/dict-catalog-ui-service-base.ts

@@ -89,10 +89,10 @@ export default class DictCatalogUIServiceBase extends UIService {
      * @memberof  DictCatalogUIServiceBase
      */  
     public initViewMap(){
-        this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'dictcatalogs'});
-        this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'dictcatalogs'});
-        this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'dictcatalogs'});
-        this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'dictcatalogs'});
+        this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'dictcatalogs',component:'dict-catalog-grid-view'});
+        this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'dictcatalogs',component:'dict-catalog-pickup-grid-view'});
+        this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'dictcatalogs',component:'dict-catalog-pickup-view'});
+        this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'dictcatalogs',component:'dict-catalog-edit-view'});
     }
 
     /**
@@ -201,17 +201,17 @@ export default class DictCatalogUIServiceBase 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/dict-option/dict-option-ui-service-base.ts

@@ -89,9 +89,9 @@ export default class DictOptionUIServiceBase extends UIService {
      * @memberof  DictOptionUIServiceBase
      */  
     public initViewMap(){
-        this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'dictoptions'});
-        this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'dictoptions'});
-        this.allViewMap.set(':',{viewname:'grideditview',srfappde:'dictoptions'});
+        this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'dictoptions',component:'dict-option-edit-view'});
+        this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'dictoptions',component:'dict-option-grid-view'});
+        this.allViewMap.set(':',{viewname:'grideditview',srfappde:'dictoptions',component:'dict-option-grid-edit-view'});
     }
 
     /**
@@ -200,17 +200,17 @@ export default class DictOptionUIServiceBase 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/app-index-view-appmenu/app-index-view-appmenu-base.vue

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

app_web/src/widgets/dict-catalog/default-searchform/default-searchform-base.vue

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

app_web/src/widgets/dict-catalog/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/dict-catalog/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/dict-catalog/main-grid/main-grid-base.vue

@@ -265,6 +265,7 @@ export default class MainBase extends Vue implements ControlInterface {
     }
 
 
+
     /**
      * 代码表服务对象
      *
@@ -578,10 +579,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();
     }
 
@@ -815,7 +816,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)=>{
@@ -825,8 +826,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;
@@ -1947,6 +1958,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/dict-catalog/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/dict-catalog/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-base.vue

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

app_web/src/widgets/dict-option/default-searchform/default-searchform-base.vue

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

app_web/src/widgets/dict-option/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/dict-option/main-form/main-form-service.ts

@@ -50,6 +50,14 @@ export default class MainService extends ControlService {
      */
     public dictcatalogService: DictCatalogService = new DictCatalogService();
 
+    /**
+     * 远端数据
+     *
+     * @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.value_key = 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/dict-option/main-grid/main-grid-base.vue

@@ -181,6 +181,7 @@
               :localParam ='{ }' 
               :disabled="row.srfuf === 1 ? (3 & 2) !== 2 : (3 & 1) !== 1" 
               name='cname'
+              
               deMajorField='name'
               deKeyField='dictcatalog'
               :service="service"
@@ -577,6 +578,7 @@ export default class MainBase extends Vue implements ControlInterface {
     }
 
 
+
     /**
      * 代码表服务对象
      *
@@ -904,10 +906,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();
     }
 
@@ -1265,7 +1267,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)=>{
@@ -1275,8 +1277,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;
@@ -2421,6 +2433,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.value_key === 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/dict-option/main-grid/main-grid-service.ts

@@ -48,7 +48,15 @@ export default class MainService extends ControlService {
      * @type {*}
      * @memberof MainService
      */
-    public copynativeData:any;
+    private copynativeData:any;
+
+    /**
+     * 远端数据
+     *
+     * @type {*}
+     * @memberof MainService
+     */
+    private remoteCopyData:any = {};
 
 
     /**
@@ -251,7 +259,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 => {
@@ -289,6 +297,7 @@ export default class MainService extends ControlService {
                     //仿真主键数据
                     response.data.value_key = Util.createUUID();
                 }
+                this.setRemoteCopyData(response);
                 this.handleResponse(action, response, true);
                 resolve(response);
             }).catch(response => {
@@ -455,4 +464,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/dict-option/options-grid/options-grid-base.vue

@@ -181,6 +181,7 @@
               :localParam ='{ }' 
               :disabled="row.srfuf === 1 ? (3 & 2) !== 2 : (3 & 1) !== 1" 
               name='cname'
+              
               deMajorField='name'
               deKeyField='dictcatalog'
               :service="service"
@@ -565,6 +566,7 @@ export default class OptionsBase extends Vue implements ControlInterface {
     }
 
 
+
     /**
      * 代码表服务对象
      *
@@ -892,10 +894,10 @@ export default class OptionsBase extends Vue implements ControlInterface {
     /**
      * 部件刷新
      *
-     * @param {any[]} args
+     * @param {any} args
      * @memberof OptionsBase
      */
-    public refresh(args: any[]): void {
+    public refresh(args?: any): void {
         this.load();
     }
 
@@ -1245,7 +1247,7 @@ export default class OptionsBase 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)=>{
@@ -1255,8 +1257,18 @@ export default class OptionsBase 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;
@@ -2400,6 +2412,33 @@ export default class OptionsBase extends Vue implements ControlInterface {
     public updateDefault(row: any){                    
     }
 
+    /**
+     * 计算数据对象类型的默认值
+     * @param {string}  action 行为
+     * @param {string}  param 默认值参数
+     * @param {*}  data 当前行数据
+     * @memberof OptionsBase
+     */
+    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.value_key === 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/dict-option/options-grid/options-grid-service.ts

@@ -48,7 +48,15 @@ export default class OptionsService extends ControlService {
      * @type {*}
      * @memberof OptionsService
      */
-    public copynativeData:any;
+    private copynativeData:any;
+
+    /**
+     * 远端数据
+     *
+     * @type {*}
+     * @memberof OptionsService
+     */
+    private remoteCopyData:any = {};
 
 
     /**
@@ -251,7 +259,7 @@ export default class OptionsService 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 => {
@@ -289,6 +297,7 @@ export default class OptionsService extends ControlService {
                     //仿真主键数据
                     response.data.value_key = Util.createUUID();
                 }
+                this.setRemoteCopyData(response);
                 this.handleResponse(action, response, true);
                 resolve(response);
             }).catch(response => {
@@ -455,4 +464,43 @@ export default class OptionsService extends ControlService {
         });
     }
 
+    /**
+     * 设置远端数据
+     * 
+     * @param result 远端请求结果 
+     * @memberof OptionsService
+     */
+    public setRemoteCopyData(result:any){
+        if (result && result.status === 200) {
+            this.remoteCopyData = Util.deepCopy(result.data);
+        }
+    }
+
+    /**
+     * 获取远端数据
+     * 
+     * @memberof OptionsService
+     */
+    public getRemoteCopyData(){
+        return this.remoteCopyData;
+    }
+
+    /**
+     * 设置备份原生数据
+     * 
+     * @param data 远端请求结果 
+     * @memberof OptionsService
+     */
+    public setCopynativeData(data:any){
+        this.copynativeData = Util.deepCopy(data);
+    }
+
+    /**
+     * 获取备份原生数据
+     * 
+     * @memberof OptionsService
+     */
+    public getCopynativeData(){
+        return this.copynativeData;
+    }    
 }
\ No newline at end of file

ibzdict-app/ibzdict-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:

ibzdict-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:

ibzdict-core/src/main/java/cn/ibizlab/core/dict/domain/DictCatalog.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;

ibzdict-core/src/main/java/cn/ibizlab/core/dict/domain/DictOption.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;

ibzdict-core/src/main/java/cn/ibizlab/core/dict/service/impl/DictCatalogServiceImpl.java

@@ -193,6 +193,7 @@ public class DictCatalogServiceImpl extends ServiceImpl<DictCatalogMapper, DictC
 
 
 
+
 }
 
 

ibzdict-core/src/main/java/cn/ibizlab/core/dict/service/impl/DictOptionServiceImpl.java

@@ -189,9 +189,7 @@ public class DictOptionServiceImpl extends ServiceImpl<DictOptionMapper, DictOpt
         if(!ObjectUtils.isEmpty(et.getCatalogId())){
             cn.ibizlab.core.dict.domain.DictCatalog catalog=et.getCatalog();
             if(ObjectUtils.isEmpty(catalog)){
-                cn.ibizlab.core.dict.domain.DictCatalog majorEntity=dictcatalogService.getById(et.getCatalogId());
-                if(ObjectUtils.isEmpty(majorEntity))
-                    return;
+                cn.ibizlab.core.dict.domain.DictCatalog majorEntity=dictcatalogService.get(et.getCatalogId());
                 et.setCatalog(majorEntity);
                 catalog=majorEntity;
             }
@@ -228,6 +226,7 @@ public class DictOptionServiceImpl extends ServiceImpl<DictOptionMapper, DictOpt
 
 
 
+
 }
 
 

ibzdict-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>

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

@@ -106,8 +106,8 @@
     {"name":"DER1N_DICT_OPTION_DICT_CATALOG_CID",
      "relation_type":"DER1N",
      "code_name":"Catalog",
-     "entity_name":"DICT_CATALOG",
-     "ref_entity_name":"DICT_OPTION"
+     "entity_name":"DICT_OPTION",
+     "ref_entity_name":"DICT_CATALOG"
     }
     ],
     "parentEntitys":[
@@ -320,8 +320,8 @@
     {"name":"DER1N_DICT_OPTION_DICT_CATALOG_CID",
      "relation_type":"DER1N",
      "code_name":"Catalog",
-     "entity_name":"DICT_CATALOG",
-     "ref_entity_name":"DICT_OPTION"
+     "entity_name":"DICT_OPTION",
+     "ref_entity_name":"DICT_CATALOG"
     }
     ]
  }

ibzdict-provider/ibzdict-provider-api/src/main/java/cn/ibizlab/api/dto/DictCatalogDTO.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;

ibzdict-provider/ibzdict-provider-api/src/main/java/cn/ibizlab/api/dto/DictOptionDTO.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;

ibzdict-provider/ibzdict-provider-api/src/main/java/cn/ibizlab/api/rest/DictCatalogResource.java

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

ibzdict-provider/ibzdict-provider-api/src/main/java/cn/ibizlab/api/rest/DictOptionResource.java

@@ -157,6 +157,8 @@ public class DictOptionResource {
 	    return ResponseEntity.status(HttpStatus.OK)
                 .body(new PageImpl(dictoptionMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
 	}
+
+
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Create-all')")
     @ApiOperation(value = "根据字典建立字典项", tags = {"字典项" },  notes = "根据字典建立字典项")
 	@RequestMapping(method = RequestMethod.POST, value = "/dictcatalogs/{dictcatalog_id}/dictoptions")

ibzdict-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】中只记录审计属性变化情况，审计属性在平台属性中配置）

ibzdict-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;
     }

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

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

ibzdict-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;
     }

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

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