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

app_Web/CHANGELOG.md

+## v7.0.0-alpha.13 [2020-7-12]
+
+### Bug修复
+
+修复表格设置更新默认值不生效
+
+修复行编辑中文本字段修改数据保存无法生效
+
+修复行编辑时的错误提示
+
+修复表格开关部件保存异常问题
+
+修复表单可以修改数据主键问题
+
+修复表格操作列问题
+
+#### 基础文件
+
+优化关系界面逻辑
+
 ## v7.0.0-alpha.12 [2020-7-2]
 
 ### Bug修复
@@ -14,6 +34,14 @@
 
 修复多行输入十行 高度问题
 
+修复调整实体处理逻辑（参数name转化为codeName）
+
+修复表单项更新值规则校验
+
+修复单位部门选择器禁用功能
+
+修复修复去掉某个子菜单后，主菜单不显示
+
 ### 功能新增及优化
 
 #### 模板
@@ -24,14 +52,28 @@
 
 新增状态向导面板（658）
 
-优化门户操作栏
+新增门户操作栏图标（654）
+
+新增首页空白模式支持
+
+新增表格支持列拖动
 
-优化应用级数据状态同步功能
+新增主状态操作标识权限逻辑
+
+新增工具栏、表格操作列、表单分组主状态操作标识判断
+
+优化应用级数据状态同步功能（654）
+
+优化应用国际化部分
 
 #### 基础文件
 
 新增修改密码功能（654）
 
+优化无权限错误信息友好提示
+
+优化应用国际化部分
+
 ## v7.0.0-alpha.11 [2020-6-21]
 
 ### Bug修复

app_Web/package.json

@@ -20,6 +20,7 @@
     "@fullcalendar/vue": "^4.4.0",
     "vuedraggable": "^2.23.2",
     "async-validator": "^3.3.0",
+    "@popperjs/core": "^2.4.3",
     "axios": "^0.19.1",
     "core-js": "^3.4.4",
     "echarts": "^4.6.0",

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

@@ -161,6 +161,7 @@ export default class Breadcrumb extends Vue {
       if(item && item.meta && item.meta.viewType && Object.is(item.meta.viewType,"APPINDEX")){
         let path: string | null = window.sessionStorage.getItem(Environment.AppName);
         if (path) {
+          this.$store.commit("removeAllPage");
           this.$router.push({ path: path });
         } else {
           this.$router.push("/");

app_Web/src/components/app-form-druipart/app-form-druipart.vue

@@ -271,6 +271,7 @@ export default class AppFormDRUIPart extends Vue {
         //设置顶层视图唯一标识
         Object.assign(tempContext,this.context);
         Object.assign(tempContext,{srfparentdename:this.parentName,srfparentkey:_paramitem});
+        Object.assign(tempParam,{srfparentdename:this.parentName,srfparentkey:_paramitem});
         // 设置局部上下文
         if(this.localContext && Object.keys(this.localContext).length >0){
             let _context:any = this.$util.computedNavData(formData,tempContext,this.viewparams,this.localContext);
@@ -292,9 +293,9 @@ export default class AppFormDRUIPart extends Vue {
             }
         }
         if(!this.isForbidLoad){
-            this.$nextTick(() => {
+            setTimeout(() => {
                 this.formDruipart.next({action:'load',data:{srfparentdename:this.parentName,srfparentkey:_paramitem}});
-            });
+            }, 0);
         }
     }
 

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

@@ -242,7 +242,7 @@ export default class AppPicker extends Vue {
      * @param {*} oldVal
      * @memberof AppPicker
      */
-    @Watch('value')
+    @Watch('value',{immediate:true})
     public onValueChange(newVal: any, oldVal: any) {
         this.curvalue = newVal;
         if (Object.is(this.editortype, 'dropdown') && this.valueitem) {

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

@@ -6,7 +6,7 @@
 
 <script lang="ts">
 import { Vue, Component, Prop, Watch, Model } from 'vue-property-decorator';
-
+import moment from "moment"; 
 @Component({})
 export default class AppSpan extends Vue {
 
@@ -18,6 +18,38 @@ export default class AppSpan extends Vue {
      */
     @Prop() public value?: any;
 
+    /**
+     * 数据类型
+     * 
+     * @type {string}
+     * @memberof AppSpan
+     */
+    @Prop() public dataType?: string;
+
+    /**
+     * 单位名称
+     * 
+     * @type {string}
+     * @memberof AppSpan
+     */
+    @Prop() public unitName?: string;
+
+    /**
+     * 精度
+     *
+     * @type {string}
+     * @memberof AppFormatData
+     */
+    @Prop({default:'2'}) public precision?:string;
+
+    /**
+     * 日期值格式化
+     * 
+     * @type {string}
+     * @memberof AppSpan
+     */
+    @Prop() public valueFormat?: string;
+
     /**
      * 当前表单项名称
      * 
@@ -158,12 +190,51 @@ export default class AppSpan extends Vue {
         }else{
             if(this.$util.isEmpty(this.value)){
                 this.text = '';
+            }else if(this.dataType){
+                this.currencyFormat();
+            }else if(this.valueFormat){
+                this.dateFormat();
             }else{
                 this.text = this.value;
             }
+                
+        }
+    }
+
+    /**
+     * 货币格式化
+     * 
+     * @memberof AppSpan
+     */
+    public currencyFormat(){
+        let number:any = Number(this.value);
+        let _unitName = this.unitName?this.unitName:'';
+        let _precision = Number(this.precision);
+        if(Object.is(this.dataType,"CURRENCY")){     
+            this.text = Number(number.toFixed(_precision)).toLocaleString('en-US')+ ' '+ _unitName;   
+        }else if(Object.is(this.dataType,"FLOAT") || Object.is(this.dataType,"DECIMAL")){
+            this.text = number.toFixed(_precision);
+        }else {
+            this.text = this.value;
         }
     }
 
+    /**
+     * 日期格式化
+     * 
+     * @memberof AppSpan
+     */
+    public dateFormat(){
+        if(this.valueFormat){
+            if(this.valueFormat.indexOf('%1$t') !== -1){
+                this.text= moment(this.data).format("YYYY-MM-DD HH:mm:ss");
+            }else if(this.valueFormat.indexOf('%1$s') == -1){
+                this.text= moment(this.data).format(this.valueFormat);
+            }else{
+                this.text= this.value;
+            }
+        }
+    }    
 }
 </script>
 

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

@@ -661,6 +661,7 @@ export default class DictCatalogPickupViewBase extends Vue {
      * @memberof DictCatalogPickupViewBase
      */
     public onClickCancel(): void {
+        this.$emit('viewdataschange', null);
         this.$emit('close', null);
     }
 

app_Web/src/pages/ou/ibzdepartment-mpickup-view/ibzdepartment-mpickup-view-base.vue

@@ -826,6 +826,7 @@ export default class IBZDepartmentMPickupViewBase extends Vue {
      * @memberof IBZDepartmentMPickupViewBase
      */
     public onClickCancel(): void {
+        this.$emit('viewdataschange', null);
         this.$emit('close', null);
     }
 

app_Web/src/pages/ou/ibzdepartment-pickup-view/ibzdepartment-pickup-view-base.vue

@@ -661,6 +661,7 @@ export default class IBZDepartmentPickupViewBase extends Vue {
      * @memberof IBZDepartmentPickupViewBase
      */
     public onClickCancel(): void {
+        this.$emit('viewdataschange', null);
         this.$emit('close', null);
     }
 

app_Web/src/pages/ou/ibzemployee-mpickup-view/ibzemployee-mpickup-view-base.vue

@@ -826,6 +826,7 @@ export default class IBZEmployeeMPickupViewBase extends Vue {
      * @memberof IBZEmployeeMPickupViewBase
      */
     public onClickCancel(): void {
+        this.$emit('viewdataschange', null);
         this.$emit('close', null);
     }
 

app_Web/src/pages/ou/ibzemployee-pickup-view/ibzemployee-pickup-view-base.vue

@@ -661,6 +661,7 @@ export default class IBZEmployeePickupViewBase extends Vue {
      * @memberof IBZEmployeePickupViewBase
      */
     public onClickCancel(): void {
+        this.$emit('viewdataschange', null);
         this.$emit('close', null);
     }
 

app_Web/src/pages/ou/ibzorganization-pickup-view/ibzorganization-pickup-view-base.vue

@@ -661,6 +661,7 @@ export default class IBZOrganizationPickupViewBase extends Vue {
      * @memberof IBZOrganizationPickupViewBase
      */
     public onClickCancel(): void {
+        this.$emit('viewdataschange', null);
         this.$emit('close', null);
     }
 

app_Web/src/pages/ou/ibzpost-pickup-view/ibzpost-pickup-view-base.vue

@@ -661,6 +661,7 @@ export default class IBZPostPickupViewBase extends Vue {
      * @memberof IBZPostPickupViewBase
      */
     public onClickCancel(): void {
+        this.$emit('viewdataschange', null);
         this.$emit('close', null);
     }
 

app_Web/src/pages/uaa/sys-permission-mpickup-view/sys-permission-mpickup-view-base.vue

@@ -826,6 +826,7 @@ export default class SysPermissionMPickupViewBase extends Vue {
      * @memberof SysPermissionMPickupViewBase
      */
     public onClickCancel(): void {
+        this.$emit('viewdataschange', null);
         this.$emit('close', null);
     }
 

app_Web/src/pages/uaa/sys-role-mpickup-view/sys-role-mpickup-view-base.vue

@@ -826,6 +826,7 @@ export default class SysRoleMPickupViewBase extends Vue {
      * @memberof SysRoleMPickupViewBase
      */
     public onClickCancel(): void {
+        this.$emit('viewdataschange', null);
         this.$emit('close', null);
     }
 

app_Web/src/pages/uaa/sys-role-pickup-view/sys-role-pickup-view-base.vue

@@ -661,6 +661,7 @@ export default class SysRolePickupViewBase extends Vue {
      * @memberof SysRolePickupViewBase
      */
     public onClickCancel(): void {
+        this.$emit('viewdataschange', null);
         this.$emit('close', null);
     }
 

app_Web/src/pages/uaa/sys-user-mpickup-view/sys-user-mpickup-view-base.vue

@@ -826,6 +826,7 @@ export default class SysUserMPickupViewBase extends Vue {
      * @memberof SysUserMPickupViewBase
      */
     public onClickCancel(): void {
+        this.$emit('viewdataschange', null);
         this.$emit('close', null);
     }
 

app_Web/src/pages/uaa/sys-user-pickup-view/sys-user-pickup-view-base.vue

@@ -661,6 +661,7 @@ export default class SysUserPickupViewBase extends Vue {
      * @memberof SysUserPickupViewBase
      */
     public onClickCancel(): void {
+        this.$emit('viewdataschange', null);
         this.$emit('close', null);
     }
 

app_Web/src/pages/workflow/wfgroup-mpickup-view/wfgroup-mpickup-view-base.vue

@@ -826,6 +826,7 @@ export default class WFGroupMPickupViewBase extends Vue {
      * @memberof WFGroupMPickupViewBase
      */
     public onClickCancel(): void {
+        this.$emit('viewdataschange', null);
         this.$emit('close', null);
     }
 

app_Web/src/pages/workflow/wfgroup-pickup-view/wfgroup-pickup-view-base.vue

@@ -661,6 +661,7 @@ export default class WFGroupPickupViewBase extends Vue {
      * @memberof WFGroupPickupViewBase
      */
     public onClickCancel(): void {
+        this.$emit('viewdataschange', null);
         this.$emit('close', null);
     }
 

app_Web/src/pages/workflow/wfuser-mpickup-view/wfuser-mpickup-view-base.vue

@@ -826,6 +826,7 @@ export default class WFUserMPickupViewBase extends Vue {
      * @memberof WFUserMPickupViewBase
      */
     public onClickCancel(): void {
+        this.$emit('viewdataschange', null);
         this.$emit('close', null);
     }
 

app_Web/src/pages/workflow/wfuser-pickup-view/wfuser-pickup-view-base.vue

@@ -661,6 +661,7 @@ export default class WFUserPickupViewBase extends Vue {
      * @memberof WFUserPickupViewBase
      */
     public onClickCancel(): void {
+        this.$emit('viewdataschange', null);
         this.$emit('close', null);
     }
 

app_Web/src/service/dict-catalog/dict-catalog-service-base.ts

@@ -48,7 +48,9 @@ export default class DictCatalogServiceBase extends EntityService {
      * @memberof DictCatalogServiceBase
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().get(`/dictcatalogs/${context.dictcatalog}/select`,isloading);
+            let res:any = Http.getInstance().get(`/dictcatalogs/${context.dictcatalog}/select`,isloading);
+
+            return res;
     }
 
     /**
@@ -62,21 +64,6 @@ export default class DictCatalogServiceBase extends EntityService {
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let dictoptionsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_dictoptions'),'undefined')){
-            dictoptionsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_dictoptions') as any);
-            if(dictoptionsData && dictoptionsData.length && dictoptionsData.length > 0){
-                dictoptionsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.value_key = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.dictoptions = dictoptionsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -87,6 +74,7 @@ export default class DictCatalogServiceBase extends EntityService {
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/dictcatalogs`,data,isloading);
         this.tempStorage.setItem(tempContext.srfsessionkey+'_dictoptions',JSON.stringify(res.data.dictoptions));
+
         return res;
     }
 
@@ -101,24 +89,9 @@ export default class DictCatalogServiceBase extends EntityService {
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let dictoptionsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_dictoptions'),'undefined')){
-            dictoptionsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_dictoptions') as any);
-            if(dictoptionsData && dictoptionsData.length && dictoptionsData.length > 0){
-                dictoptionsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.value_key = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.dictoptions = dictoptionsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/dictcatalogs/${context.dictcatalog}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_dictoptions',JSON.stringify(res.data.dictoptions));
+
             return res;
     }
 
@@ -132,7 +105,8 @@ export default class DictCatalogServiceBase extends EntityService {
      * @memberof DictCatalogServiceBase
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().delete(`/dictcatalogs/${context.dictcatalog}`,isloading);
+            let res:any = Http.getInstance().delete(`/dictcatalogs/${context.dictcatalog}`,isloading);
+            return res;
     }
 
     /**
@@ -146,7 +120,7 @@ export default class DictCatalogServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/dictcatalogs/${context.dictcatalog}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_dictoptions',JSON.stringify(res.data.dictoptions));
+
             return res;
     }
 
@@ -162,7 +136,7 @@ export default class DictCatalogServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/dictcatalogs/getdraft`,isloading);
         res.data.dictcatalog = data.dictcatalog;
-            this.tempStorage.setItem(context.srfsessionkey+'_dictoptions',JSON.stringify(res.data.dictoptions));
+
         return res;
     }
 
@@ -176,7 +150,8 @@ export default class DictCatalogServiceBase extends EntityService {
      * @memberof DictCatalogServiceBase
      */
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().post(`/dictcatalogs/${context.dictcatalog}/checkkey`,data,isloading);
+            let res:any = Http.getInstance().post(`/dictcatalogs/${context.dictcatalog}/checkkey`,data,isloading);
+            return res;
     }
 
     /**
@@ -190,24 +165,9 @@ export default class DictCatalogServiceBase extends EntityService {
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let dictoptionsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_dictoptions'),'undefined')){
-            dictoptionsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_dictoptions') as any);
-            if(dictoptionsData && dictoptionsData.length && dictoptionsData.length > 0){
-                dictoptionsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.value_key = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.dictoptions = dictoptionsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/dictcatalogs/${context.dictcatalog}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_dictoptions',JSON.stringify(res.data.dictoptions));
+
             return res;
     }
 
@@ -222,6 +182,21 @@ export default class DictCatalogServiceBase extends EntityService {
      */
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let tempData:any = JSON.parse(JSON.stringify(data));
-        return Http.getInstance().get(`/dictcatalogs/fetchdefault`,tempData,isloading);
+        let res:any = Http.getInstance().get(`/dictcatalogs/fetchdefault`,tempData,isloading);
+        return res;
+    }
+
+    /**
+     * searchDefault接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof DictCatalogServiceBase
+     */
+    public async searchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        return Http.getInstance().post(`/dictcatalogs/searchdefault`,tempData,isloading);
     }
 }
\ No newline at end of file

app_Web/src/service/dict-option/dict-option-service-base.ts

@@ -49,9 +49,13 @@ export default class DictOptionServiceBase extends EntityService {
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.dictcatalog && context.dictoption){
-            return Http.getInstance().get(`/dictcatalogs/${context.dictcatalog}/dictoptions/${context.dictoption}/select`,isloading);
+            let res:any = Http.getInstance().get(`/dictcatalogs/${context.dictcatalog}/dictoptions/${context.dictoption}/select`,isloading);
+
+            return res;
         }
-            return Http.getInstance().get(`/dictoptions/${context.dictoption}/select`,isloading);
+            let res:any = Http.getInstance().get(`/dictoptions/${context.dictoption}/select`,isloading);
+
+            return res;
     }
 
     /**
@@ -75,6 +79,7 @@ export default class DictOptionServiceBase extends EntityService {
             }
             let tempContext:any = JSON.parse(JSON.stringify(context));
             let res:any = await Http.getInstance().post(`/dictcatalogs/${context.dictcatalog}/dictoptions`,data,isloading);
+
             return res;
         }
         let masterData:any = {};
@@ -87,6 +92,7 @@ export default class DictOptionServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/dictoptions`,data,isloading);
+
         return res;
     }
 
@@ -104,11 +110,13 @@ export default class DictOptionServiceBase extends EntityService {
             let masterData:any = {};
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().put(`/dictcatalogs/${context.dictcatalog}/dictoptions/${context.dictoption}`,data,isloading);
+
             return res;
         }
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/dictoptions/${context.dictoption}`,data,isloading);
+
             return res;
     }
 
@@ -123,9 +131,11 @@ export default class DictOptionServiceBase extends EntityService {
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.dictcatalog && context.dictoption){
-            return Http.getInstance().delete(`/dictcatalogs/${context.dictcatalog}/dictoptions/${context.dictoption}`,isloading);
+            let res:any = Http.getInstance().delete(`/dictcatalogs/${context.dictcatalog}/dictoptions/${context.dictoption}`,isloading);
+            return res;
         }
-            return Http.getInstance().delete(`/dictoptions/${context.dictoption}`,isloading);
+            let res:any = Http.getInstance().delete(`/dictoptions/${context.dictoption}`,isloading);
+            return res;
     }
 
     /**
@@ -140,9 +150,11 @@ export default class DictOptionServiceBase extends EntityService {
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.dictcatalog && context.dictoption){
             let res:any = await Http.getInstance().get(`/dictcatalogs/${context.dictcatalog}/dictoptions/${context.dictoption}`,isloading);
+
             return res;
         }
             let res:any = await Http.getInstance().get(`/dictoptions/${context.dictoption}`,isloading);
+
             return res;
     }
 
@@ -159,10 +171,12 @@ export default class DictOptionServiceBase extends EntityService {
         if(context.dictcatalog && true){
             let res:any = await Http.getInstance().get(`/dictcatalogs/${context.dictcatalog}/dictoptions/getdraft`,isloading);
             res.data.dictoption = data.dictoption;
+
             return res;
         }
         let res:any = await  Http.getInstance().get(`/dictoptions/getdraft`,isloading);
         res.data.dictoption = data.dictoption;
+
         return res;
     }
 
@@ -180,9 +194,11 @@ export default class DictOptionServiceBase extends EntityService {
             let masterData:any = {};
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/dictcatalogs/${context.dictcatalog}/dictoptions/${context.dictoption}/checkkey`,data,isloading);
+
             return res;
         }
-            return Http.getInstance().post(`/dictoptions/${context.dictoption}/checkkey`,data,isloading);
+            let res:any = Http.getInstance().post(`/dictoptions/${context.dictoption}/checkkey`,data,isloading);
+            return res;
     }
 
     /**
@@ -199,11 +215,13 @@ export default class DictOptionServiceBase extends EntityService {
             let masterData:any = {};
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/dictcatalogs/${context.dictcatalog}/dictoptions/${context.dictoption}/save`,data,isloading);
+
             return res;
         }
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/dictoptions/${context.dictoption}/save`,data,isloading);
+
             return res;
     }
 
@@ -219,9 +237,29 @@ export default class DictOptionServiceBase extends EntityService {
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.dictcatalog && true){
             let tempData:any = JSON.parse(JSON.stringify(data));
-            return Http.getInstance().get(`/dictcatalogs/${context.dictcatalog}/dictoptions/fetchdefault`,tempData,isloading);
+            let res:any = Http.getInstance().get(`/dictcatalogs/${context.dictcatalog}/dictoptions/fetchdefault`,tempData,isloading);
+            return res;
+        }
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        let res:any = Http.getInstance().get(`/dictoptions/fetchdefault`,tempData,isloading);
+        return res;
+    }
+
+    /**
+     * searchDefault接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof DictOptionServiceBase
+     */
+    public async searchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.dictcatalog && true){
+            let tempData:any = JSON.parse(JSON.stringify(data));
+            return Http.getInstance().post(`/dictcatalogs/${context.dictcatalog}/dictoptions/searchdefault`,tempData,isloading);
         }
         let tempData:any = JSON.parse(JSON.stringify(data));
-        return Http.getInstance().get(`/dictoptions/fetchdefault`,tempData,isloading);
+        return Http.getInstance().post(`/dictoptions/searchdefault`,tempData,isloading);
     }
 }
\ No newline at end of file

app_Web/src/service/ibzpost/ibzpost-service-base.ts

@@ -48,7 +48,9 @@ export default class IBZPostServiceBase extends EntityService {
      * @memberof IBZPostServiceBase
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().get(`/ibzposts/${context.ibzpost}/select`,isloading);
+            let res:any = Http.getInstance().get(`/ibzposts/${context.ibzpost}/select`,isloading);
+
+            return res;
     }
 
     /**
@@ -71,6 +73,7 @@ export default class IBZPostServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/ibzposts`,data,isloading);
+
         return res;
     }
 
@@ -87,6 +90,7 @@ export default class IBZPostServiceBase extends EntityService {
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/ibzposts/${context.ibzpost}`,data,isloading);
+
             return res;
     }
 
@@ -100,7 +104,8 @@ export default class IBZPostServiceBase extends EntityService {
      * @memberof IBZPostServiceBase
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().delete(`/ibzposts/${context.ibzpost}`,isloading);
+            let res:any = Http.getInstance().delete(`/ibzposts/${context.ibzpost}`,isloading);
+            return res;
     }
 
     /**
@@ -114,6 +119,7 @@ export default class IBZPostServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/ibzposts/${context.ibzpost}`,isloading);
+
             return res;
     }
 
@@ -129,6 +135,7 @@ export default class IBZPostServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/ibzposts/getdraft`,isloading);
         res.data.ibzpost = data.ibzpost;
+
         return res;
     }
 
@@ -142,7 +149,8 @@ export default class IBZPostServiceBase extends EntityService {
      * @memberof IBZPostServiceBase
      */
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().post(`/ibzposts/${context.ibzpost}/checkkey`,data,isloading);
+            let res:any = Http.getInstance().post(`/ibzposts/${context.ibzpost}/checkkey`,data,isloading);
+            return res;
     }
 
     /**
@@ -158,6 +166,7 @@ export default class IBZPostServiceBase extends EntityService {
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/ibzposts/${context.ibzpost}/save`,data,isloading);
+
             return res;
     }
 
@@ -172,6 +181,21 @@ export default class IBZPostServiceBase extends EntityService {
      */
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let tempData:any = JSON.parse(JSON.stringify(data));
-        return Http.getInstance().get(`/ibzposts/fetchdefault`,tempData,isloading);
+        let res:any = Http.getInstance().get(`/ibzposts/fetchdefault`,tempData,isloading);
+        return res;
+    }
+
+    /**
+     * searchDefault接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof IBZPostServiceBase
+     */
+    public async searchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        return Http.getInstance().post(`/ibzposts/searchdefault`,tempData,isloading);
     }
 }
\ No newline at end of file

app_Web/src/service/ibzteam/ibzteam-service-base.ts

@@ -48,7 +48,9 @@ export default class IBZTeamServiceBase extends EntityService {
      * @memberof IBZTeamServiceBase
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().get(`/ibzteams/${context.ibzteam}/select`,isloading);
+            let res:any = Http.getInstance().get(`/ibzteams/${context.ibzteam}/select`,isloading);
+
+            return res;
     }
 
     /**
@@ -62,21 +64,6 @@ export default class IBZTeamServiceBase extends EntityService {
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let ibzteammembersData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers'),'undefined')){
-            ibzteammembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers') as any);
-            if(ibzteammembersData && ibzteammembersData.length && ibzteammembersData.length > 0){
-                ibzteammembersData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.teammemberid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.ibzteammembers = ibzteammembersData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -87,6 +74,7 @@ export default class IBZTeamServiceBase extends EntityService {
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/ibzteams`,data,isloading);
         this.tempStorage.setItem(tempContext.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
+
         return res;
     }
 
@@ -101,24 +89,9 @@ export default class IBZTeamServiceBase extends EntityService {
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let ibzteammembersData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers'),'undefined')){
-            ibzteammembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers') as any);
-            if(ibzteammembersData && ibzteammembersData.length && ibzteammembersData.length > 0){
-                ibzteammembersData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.teammemberid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.ibzteammembers = ibzteammembersData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/ibzteams/${context.ibzteam}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
+
             return res;
     }
 
@@ -132,7 +105,8 @@ export default class IBZTeamServiceBase extends EntityService {
      * @memberof IBZTeamServiceBase
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().delete(`/ibzteams/${context.ibzteam}`,isloading);
+            let res:any = Http.getInstance().delete(`/ibzteams/${context.ibzteam}`,isloading);
+            return res;
     }
 
     /**
@@ -146,7 +120,7 @@ export default class IBZTeamServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/ibzteams/${context.ibzteam}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
+
             return res;
     }
 
@@ -162,7 +136,7 @@ export default class IBZTeamServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/ibzteams/getdraft`,isloading);
         res.data.ibzteam = data.ibzteam;
-            this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
+
         return res;
     }
 
@@ -176,7 +150,8 @@ export default class IBZTeamServiceBase extends EntityService {
      * @memberof IBZTeamServiceBase
      */
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().post(`/ibzteams/${context.ibzteam}/checkkey`,data,isloading);
+            let res:any = Http.getInstance().post(`/ibzteams/${context.ibzteam}/checkkey`,data,isloading);
+            return res;
     }
 
     /**
@@ -190,24 +165,9 @@ export default class IBZTeamServiceBase extends EntityService {
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let ibzteammembersData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers'),'undefined')){
-            ibzteammembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers') as any);
-            if(ibzteammembersData && ibzteammembersData.length && ibzteammembersData.length > 0){
-                ibzteammembersData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.teammemberid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.ibzteammembers = ibzteammembersData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/ibzteams/${context.ibzteam}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
+
             return res;
     }
 
@@ -222,6 +182,21 @@ export default class IBZTeamServiceBase extends EntityService {
      */
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let tempData:any = JSON.parse(JSON.stringify(data));
-        return Http.getInstance().get(`/ibzteams/fetchdefault`,tempData,isloading);
+        let res:any = Http.getInstance().get(`/ibzteams/fetchdefault`,tempData,isloading);
+        return res;
+    }
+
+    /**
+     * searchDefault接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof IBZTeamServiceBase
+     */
+    public async searchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        return Http.getInstance().post(`/ibzteams/searchdefault`,tempData,isloading);
     }
 }
\ No newline at end of file

app_Web/src/service/jobs-info/jobs-info-service-base.ts

@@ -48,7 +48,9 @@ export default class JobsInfoServiceBase extends EntityService {
      * @memberof JobsInfoServiceBase
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().get(`/jobsinfos/${context.jobsinfo}/select`,isloading);
+            let res:any = Http.getInstance().get(`/jobsinfos/${context.jobsinfo}/select`,isloading);
+
+            return res;
     }
 
     /**
@@ -71,6 +73,7 @@ export default class JobsInfoServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/jobsinfos`,data,isloading);
+
         return res;
     }
 
@@ -87,6 +90,7 @@ export default class JobsInfoServiceBase extends EntityService {
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/jobsinfos/${context.jobsinfo}`,data,isloading);
+
             return res;
     }
 
@@ -100,7 +104,8 @@ export default class JobsInfoServiceBase extends EntityService {
      * @memberof JobsInfoServiceBase
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().delete(`/jobsinfos/${context.jobsinfo}`,isloading);
+            let res:any = Http.getInstance().delete(`/jobsinfos/${context.jobsinfo}`,isloading);
+            return res;
     }
 
     /**
@@ -114,6 +119,7 @@ export default class JobsInfoServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/jobsinfos/${context.jobsinfo}`,isloading);
+
             return res;
     }
 
@@ -129,6 +135,7 @@ export default class JobsInfoServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/jobsinfos/getdraft`,isloading);
         res.data.jobsinfo = data.jobsinfo;
+
         return res;
     }
 
@@ -142,7 +149,8 @@ export default class JobsInfoServiceBase extends EntityService {
      * @memberof JobsInfoServiceBase
      */
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().post(`/jobsinfos/${context.jobsinfo}/checkkey`,data,isloading);
+            let res:any = Http.getInstance().post(`/jobsinfos/${context.jobsinfo}/checkkey`,data,isloading);
+            return res;
     }
 
     /**
@@ -155,7 +163,8 @@ export default class JobsInfoServiceBase extends EntityService {
      * @memberof JobsInfoServiceBase
      */
     public async Execute(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().post(`/jobsinfos/${context.jobsinfo}/execute`,data,isloading);
+            let res:any = Http.getInstance().post(`/jobsinfos/${context.jobsinfo}/execute`,data,isloading);
+            return res;
     }
 
     /**
@@ -171,6 +180,7 @@ export default class JobsInfoServiceBase extends EntityService {
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/jobsinfos/${context.jobsinfo}/save`,data,isloading);
+
             return res;
     }
 
@@ -184,7 +194,8 @@ export default class JobsInfoServiceBase extends EntityService {
      * @memberof JobsInfoServiceBase
      */
     public async Start(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().post(`/jobsinfos/${context.jobsinfo}/start`,data,isloading);
+            let res:any = Http.getInstance().post(`/jobsinfos/${context.jobsinfo}/start`,data,isloading);
+            return res;
     }
 
     /**
@@ -197,7 +208,8 @@ export default class JobsInfoServiceBase extends EntityService {
      * @memberof JobsInfoServiceBase
      */
     public async Stop(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().post(`/jobsinfos/${context.jobsinfo}/stop`,data,isloading);
+            let res:any = Http.getInstance().post(`/jobsinfos/${context.jobsinfo}/stop`,data,isloading);
+            return res;
     }
 
     /**
@@ -211,6 +223,21 @@ export default class JobsInfoServiceBase extends EntityService {
      */
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let tempData:any = JSON.parse(JSON.stringify(data));
-        return Http.getInstance().get(`/jobsinfos/fetchdefault`,tempData,isloading);
+        let res:any = Http.getInstance().get(`/jobsinfos/fetchdefault`,tempData,isloading);
+        return res;
+    }
+
+    /**
+     * searchDefault接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof JobsInfoServiceBase
+     */
+    public async searchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        return Http.getInstance().post(`/jobsinfos/searchdefault`,tempData,isloading);
     }
 }
\ No newline at end of file

app_Web/src/service/jobs-log/jobs-log-service-base.ts

@@ -48,7 +48,9 @@ export default class JobsLogServiceBase extends EntityService {
      * @memberof JobsLogServiceBase
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().get(`/jobslogs/${context.jobslog}/select`,isloading);
+            let res:any = Http.getInstance().get(`/jobslogs/${context.jobslog}/select`,isloading);
+
+            return res;
     }
 
     /**
@@ -71,6 +73,7 @@ export default class JobsLogServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/jobslogs`,data,isloading);
+
         return res;
     }
 
@@ -87,6 +90,7 @@ export default class JobsLogServiceBase extends EntityService {
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/jobslogs/${context.jobslog}`,data,isloading);
+
             return res;
     }
 
@@ -100,7 +104,8 @@ export default class JobsLogServiceBase extends EntityService {
      * @memberof JobsLogServiceBase
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().delete(`/jobslogs/${context.jobslog}`,isloading);
+            let res:any = Http.getInstance().delete(`/jobslogs/${context.jobslog}`,isloading);
+            return res;
     }
 
     /**
@@ -114,6 +119,7 @@ export default class JobsLogServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/jobslogs/${context.jobslog}`,isloading);
+
             return res;
     }
 
@@ -129,6 +135,7 @@ export default class JobsLogServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/jobslogs/getdraft`,isloading);
         res.data.jobslog = data.jobslog;
+
         return res;
     }
 
@@ -142,7 +149,8 @@ export default class JobsLogServiceBase extends EntityService {
      * @memberof JobsLogServiceBase
      */
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().post(`/jobslogs/${context.jobslog}/checkkey`,data,isloading);
+            let res:any = Http.getInstance().post(`/jobslogs/${context.jobslog}/checkkey`,data,isloading);
+            return res;
     }
 
     /**
@@ -158,6 +166,7 @@ export default class JobsLogServiceBase extends EntityService {
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/jobslogs/${context.jobslog}/save`,data,isloading);
+
             return res;
     }
 
@@ -172,6 +181,21 @@ export default class JobsLogServiceBase extends EntityService {
      */
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let tempData:any = JSON.parse(JSON.stringify(data));
-        return Http.getInstance().get(`/jobslogs/fetchdefault`,tempData,isloading);
+        let res:any = Http.getInstance().get(`/jobslogs/fetchdefault`,tempData,isloading);
+        return res;
+    }
+
+    /**
+     * searchDefault接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof JobsLogServiceBase
+     */
+    public async searchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        return Http.getInstance().post(`/jobslogs/searchdefault`,tempData,isloading);
     }
 }
\ No newline at end of file

app_Web/src/service/jobs-registry/jobs-registry-service-base.ts

@@ -48,7 +48,9 @@ export default class JobsRegistryServiceBase extends EntityService {
      * @memberof JobsRegistryServiceBase
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().get(`/jobsregistries/${context.jobsregistry}/select`,isloading);
+            let res:any = Http.getInstance().get(`/jobsregistries/${context.jobsregistry}/select`,isloading);
+
+            return res;
     }
 
     /**
@@ -71,6 +73,7 @@ export default class JobsRegistryServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/jobsregistries`,data,isloading);
+
         return res;
     }
 
@@ -87,6 +90,7 @@ export default class JobsRegistryServiceBase extends EntityService {
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/jobsregistries/${context.jobsregistry}`,data,isloading);
+
             return res;
     }
 
@@ -100,7 +104,8 @@ export default class JobsRegistryServiceBase extends EntityService {
      * @memberof JobsRegistryServiceBase
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().delete(`/jobsregistries/${context.jobsregistry}`,isloading);
+            let res:any = Http.getInstance().delete(`/jobsregistries/${context.jobsregistry}`,isloading);
+            return res;
     }
 
     /**
@@ -114,6 +119,7 @@ export default class JobsRegistryServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/jobsregistries/${context.jobsregistry}`,isloading);
+
             return res;
     }
 
@@ -129,6 +135,7 @@ export default class JobsRegistryServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/jobsregistries/getdraft`,isloading);
         res.data.jobsregistry = data.jobsregistry;
+
         return res;
     }
 
@@ -142,7 +149,8 @@ export default class JobsRegistryServiceBase extends EntityService {
      * @memberof JobsRegistryServiceBase
      */
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().post(`/jobsregistries/${context.jobsregistry}/checkkey`,data,isloading);
+            let res:any = Http.getInstance().post(`/jobsregistries/${context.jobsregistry}/checkkey`,data,isloading);
+            return res;
     }
 
     /**
@@ -158,6 +166,7 @@ export default class JobsRegistryServiceBase extends EntityService {
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/jobsregistries/${context.jobsregistry}/save`,data,isloading);
+
             return res;
     }
 
@@ -172,6 +181,21 @@ export default class JobsRegistryServiceBase extends EntityService {
      */
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let tempData:any = JSON.parse(JSON.stringify(data));
-        return Http.getInstance().get(`/jobsregistries/fetchdefault`,tempData,isloading);
+        let res:any = Http.getInstance().get(`/jobsregistries/fetchdefault`,tempData,isloading);
+        return res;
+    }
+
+    /**
+     * searchDefault接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof JobsRegistryServiceBase
+     */
+    public async searchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        return Http.getInstance().post(`/jobsregistries/searchdefault`,tempData,isloading);
     }
 }
\ No newline at end of file

app_Web/src/service/sys-app/sys-app-service-base.ts

@@ -48,7 +48,9 @@ export default class SysAppServiceBase extends EntityService {
      * @memberof SysAppServiceBase
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().get(`/sysapps/${context.sysapp}/select`,isloading);
+            let res:any = Http.getInstance().get(`/sysapps/${context.sysapp}/select`,isloading);
+
+            return res;
     }
 
     /**
@@ -71,6 +73,7 @@ export default class SysAppServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/sysapps`,data,isloading);
+
         return res;
     }
 
@@ -87,6 +90,7 @@ export default class SysAppServiceBase extends EntityService {
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/sysapps/${context.sysapp}`,data,isloading);
+
             return res;
     }
 
@@ -100,7 +104,8 @@ export default class SysAppServiceBase extends EntityService {
      * @memberof SysAppServiceBase
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().delete(`/sysapps/${context.sysapp}`,isloading);
+            let res:any = Http.getInstance().delete(`/sysapps/${context.sysapp}`,isloading);
+            return res;
     }
 
     /**
@@ -114,6 +119,7 @@ export default class SysAppServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/sysapps/${context.sysapp}`,isloading);
+
             return res;
     }
 
@@ -129,6 +135,7 @@ export default class SysAppServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/sysapps/getdraft`,isloading);
         res.data.sysapp = data.sysapp;
+
         return res;
     }
 
@@ -142,7 +149,8 @@ export default class SysAppServiceBase extends EntityService {
      * @memberof SysAppServiceBase
      */
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().post(`/sysapps/${context.sysapp}/checkkey`,data,isloading);
+            let res:any = Http.getInstance().post(`/sysapps/${context.sysapp}/checkkey`,data,isloading);
+            return res;
     }
 
     /**
@@ -158,6 +166,7 @@ export default class SysAppServiceBase extends EntityService {
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/sysapps/${context.sysapp}/save`,data,isloading);
+
             return res;
     }
 
@@ -172,6 +181,21 @@ export default class SysAppServiceBase extends EntityService {
      */
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let tempData:any = JSON.parse(JSON.stringify(data));
-        return Http.getInstance().get(`/sysapps/fetchdefault`,tempData,isloading);
+        let res:any = Http.getInstance().get(`/sysapps/fetchdefault`,tempData,isloading);
+        return res;
+    }
+
+    /**
+     * searchDefault接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof SysAppServiceBase
+     */
+    public async searchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        return Http.getInstance().post(`/sysapps/searchdefault`,tempData,isloading);
     }
 }
\ No newline at end of file

app_Web/src/service/sys-auth-log/sys-auth-log-service-base.ts

@@ -48,7 +48,9 @@ export default class SysAuthLogServiceBase extends EntityService {
      * @memberof SysAuthLogServiceBase
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().get(`/sysauthlogs/${context.sysauthlog}/select`,isloading);
+            let res:any = Http.getInstance().get(`/sysauthlogs/${context.sysauthlog}/select`,isloading);
+
+            return res;
     }
 
     /**
@@ -71,6 +73,7 @@ export default class SysAuthLogServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/sysauthlogs`,data,isloading);
+
         return res;
     }
 
@@ -87,6 +90,7 @@ export default class SysAuthLogServiceBase extends EntityService {
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/sysauthlogs/${context.sysauthlog}`,data,isloading);
+
             return res;
     }
 
@@ -100,7 +104,8 @@ export default class SysAuthLogServiceBase extends EntityService {
      * @memberof SysAuthLogServiceBase
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().delete(`/sysauthlogs/${context.sysauthlog}`,isloading);
+            let res:any = Http.getInstance().delete(`/sysauthlogs/${context.sysauthlog}`,isloading);
+            return res;
     }
 
     /**
@@ -114,6 +119,7 @@ export default class SysAuthLogServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/sysauthlogs/${context.sysauthlog}`,isloading);
+
             return res;
     }
 
@@ -129,6 +135,7 @@ export default class SysAuthLogServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/sysauthlogs/getdraft`,isloading);
         res.data.sysauthlog = data.sysauthlog;
+
         return res;
     }
 
@@ -142,7 +149,8 @@ export default class SysAuthLogServiceBase extends EntityService {
      * @memberof SysAuthLogServiceBase
      */
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().post(`/sysauthlogs/${context.sysauthlog}/checkkey`,data,isloading);
+            let res:any = Http.getInstance().post(`/sysauthlogs/${context.sysauthlog}/checkkey`,data,isloading);
+            return res;
     }
 
     /**
@@ -158,6 +166,7 @@ export default class SysAuthLogServiceBase extends EntityService {
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/sysauthlogs/${context.sysauthlog}/save`,data,isloading);
+
             return res;
     }
 
@@ -172,6 +181,21 @@ export default class SysAuthLogServiceBase extends EntityService {
      */
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let tempData:any = JSON.parse(JSON.stringify(data));
-        return Http.getInstance().get(`/sysauthlogs/fetchdefault`,tempData,isloading);
+        let res:any = Http.getInstance().get(`/sysauthlogs/fetchdefault`,tempData,isloading);
+        return res;
+    }
+
+    /**
+     * searchDefault接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof SysAuthLogServiceBase
+     */
+    public async searchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        return Http.getInstance().post(`/sysauthlogs/searchdefault`,tempData,isloading);
     }
 }
\ No newline at end of file

app_Web/src/service/sys-permission/sys-permission-service-base.ts

@@ -48,7 +48,9 @@ export default class SysPermissionServiceBase extends EntityService {
      * @memberof SysPermissionServiceBase
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().get(`/syspermissions/${context.syspermission}/select`,isloading);
+            let res:any = Http.getInstance().get(`/syspermissions/${context.syspermission}/select`,isloading);
+
+            return res;
     }
 
     /**
@@ -62,21 +64,6 @@ export default class SysPermissionServiceBase extends EntityService {
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let sysrolepermissionsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_sysrolepermissions'),'undefined')){
-            sysrolepermissionsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_sysrolepermissions') as any);
-            if(sysrolepermissionsData && sysrolepermissionsData.length && sysrolepermissionsData.length > 0){
-                sysrolepermissionsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.rolepermissionid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.sysrolepermissions = sysrolepermissionsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -87,6 +74,7 @@ export default class SysPermissionServiceBase extends EntityService {
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/syspermissions`,data,isloading);
         this.tempStorage.setItem(tempContext.srfsessionkey+'_sysrolepermissions',JSON.stringify(res.data.sysrolepermissions));
+
         return res;
     }
 
@@ -101,24 +89,9 @@ export default class SysPermissionServiceBase extends EntityService {
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let sysrolepermissionsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_sysrolepermissions'),'undefined')){
-            sysrolepermissionsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_sysrolepermissions') as any);
-            if(sysrolepermissionsData && sysrolepermissionsData.length && sysrolepermissionsData.length > 0){
-                sysrolepermissionsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.rolepermissionid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.sysrolepermissions = sysrolepermissionsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/syspermissions/${context.syspermission}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_sysrolepermissions',JSON.stringify(res.data.sysrolepermissions));
+
             return res;
     }
 
@@ -132,7 +105,8 @@ export default class SysPermissionServiceBase extends EntityService {
      * @memberof SysPermissionServiceBase
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().delete(`/syspermissions/${context.syspermission}`,isloading);
+            let res:any = Http.getInstance().delete(`/syspermissions/${context.syspermission}`,isloading);
+            return res;
     }
 
     /**
@@ -146,7 +120,7 @@ export default class SysPermissionServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/syspermissions/${context.syspermission}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_sysrolepermissions',JSON.stringify(res.data.sysrolepermissions));
+
             return res;
     }
 
@@ -162,7 +136,7 @@ export default class SysPermissionServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/syspermissions/getdraft`,isloading);
         res.data.syspermission = data.syspermission;
-            this.tempStorage.setItem(context.srfsessionkey+'_sysrolepermissions',JSON.stringify(res.data.sysrolepermissions));
+
         return res;
     }
 
@@ -176,7 +150,8 @@ export default class SysPermissionServiceBase extends EntityService {
      * @memberof SysPermissionServiceBase
      */
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().post(`/syspermissions/${context.syspermission}/checkkey`,data,isloading);
+            let res:any = Http.getInstance().post(`/syspermissions/${context.syspermission}/checkkey`,data,isloading);
+            return res;
     }
 
     /**
@@ -190,24 +165,9 @@ export default class SysPermissionServiceBase extends EntityService {
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let sysrolepermissionsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_sysrolepermissions'),'undefined')){
-            sysrolepermissionsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_sysrolepermissions') as any);
-            if(sysrolepermissionsData && sysrolepermissionsData.length && sysrolepermissionsData.length > 0){
-                sysrolepermissionsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.rolepermissionid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.sysrolepermissions = sysrolepermissionsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/syspermissions/${context.syspermission}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_sysrolepermissions',JSON.stringify(res.data.sysrolepermissions));
+
             return res;
     }
 
@@ -222,6 +182,21 @@ export default class SysPermissionServiceBase extends EntityService {
      */
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let tempData:any = JSON.parse(JSON.stringify(data));
-        return Http.getInstance().get(`/syspermissions/fetchdefault`,tempData,isloading);
+        let res:any = Http.getInstance().get(`/syspermissions/fetchdefault`,tempData,isloading);
+        return res;
+    }
+
+    /**
+     * searchDefault接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof SysPermissionServiceBase
+     */
+    public async searchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        return Http.getInstance().post(`/syspermissions/searchdefault`,tempData,isloading);
     }
 }
\ No newline at end of file

app_Web/src/service/sys-user-role/sys-user-role-service-base.ts

@@ -49,12 +49,18 @@ export default class SysUserRoleServiceBase extends EntityService {
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.sysuser && context.sysuserrole){
-            return Http.getInstance().get(`/sysusers/${context.sysuser}/sysuserroles/${context.sysuserrole}/select`,isloading);
+            let res:any = Http.getInstance().get(`/sysusers/${context.sysuser}/sysuserroles/${context.sysuserrole}/select`,isloading);
+
+            return res;
         }
         if(context.sysrole && context.sysuserrole){
-            return Http.getInstance().get(`/sysroles/${context.sysrole}/sysuserroles/${context.sysuserrole}/select`,isloading);
+            let res:any = Http.getInstance().get(`/sysroles/${context.sysrole}/sysuserroles/${context.sysuserrole}/select`,isloading);
+
+            return res;
         }
-            return Http.getInstance().get(`/sysuserroles/${context.sysuserrole}/select`,isloading);
+            let res:any = Http.getInstance().get(`/sysuserroles/${context.sysuserrole}/select`,isloading);
+
+            return res;
     }
 
     /**
@@ -78,6 +84,7 @@ export default class SysUserRoleServiceBase extends EntityService {
             }
             let tempContext:any = JSON.parse(JSON.stringify(context));
             let res:any = await Http.getInstance().post(`/sysusers/${context.sysuser}/sysuserroles`,data,isloading);
+
             return res;
         }
         if(context.sysrole && true){
@@ -91,6 +98,7 @@ export default class SysUserRoleServiceBase extends EntityService {
             }
             let tempContext:any = JSON.parse(JSON.stringify(context));
             let res:any = await Http.getInstance().post(`/sysroles/${context.sysrole}/sysuserroles`,data,isloading);
+
             return res;
         }
         let masterData:any = {};
@@ -103,6 +111,7 @@ export default class SysUserRoleServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/sysuserroles`,data,isloading);
+
         return res;
     }
 
@@ -120,17 +129,20 @@ export default class SysUserRoleServiceBase extends EntityService {
             let masterData:any = {};
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().put(`/sysusers/${context.sysuser}/sysuserroles/${context.sysuserrole}`,data,isloading);
+
             return res;
         }
         if(context.sysrole && context.sysuserrole){
             let masterData:any = {};
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().put(`/sysroles/${context.sysrole}/sysuserroles/${context.sysuserrole}`,data,isloading);
+
             return res;
         }
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/sysuserroles/${context.sysuserrole}`,data,isloading);
+
             return res;
     }
 
@@ -145,12 +157,15 @@ export default class SysUserRoleServiceBase extends EntityService {
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.sysuser && context.sysuserrole){
-            return Http.getInstance().delete(`/sysusers/${context.sysuser}/sysuserroles/${context.sysuserrole}`,isloading);
+            let res:any = Http.getInstance().delete(`/sysusers/${context.sysuser}/sysuserroles/${context.sysuserrole}`,isloading);
+            return res;
         }
         if(context.sysrole && context.sysuserrole){
-            return Http.getInstance().delete(`/sysroles/${context.sysrole}/sysuserroles/${context.sysuserrole}`,isloading);
+            let res:any = Http.getInstance().delete(`/sysroles/${context.sysrole}/sysuserroles/${context.sysuserrole}`,isloading);
+            return res;
         }
-            return Http.getInstance().delete(`/sysuserroles/${context.sysuserrole}`,isloading);
+            let res:any = Http.getInstance().delete(`/sysuserroles/${context.sysuserrole}`,isloading);
+            return res;
     }
 
     /**
@@ -165,13 +180,16 @@ export default class SysUserRoleServiceBase extends EntityService {
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.sysuser && context.sysuserrole){
             let res:any = await Http.getInstance().get(`/sysusers/${context.sysuser}/sysuserroles/${context.sysuserrole}`,isloading);
+
             return res;
         }
         if(context.sysrole && context.sysuserrole){
             let res:any = await Http.getInstance().get(`/sysroles/${context.sysrole}/sysuserroles/${context.sysuserrole}`,isloading);
+
             return res;
         }
             let res:any = await Http.getInstance().get(`/sysuserroles/${context.sysuserrole}`,isloading);
+
             return res;
     }
 
@@ -188,15 +206,18 @@ export default class SysUserRoleServiceBase extends EntityService {
         if(context.sysuser && true){
             let res:any = await Http.getInstance().get(`/sysusers/${context.sysuser}/sysuserroles/getdraft`,isloading);
             res.data.sysuserrole = data.sysuserrole;
+
             return res;
         }
         if(context.sysrole && true){
             let res:any = await Http.getInstance().get(`/sysroles/${context.sysrole}/sysuserroles/getdraft`,isloading);
             res.data.sysuserrole = data.sysuserrole;
+
             return res;
         }
         let res:any = await  Http.getInstance().get(`/sysuserroles/getdraft`,isloading);
         res.data.sysuserrole = data.sysuserrole;
+
         return res;
     }
 
@@ -214,15 +235,18 @@ export default class SysUserRoleServiceBase extends EntityService {
             let masterData:any = {};
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/sysusers/${context.sysuser}/sysuserroles/${context.sysuserrole}/checkkey`,data,isloading);
+
             return res;
         }
         if(context.sysrole && context.sysuserrole){
             let masterData:any = {};
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/sysroles/${context.sysrole}/sysuserroles/${context.sysuserrole}/checkkey`,data,isloading);
+
             return res;
         }
-            return Http.getInstance().post(`/sysuserroles/${context.sysuserrole}/checkkey`,data,isloading);
+            let res:any = Http.getInstance().post(`/sysuserroles/${context.sysuserrole}/checkkey`,data,isloading);
+            return res;
     }
 
     /**
@@ -239,17 +263,20 @@ export default class SysUserRoleServiceBase extends EntityService {
             let masterData:any = {};
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/sysusers/${context.sysuser}/sysuserroles/${context.sysuserrole}/save`,data,isloading);
+
             return res;
         }
         if(context.sysrole && context.sysuserrole){
             let masterData:any = {};
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/sysroles/${context.sysrole}/sysuserroles/${context.sysuserrole}/save`,data,isloading);
+
             return res;
         }
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/sysuserroles/${context.sysuserrole}/save`,data,isloading);
+
             return res;
     }
 
@@ -265,13 +292,38 @@ export default class SysUserRoleServiceBase extends EntityService {
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.sysuser && true){
             let tempData:any = JSON.parse(JSON.stringify(data));
-            return Http.getInstance().get(`/sysusers/${context.sysuser}/sysuserroles/fetchdefault`,tempData,isloading);
+            let res:any = Http.getInstance().get(`/sysusers/${context.sysuser}/sysuserroles/fetchdefault`,tempData,isloading);
+            return res;
+        }
+        if(context.sysrole && true){
+            let tempData:any = JSON.parse(JSON.stringify(data));
+            let res:any = Http.getInstance().get(`/sysroles/${context.sysrole}/sysuserroles/fetchdefault`,tempData,isloading);
+            return res;
+        }
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        let res:any = Http.getInstance().get(`/sysuserroles/fetchdefault`,tempData,isloading);
+        return res;
+    }
+
+    /**
+     * searchDefault接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof SysUserRoleServiceBase
+     */
+    public async searchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.sysuser && true){
+            let tempData:any = JSON.parse(JSON.stringify(data));
+            return Http.getInstance().post(`/sysusers/${context.sysuser}/sysuserroles/searchdefault`,tempData,isloading);
         }
         if(context.sysrole && true){
             let tempData:any = JSON.parse(JSON.stringify(data));
-            return Http.getInstance().get(`/sysroles/${context.sysrole}/sysuserroles/fetchdefault`,tempData,isloading);
+            return Http.getInstance().post(`/sysroles/${context.sysrole}/sysuserroles/searchdefault`,tempData,isloading);
         }
         let tempData:any = JSON.parse(JSON.stringify(data));
-        return Http.getInstance().get(`/sysuserroles/fetchdefault`,tempData,isloading);
+        return Http.getInstance().post(`/sysuserroles/searchdefault`,tempData,isloading);
     }
 }
\ No newline at end of file

app_Web/src/service/sys-user/sys-user-service-base.ts

@@ -48,7 +48,9 @@ export default class SysUserServiceBase extends EntityService {
      * @memberof SysUserServiceBase
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().get(`/sysusers/${context.sysuser}/select`,isloading);
+            let res:any = Http.getInstance().get(`/sysusers/${context.sysuser}/select`,isloading);
+
+            return res;
     }
 
     /**
@@ -62,21 +64,6 @@ export default class SysUserServiceBase extends EntityService {
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let sysuserrolesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_sysuserroles'),'undefined')){
-            sysuserrolesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_sysuserroles') as any);
-            if(sysuserrolesData && sysuserrolesData.length && sysuserrolesData.length > 0){
-                sysuserrolesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.userroleid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.sysuserroles = sysuserrolesData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -87,6 +74,7 @@ export default class SysUserServiceBase extends EntityService {
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/sysusers`,data,isloading);
         this.tempStorage.setItem(tempContext.srfsessionkey+'_sysuserroles',JSON.stringify(res.data.sysuserroles));
+
         return res;
     }
 
@@ -101,24 +89,9 @@ export default class SysUserServiceBase extends EntityService {
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let sysuserrolesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_sysuserroles'),'undefined')){
-            sysuserrolesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_sysuserroles') as any);
-            if(sysuserrolesData && sysuserrolesData.length && sysuserrolesData.length > 0){
-                sysuserrolesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.userroleid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.sysuserroles = sysuserrolesData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/sysusers/${context.sysuser}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_sysuserroles',JSON.stringify(res.data.sysuserroles));
+
             return res;
     }
 
@@ -132,7 +105,8 @@ export default class SysUserServiceBase extends EntityService {
      * @memberof SysUserServiceBase
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().delete(`/sysusers/${context.sysuser}`,isloading);
+            let res:any = Http.getInstance().delete(`/sysusers/${context.sysuser}`,isloading);
+            return res;
     }
 
     /**
@@ -146,7 +120,7 @@ export default class SysUserServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/sysusers/${context.sysuser}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_sysuserroles',JSON.stringify(res.data.sysuserroles));
+
             return res;
     }
 
@@ -162,7 +136,7 @@ export default class SysUserServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/sysusers/getdraft`,isloading);
         res.data.sysuser = data.sysuser;
-            this.tempStorage.setItem(context.srfsessionkey+'_sysuserroles',JSON.stringify(res.data.sysuserroles));
+
         return res;
     }
 
@@ -176,7 +150,8 @@ export default class SysUserServiceBase extends EntityService {
      * @memberof SysUserServiceBase
      */
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().post(`/sysusers/${context.sysuser}/checkkey`,data,isloading);
+            let res:any = Http.getInstance().post(`/sysusers/${context.sysuser}/checkkey`,data,isloading);
+            return res;
     }
 
     /**
@@ -190,24 +165,9 @@ export default class SysUserServiceBase extends EntityService {
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let sysuserrolesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_sysuserroles'),'undefined')){
-            sysuserrolesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_sysuserroles') as any);
-            if(sysuserrolesData && sysuserrolesData.length && sysuserrolesData.length > 0){
-                sysuserrolesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.userroleid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.sysuserroles = sysuserrolesData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/sysusers/${context.sysuser}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_sysuserroles',JSON.stringify(res.data.sysuserroles));
+
             return res;
     }
 
@@ -222,6 +182,21 @@ export default class SysUserServiceBase extends EntityService {
      */
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let tempData:any = JSON.parse(JSON.stringify(data));
-        return Http.getInstance().get(`/sysusers/fetchdefault`,tempData,isloading);
+        let res:any = Http.getInstance().get(`/sysusers/fetchdefault`,tempData,isloading);
+        return res;
+    }
+
+    /**
+     * searchDefault接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof SysUserServiceBase
+     */
+    public async searchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        return Http.getInstance().post(`/sysusers/searchdefault`,tempData,isloading);
     }
 }
\ No newline at end of file

app_Web/src/service/wfgroup/wfgroup-service-base.ts

@@ -48,7 +48,9 @@ export default class WFGroupServiceBase extends EntityService {
      * @memberof WFGroupServiceBase
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().get(`/wfgroups/${context.wfgroup}/select`,isloading);
+            let res:any = Http.getInstance().get(`/wfgroups/${context.wfgroup}/select`,isloading);
+
+            return res;
     }
 
     /**
@@ -62,21 +64,6 @@ export default class WFGroupServiceBase extends EntityService {
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let wfmembersData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_wfmembers'),'undefined')){
-            wfmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_wfmembers') as any);
-            if(wfmembersData && wfmembersData.length && wfmembersData.length > 0){
-                wfmembersData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.memberid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.wfmembers = wfmembersData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -87,6 +74,7 @@ export default class WFGroupServiceBase extends EntityService {
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/wfgroups`,data,isloading);
         this.tempStorage.setItem(tempContext.srfsessionkey+'_wfmembers',JSON.stringify(res.data.wfmembers));
+
         return res;
     }
 
@@ -101,24 +89,9 @@ export default class WFGroupServiceBase extends EntityService {
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let wfmembersData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_wfmembers'),'undefined')){
-            wfmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_wfmembers') as any);
-            if(wfmembersData && wfmembersData.length && wfmembersData.length > 0){
-                wfmembersData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.memberid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.wfmembers = wfmembersData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/wfgroups/${context.wfgroup}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_wfmembers',JSON.stringify(res.data.wfmembers));
+
             return res;
     }
 
@@ -132,7 +105,8 @@ export default class WFGroupServiceBase extends EntityService {
      * @memberof WFGroupServiceBase
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().delete(`/wfgroups/${context.wfgroup}`,isloading);
+            let res:any = Http.getInstance().delete(`/wfgroups/${context.wfgroup}`,isloading);
+            return res;
     }
 
     /**
@@ -146,7 +120,7 @@ export default class WFGroupServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/wfgroups/${context.wfgroup}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_wfmembers',JSON.stringify(res.data.wfmembers));
+
             return res;
     }
 
@@ -162,7 +136,7 @@ export default class WFGroupServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/wfgroups/getdraft`,isloading);
         res.data.wfgroup = data.wfgroup;
-            this.tempStorage.setItem(context.srfsessionkey+'_wfmembers',JSON.stringify(res.data.wfmembers));
+
         return res;
     }
 
@@ -176,7 +150,8 @@ export default class WFGroupServiceBase extends EntityService {
      * @memberof WFGroupServiceBase
      */
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().post(`/wfgroups/${context.wfgroup}/checkkey`,data,isloading);
+            let res:any = Http.getInstance().post(`/wfgroups/${context.wfgroup}/checkkey`,data,isloading);
+            return res;
     }
 
     /**
@@ -190,24 +165,9 @@ export default class WFGroupServiceBase extends EntityService {
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let wfmembersData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_wfmembers'),'undefined')){
-            wfmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_wfmembers') as any);
-            if(wfmembersData && wfmembersData.length && wfmembersData.length > 0){
-                wfmembersData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.memberid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.wfmembers = wfmembersData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/wfgroups/${context.wfgroup}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_wfmembers',JSON.stringify(res.data.wfmembers));
+
             return res;
     }
 
@@ -222,6 +182,21 @@ export default class WFGroupServiceBase extends EntityService {
      */
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let tempData:any = JSON.parse(JSON.stringify(data));
-        return Http.getInstance().get(`/wfgroups/fetchdefault`,tempData,isloading);
+        let res:any = Http.getInstance().get(`/wfgroups/fetchdefault`,tempData,isloading);
+        return res;
+    }
+
+    /**
+     * searchDefault接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof WFGroupServiceBase
+     */
+    public async searchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        return Http.getInstance().post(`/wfgroups/searchdefault`,tempData,isloading);
     }
 }
\ No newline at end of file

app_Web/src/service/wfmember/wfmember-service-base.ts

@@ -49,12 +49,18 @@ export default class WFMemberServiceBase extends EntityService {
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.wfuser && context.wfmember){
-            return Http.getInstance().get(`/wfusers/${context.wfuser}/wfmembers/${context.wfmember}/select`,isloading);
+            let res:any = Http.getInstance().get(`/wfusers/${context.wfuser}/wfmembers/${context.wfmember}/select`,isloading);
+
+            return res;
         }
         if(context.wfgroup && context.wfmember){
-            return Http.getInstance().get(`/wfgroups/${context.wfgroup}/wfmembers/${context.wfmember}/select`,isloading);
+            let res:any = Http.getInstance().get(`/wfgroups/${context.wfgroup}/wfmembers/${context.wfmember}/select`,isloading);
+
+            return res;
         }
-            return Http.getInstance().get(`/wfmembers/${context.wfmember}/select`,isloading);
+            let res:any = Http.getInstance().get(`/wfmembers/${context.wfmember}/select`,isloading);
+
+            return res;
     }
 
     /**
@@ -78,6 +84,7 @@ export default class WFMemberServiceBase extends EntityService {
             }
             let tempContext:any = JSON.parse(JSON.stringify(context));
             let res:any = await Http.getInstance().post(`/wfusers/${context.wfuser}/wfmembers`,data,isloading);
+
             return res;
         }
         if(context.wfgroup && true){
@@ -91,6 +98,7 @@ export default class WFMemberServiceBase extends EntityService {
             }
             let tempContext:any = JSON.parse(JSON.stringify(context));
             let res:any = await Http.getInstance().post(`/wfgroups/${context.wfgroup}/wfmembers`,data,isloading);
+
             return res;
         }
         let masterData:any = {};
@@ -103,6 +111,7 @@ export default class WFMemberServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/wfmembers`,data,isloading);
+
         return res;
     }
 
@@ -120,17 +129,20 @@ export default class WFMemberServiceBase extends EntityService {
             let masterData:any = {};
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().put(`/wfusers/${context.wfuser}/wfmembers/${context.wfmember}`,data,isloading);
+
             return res;
         }
         if(context.wfgroup && context.wfmember){
             let masterData:any = {};
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().put(`/wfgroups/${context.wfgroup}/wfmembers/${context.wfmember}`,data,isloading);
+
             return res;
         }
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/wfmembers/${context.wfmember}`,data,isloading);
+
             return res;
     }
 
@@ -145,12 +157,15 @@ export default class WFMemberServiceBase extends EntityService {
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.wfuser && context.wfmember){
-            return Http.getInstance().delete(`/wfusers/${context.wfuser}/wfmembers/${context.wfmember}`,isloading);
+            let res:any = Http.getInstance().delete(`/wfusers/${context.wfuser}/wfmembers/${context.wfmember}`,isloading);
+            return res;
         }
         if(context.wfgroup && context.wfmember){
-            return Http.getInstance().delete(`/wfgroups/${context.wfgroup}/wfmembers/${context.wfmember}`,isloading);
+            let res:any = Http.getInstance().delete(`/wfgroups/${context.wfgroup}/wfmembers/${context.wfmember}`,isloading);
+            return res;
         }
-            return Http.getInstance().delete(`/wfmembers/${context.wfmember}`,isloading);
+            let res:any = Http.getInstance().delete(`/wfmembers/${context.wfmember}`,isloading);
+            return res;
     }
 
     /**
@@ -165,13 +180,16 @@ export default class WFMemberServiceBase extends EntityService {
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.wfuser && context.wfmember){
             let res:any = await Http.getInstance().get(`/wfusers/${context.wfuser}/wfmembers/${context.wfmember}`,isloading);
+
             return res;
         }
         if(context.wfgroup && context.wfmember){
             let res:any = await Http.getInstance().get(`/wfgroups/${context.wfgroup}/wfmembers/${context.wfmember}`,isloading);
+
             return res;
         }
             let res:any = await Http.getInstance().get(`/wfmembers/${context.wfmember}`,isloading);
+
             return res;
     }
 
@@ -188,15 +206,18 @@ export default class WFMemberServiceBase extends EntityService {
         if(context.wfuser && true){
             let res:any = await Http.getInstance().get(`/wfusers/${context.wfuser}/wfmembers/getdraft`,isloading);
             res.data.wfmember = data.wfmember;
+
             return res;
         }
         if(context.wfgroup && true){
             let res:any = await Http.getInstance().get(`/wfgroups/${context.wfgroup}/wfmembers/getdraft`,isloading);
             res.data.wfmember = data.wfmember;
+
             return res;
         }
         let res:any = await  Http.getInstance().get(`/wfmembers/getdraft`,isloading);
         res.data.wfmember = data.wfmember;
+
         return res;
     }
 
@@ -214,15 +235,18 @@ export default class WFMemberServiceBase extends EntityService {
             let masterData:any = {};
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/wfusers/${context.wfuser}/wfmembers/${context.wfmember}/checkkey`,data,isloading);
+
             return res;
         }
         if(context.wfgroup && context.wfmember){
             let masterData:any = {};
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/wfgroups/${context.wfgroup}/wfmembers/${context.wfmember}/checkkey`,data,isloading);
+
             return res;
         }
-            return Http.getInstance().post(`/wfmembers/${context.wfmember}/checkkey`,data,isloading);
+            let res:any = Http.getInstance().post(`/wfmembers/${context.wfmember}/checkkey`,data,isloading);
+            return res;
     }
 
     /**
@@ -239,17 +263,20 @@ export default class WFMemberServiceBase extends EntityService {
             let masterData:any = {};
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/wfusers/${context.wfuser}/wfmembers/${context.wfmember}/save`,data,isloading);
+
             return res;
         }
         if(context.wfgroup && context.wfmember){
             let masterData:any = {};
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/wfgroups/${context.wfgroup}/wfmembers/${context.wfmember}/save`,data,isloading);
+
             return res;
         }
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/wfmembers/${context.wfmember}/save`,data,isloading);
+
             return res;
     }
 
@@ -265,13 +292,38 @@ export default class WFMemberServiceBase extends EntityService {
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.wfuser && true){
             let tempData:any = JSON.parse(JSON.stringify(data));
-            return Http.getInstance().get(`/wfusers/${context.wfuser}/wfmembers/fetchdefault`,tempData,isloading);
+            let res:any = Http.getInstance().get(`/wfusers/${context.wfuser}/wfmembers/fetchdefault`,tempData,isloading);
+            return res;
+        }
+        if(context.wfgroup && true){
+            let tempData:any = JSON.parse(JSON.stringify(data));
+            let res:any = Http.getInstance().get(`/wfgroups/${context.wfgroup}/wfmembers/fetchdefault`,tempData,isloading);
+            return res;
+        }
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        let res:any = Http.getInstance().get(`/wfmembers/fetchdefault`,tempData,isloading);
+        return res;
+    }
+
+    /**
+     * searchDefault接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof WFMemberServiceBase
+     */
+    public async searchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.wfuser && true){
+            let tempData:any = JSON.parse(JSON.stringify(data));
+            return Http.getInstance().post(`/wfusers/${context.wfuser}/wfmembers/searchdefault`,tempData,isloading);
         }
         if(context.wfgroup && true){
             let tempData:any = JSON.parse(JSON.stringify(data));
-            return Http.getInstance().get(`/wfgroups/${context.wfgroup}/wfmembers/fetchdefault`,tempData,isloading);
+            return Http.getInstance().post(`/wfgroups/${context.wfgroup}/wfmembers/searchdefault`,tempData,isloading);
         }
         let tempData:any = JSON.parse(JSON.stringify(data));
-        return Http.getInstance().get(`/wfmembers/fetchdefault`,tempData,isloading);
+        return Http.getInstance().post(`/wfmembers/searchdefault`,tempData,isloading);
     }
 }
\ No newline at end of file

app_Web/src/service/wfprocess-definition/wfprocess-definition-service-base.ts

@@ -48,7 +48,9 @@ export default class WFProcessDefinitionServiceBase extends EntityService {
      * @memberof WFProcessDefinitionServiceBase
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().get(`/wfprocessdefinitions/${context.wfprocessdefinition}/select`,isloading);
+            let res:any = Http.getInstance().get(`/wfprocessdefinitions/${context.wfprocessdefinition}/select`,isloading);
+
+            return res;
     }
 
     /**
@@ -71,6 +73,7 @@ export default class WFProcessDefinitionServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/wfprocessdefinitions`,data,isloading);
+
         return res;
     }
 
@@ -87,6 +90,7 @@ export default class WFProcessDefinitionServiceBase extends EntityService {
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/wfprocessdefinitions/${context.wfprocessdefinition}`,data,isloading);
+
             return res;
     }
 
@@ -100,7 +104,8 @@ export default class WFProcessDefinitionServiceBase extends EntityService {
      * @memberof WFProcessDefinitionServiceBase
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().delete(`/wfprocessdefinitions/${context.wfprocessdefinition}`,isloading);
+            let res:any = Http.getInstance().delete(`/wfprocessdefinitions/${context.wfprocessdefinition}`,isloading);
+            return res;
     }
 
     /**
@@ -114,6 +119,7 @@ export default class WFProcessDefinitionServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/wfprocessdefinitions/${context.wfprocessdefinition}`,isloading);
+
             return res;
     }
 
@@ -129,6 +135,7 @@ export default class WFProcessDefinitionServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/wfprocessdefinitions/getdraft`,isloading);
         res.data.wfprocessdefinition = data.wfprocessdefinition;
+
         return res;
     }
 
@@ -142,7 +149,8 @@ export default class WFProcessDefinitionServiceBase extends EntityService {
      * @memberof WFProcessDefinitionServiceBase
      */
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().post(`/wfprocessdefinitions/${context.wfprocessdefinition}/checkkey`,data,isloading);
+            let res:any = Http.getInstance().post(`/wfprocessdefinitions/${context.wfprocessdefinition}/checkkey`,data,isloading);
+            return res;
     }
 
     /**
@@ -158,6 +166,7 @@ export default class WFProcessDefinitionServiceBase extends EntityService {
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/wfprocessdefinitions/${context.wfprocessdefinition}/save`,data,isloading);
+
             return res;
     }
 
@@ -172,6 +181,21 @@ export default class WFProcessDefinitionServiceBase extends EntityService {
      */
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let tempData:any = JSON.parse(JSON.stringify(data));
-        return Http.getInstance().get(`/wfprocessdefinitions/fetchdefault`,tempData,isloading);
+        let res:any = Http.getInstance().get(`/wfprocessdefinitions/fetchdefault`,tempData,isloading);
+        return res;
+    }
+
+    /**
+     * searchDefault接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof WFProcessDefinitionServiceBase
+     */
+    public async searchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        return Http.getInstance().post(`/wfprocessdefinitions/searchdefault`,tempData,isloading);
     }
 }
\ No newline at end of file

app_Web/src/service/wfremodel/wfremodel-service-base.ts

@@ -48,7 +48,9 @@ export default class WFREModelServiceBase extends EntityService {
      * @memberof WFREModelServiceBase
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().get(`/wfremodels/${context.wfremodel}/select`,isloading);
+            let res:any = Http.getInstance().get(`/wfremodels/${context.wfremodel}/select`,isloading);
+
+            return res;
     }
 
     /**
@@ -71,6 +73,7 @@ export default class WFREModelServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/wfremodels`,data,isloading);
+
         return res;
     }
 
@@ -87,6 +90,7 @@ export default class WFREModelServiceBase extends EntityService {
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/wfremodels/${context.wfremodel}`,data,isloading);
+
             return res;
     }
 
@@ -100,7 +104,8 @@ export default class WFREModelServiceBase extends EntityService {
      * @memberof WFREModelServiceBase
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().delete(`/wfremodels/${context.wfremodel}`,isloading);
+            let res:any = Http.getInstance().delete(`/wfremodels/${context.wfremodel}`,isloading);
+            return res;
     }
 
     /**
@@ -114,6 +119,7 @@ export default class WFREModelServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/wfremodels/${context.wfremodel}`,isloading);
+
             return res;
     }
 
@@ -129,6 +135,7 @@ export default class WFREModelServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/wfremodels/getdraft`,isloading);
         res.data.wfremodel = data.wfremodel;
+
         return res;
     }
 
@@ -142,7 +149,8 @@ export default class WFREModelServiceBase extends EntityService {
      * @memberof WFREModelServiceBase
      */
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            return Http.getInstance().post(`/wfremodels/${context.wfremodel}/checkkey`,data,isloading);
+            let res:any = Http.getInstance().post(`/wfremodels/${context.wfremodel}/checkkey`,data,isloading);
+            return res;
     }
 
     /**
@@ -158,6 +166,7 @@ export default class WFREModelServiceBase extends EntityService {
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/wfremodels/${context.wfremodel}/save`,data,isloading);
+
             return res;
     }
 
@@ -172,6 +181,21 @@ export default class WFREModelServiceBase extends EntityService {
      */
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let tempData:any = JSON.parse(JSON.stringify(data));
-        return Http.getInstance().get(`/wfremodels/fetchdefault`,tempData,isloading);
+        let res:any = Http.getInstance().get(`/wfremodels/fetchdefault`,tempData,isloading);
+        return res;
+    }
+
+    /**
+     * searchDefault接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof WFREModelServiceBase
+     */
+    public async searchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        return Http.getInstance().post(`/wfremodels/searchdefault`,tempData,isloading);
     }
 }
\ No newline at end of file

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

@@ -7,18 +7,21 @@
                     <i-col v-show="detailsModel.n_ccode_like.visible" :style="{}"  :sm="{ span: 24, offset: 0 }" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8, offset: 0 }">
               <app-form-item name='n_ccode_like' :itemRules="this.rules.n_ccode_like" class='' :caption="$t('entities.dictcatalog.default_searchform.details.n_ccode_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_ccode_like.error" :isEmptyCaption="false" labelPos="LEFT"> 
               <input-box v-model="data.n_ccode_like"  @enter="onEnter($event)"    :disabled="detailsModel.n_ccode_like.disabled" type='text'  style=""></input-box>
+          
           </app-form-item>
           
           </i-col>
           <i-col v-show="detailsModel.n_cname_like.visible" :style="{}"  :sm="{ span: 24, offset: 0 }" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8, offset: 0 }">
               <app-form-item name='n_cname_like' :itemRules="this.rules.n_cname_like" class='' :caption="$t('entities.dictcatalog.default_searchform.details.n_cname_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_cname_like.error" :isEmptyCaption="false" labelPos="LEFT"> 
               <input-box v-model="data.n_cname_like"  @enter="onEnter($event)"    :disabled="detailsModel.n_cname_like.disabled" type='text'  style=""></input-box>
+          
           </app-form-item>
           
           </i-col>
           <i-col v-show="detailsModel.n_cgroup_like.visible" :style="{}"  :sm="{ span: 24, offset: 0 }" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8, offset: 0 }">
               <app-form-item name='n_cgroup_like' :itemRules="this.rules.n_cgroup_like" class='' :caption="$t('entities.dictcatalog.default_searchform.details.n_cgroup_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_cgroup_like.error" :isEmptyCaption="false" labelPos="LEFT"> 
               <input-box v-model="data.n_cgroup_like"  @enter="onEnter($event)"    :disabled="detailsModel.n_cgroup_like.disabled" type='text'  style=""></input-box>
+          
           </app-form-item>
           
           </i-col>

app_Web/src/widgets/dict-catalog/default-searchform/default-searchform-service.ts

@@ -150,7 +150,6 @@ export default class DefaultService extends ControlService {
         });
     }
 
-
     /**
      * 添加数据
      *

app_Web/src/widgets/dict-catalog/main-form/main-form-service.ts

@@ -150,7 +150,6 @@ export default class MainService extends ControlService {
         });
     }
 
-
     /**
      * 添加数据
      *

app_Web/src/widgets/dict-catalog/main-grid/main-grid-model.ts

@@ -60,6 +60,7 @@ export default class MainModel {
           name: 'srfkey',
           prop: 'id',
           dataType: 'TEXT',
+          isEditable:true
         },
         {
           name: 'cname',