Skip to content

I
ibzwf
提交 a885975d 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

zhouweidong 发布系统代码

上级 30aa13e0
展开全部 显示空白字符变更
内嵌 并排
正在显示 包含 3666 行增加 和 1950 行删除
app_web/CHANGELOG.md
浏览文件 @ a885975d
## v7.0.0-alpha.20 [2020-10-18]
### Bug修复
修复获取数据对象的主状态值统一转字符串处理逻辑
修复表单空输入异常问题
修复下拉数据数据加载异常问题
修复表单分页图标重复发布异常
修复数据选择增加外键值附加数据回填逻辑
修复表格行编辑可设置数据主键和清空仿真主键问题
修复代码表返回数据不合法抛出的异常
修复表单值规则部分逻辑
修复导航类视图修改右侧表单数据时，只能跳转第一条数据BUG
### 功能新增及优化
#### 模板
新增动态表单支持
新增视图消息支持
新增表单、面板、工具栏、数据看板直接内容项支持
新增日历项支持标识属性和文本属性
新增应用组件包支持
新增导航工具栏权限控制支持
新增图表绘制最终参数
新增门户部件界面行为组权限校验
新增表单、表格数据对象方式新建、更新默认值
新增导航视图搜索框提示可搜索字段名称
新增部件逻辑插件支持
新增工具栏、工具栏项插件支持
优化调整代码表服务基类位置
#### 基础文件
新增动态表单组件、直接内容项组件、视图消息组组件和视图消息组件
优化导航类部件工具栏状态逻辑
修复表单空输入异常问题
修复下拉数据数据加载异常
修复关系页第一次进入不加载问题
## v7.0.0-alpha.19 [2020-9-13] ## v7.0.0-alpha.19 [2020-9-13]
### Bug修复 ### Bug修复
......
app_web/src/authservice/auth-service.ts
浏览文件 @ a885975d
import store from '@/store'; import store from '@/store';
import { Environment } from '@/environments/environment';
/** /**
* 实体权限服务 * 实体权限服务
* *
...@@ -115,8 +117,14 @@ export default class AuthService { ...@@ -115,8 +117,14 @@ export default class AuthService {
if(!this.$store.getters['authresource/getEnablePermissionValid']) { if(!this.$store.getters['authresource/getEnablePermissionValid']) {
return true; return true;
} }
if(Object.is(Environment.menuPermissionMode,"RT")){
return this.$store.getters['authresource/getAuthMenuWithRT'](item);
}else if(Object.is(Environment.menuPermissionMode,"RESOURCE")){
return this.$store.getters['authresource/getAuthMenuWithResource'](item);
}else{
return this.$store.getters['authresource/getAuthMenu'](item); return this.$store.getters['authresource/getAuthMenu'](item);
} }
}
/** /**
* 根据统一资源标识获取统一资源权限 * 根据统一资源标识获取统一资源权限
......
app_web/src/codelist/codelist-service.ts
浏览文件 @ a885975d
...@@ -149,10 +149,11 @@ export default class CodeListService { ...@@ -149,10 +149,11 @@ export default class CodeListService {
// 启用缓存 // 启用缓存
if(isEnableCache){ if(isEnableCache){
const callback:Function = (context:any ={},data:any ={},tag:string,promise:Promise<any>) =>{ const callback:Function = (context:any ={},data:any ={},tag:string,promise:Promise<any>) =>{
const callbackKey:string = `${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`;
promise.then((result:any) =>{ promise.then((result:any) =>{
if(result.length > 0){ if(result.length > 0){
CodeListService.codelistCached.set(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`,{items:result}); CodeListService.codelistCached.set(callbackKey,{items:result});
CodeListService.codelistCache.delete(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`); CodeListService.codelistCache.delete(callbackKey);
return resolve(result); return resolve(result);
}else{ }else{
return resolve([]); return resolve([]);
...@@ -162,8 +163,9 @@ export default class CodeListService { ...@@ -162,8 +163,9 @@ export default class CodeListService {
}) })
} }
// 加载完成,从本地缓存获取 // 加载完成,从本地缓存获取
if(CodeListService.codelistCached.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`)){ const key:string = `${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`;
let items:any = CodeListService.codelistCached.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`).items; if(CodeListService.codelistCached.get(key)){
let items:any = CodeListService.codelistCached.get(key).items;
if(items.length >0){ if(items.length >0){
if(new Date().getTime() <= codelist.getExpirationTime()){ if(new Date().getTime() <= codelist.getExpirationTime()){
return resolve(items); return resolve(items);
...@@ -172,11 +174,11 @@ export default class CodeListService { ...@@ -172,11 +174,11 @@ export default class CodeListService {
} }
if (codelist) { if (codelist) {
// 加载中，UI又需要数据，解决连续加载同一代码表问题 // 加载中，UI又需要数据，解决连续加载同一代码表问题
if(CodeListService.codelistCache.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`)){ if(CodeListService.codelistCache.get(key)){
callback(context,data,tag,CodeListService.codelistCache.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`)); callback(context,data,tag,CodeListService.codelistCache.get(key));
}else{ }else{
let result:Promise<any> = codelist.getItems(context,data,isloading); let result:Promise<any> = codelist.getItems(context,data,isloading);
CodeListService.codelistCache.set(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`,result); CodeListService.codelistCache.set(key,result);
codelist.setExpirationTime(new Date().getTime() + cacheTimeout); codelist.setExpirationTime(new Date().getTime() + cacheTimeout);
callback(context,data,tag,result); callback(context,data,tag,result);
} }
......
app_web/src/codelist/wfsystem-list.ts
浏览文件 @ a885975d
...@@ -106,6 +106,7 @@ export default class WFSystemList { ...@@ -106,6 +106,7 @@ export default class WFSystemList {
*/ */
public doItems(items: any[]): any[] { public doItems(items: any[]): any[] {
let _items: any[] = []; let _items: any[] = [];
if(items && items instanceof Array && items.length >0){
items.forEach((item: any) => { items.forEach((item: any) => {
let itemdata:any = {}; let itemdata:any = {};
Object.assign(itemdata,{id:item.pssystemid}); Object.assign(itemdata,{id:item.pssystemid});
...@@ -115,6 +116,7 @@ export default class WFSystemList { ...@@ -115,6 +116,7 @@ export default class WFSystemList {
_items.push(itemdata); _items.push(itemdata);
}); });
}
return _items; return _items;
} }
......
app_web/src/components/app-actionbar/app-actionbar.vue
浏览文件 @ a885975d
...@@ -66,7 +66,7 @@ export default class AppActionBar extends Vue { ...@@ -66,7 +66,7 @@ export default class AppActionBar extends Vue {
public created(){ public created(){
if (this.viewState) { if (this.viewState) {
this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => { this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
if (!Object.is(tag, "app-actionbar")) { if (!Object.is(tag, "all-portlet")) {
return; return;
} }
if(Object.is(action,'loadmodel')){ if(Object.is(action,'loadmodel')){
...@@ -107,7 +107,7 @@ export default class AppActionBar extends Vue { ...@@ -107,7 +107,7 @@ export default class AppActionBar extends Vue {
const _item = ActionModel[key]; const _item = ActionModel[key];
if(_item && _item['dataaccaction'] && UIService){ if(_item && _item['dataaccaction'] && UIService){
let dataActionResult:any; let dataActionResult:any;
if(Object.is(_item['actiontarget'],"NONE")){ if(Object.is(_item['actiontarget'],"NONE") || Object.is(_item['actiontarget'],"")){
dataActionResult = UIService.getResourceOPPrivs(_item['dataaccaction']); dataActionResult = UIService.getResourceOPPrivs(_item['dataaccaction']);
}else{ }else{
if(data && Object.keys(data).length >0){ if(data && Object.keys(data).length >0){
......
app_web/src/components/app-alert-group/app-alert-group.vue
浏览文件 @ a885975d
...@@ -4,7 +4,11 @@ ...@@ -4,7 +4,11 @@
<app-alert <app-alert
:key="index" :key="index"
:tag="item.tag" :tag="item.tag"
:position="item.position"/> :context="context"
:viewparam="viewparam"
:position="item.position"
:infoGroup="infoGroup"
:viewname="viewname"/>
</template> </template>
</div> </div>
...@@ -32,6 +36,23 @@ export default class AppAlertGroup extends Vue { ...@@ -32,6 +36,23 @@ export default class AppAlertGroup extends Vue {
*/ */
@Prop() infoGroup: any; @Prop() infoGroup: any;
/**
* 应用上下文
*
* @type {any}
* @memberof AppAlertGroup
*/
@Prop() context: any;
/**
* 视图参数
*
* @type {any}
* @memberof AppAlertGroup
*/
@Prop() viewparam: any;
/** /**
* 视图消息组显示位置 * 视图消息组显示位置
* *
...@@ -40,6 +61,14 @@ export default class AppAlertGroup extends Vue { ...@@ -40,6 +61,14 @@ export default class AppAlertGroup extends Vue {
*/ */
@Prop() position: any; @Prop() position: any;
/**
* 视图名称
*
* @type {any}
* @memberof AppAlertGroup
*/
@Prop() viewname: any;
/** /**
* 当前位置视图消息集合 * 当前位置视图消息集合
* *
......
app_web/src/components/app-alert/app-alert.vue
浏览文件 @ a885975d
...@@ -44,6 +44,39 @@ export default class AppAlert extends Vue { ...@@ -44,6 +44,39 @@ export default class AppAlert extends Vue {
*/ */
@Prop() position: any; @Prop() position: any;
/**
* 应用上下文
*
* @type {any}
* @memberof AppAlert
*/
@Prop() context: any;
/**
* 视图参数
*
* @type {any}
* @memberof AppAlert
*/
@Prop() viewparam: any;
/**
* 视图消息组tag
*
* @type {any}
* @memberof AppAlert
*/
@Prop() infoGroup!: any;
/**
* 视图名称
*
* @type {any}
* @memberof AppAlert
*/
@Prop() viewname!: any;
/** /**
* 视图消息对象 * 视图消息对象
* *
...@@ -79,7 +112,7 @@ export default class AppAlert extends Vue { ...@@ -79,7 +112,7 @@ export default class AppAlert extends Vue {
* @memberof AppAlert * @memberof AppAlert
*/ */
public async getData() { public async getData() {
let response: any = await this.viewMessageService.getViewMessageByTag(this.tag, null, null) let response: any = await this.viewMessageService.getViewMessageByTag(this.tag, this.context, this.viewparam);
if(response && response.length > 0) { if(response && response.length > 0) {
response.forEach((item: any) => { response.forEach((item: any) => {
let tempData: any = JSON.parse(JSON.stringify(item)); let tempData: any = JSON.parse(JSON.stringify(item));
...@@ -118,7 +151,8 @@ export default class AppAlert extends Vue { ...@@ -118,7 +151,8 @@ export default class AppAlert extends Vue {
data.showState = true; data.showState = true;
if(data.closeMode || data.closeMode == 0) { if(data.closeMode || data.closeMode == 0) {
if(data.closeMode == 1) { if(data.closeMode == 1) {
const id = this.$store.getters.getViewMessage(data.codename); const tag = this.viewname + '_' + this.infoGroup + '_' + data.codename;
const id = localStorage.getItem(tag);
if(id) { if(id) {
data.showState = false; data.showState = false;
flag = false; flag = false;
...@@ -182,14 +216,14 @@ export default class AppAlert extends Vue { ...@@ -182,14 +216,14 @@ export default class AppAlert extends Vue {
let tempArr: any[] = data.customClass.toString().split(','); let tempArr: any[] = data.customClass.toString().split(',');
if(tempArr && tempArr.length > 0) { if(tempArr && tempArr.length > 0) {
if(Object.is("1", tempArr[1])) { if(Object.is("1", tempArr[1])) {
const args = { tag: tempArr[0], id: data.customClass }; const tag = this.viewname + '_' + this.infoGroup + '_' + tempArr[0];
this.$store.commit('addViewMessage', args); localStorage.setItem(tag, data.customClass);
} }
} }
} }
if(data.closeMode && data.closeMode == 1) { if(data.closeMode && data.closeMode == 1) {
const args = {tag: data.codename, id: data.id}; const tag = this.viewname + '_' + this.infoGroup + '_' + data.codename;
this.$store.commit('addViewMessage', args); localStorage.setItem(tag,data.id);
} }
} }
......
app_web/src/components/app-breadcrumb/app-breadcrumb.vue
浏览文件 @ a885975d
<template> <template>
<el-breadcrumb class="app-breadcrumb" separator="/"> <el-breadcrumb class="app-breadcrumb" :separator="separator">
<transition-group name="breadcrumb"> <transition-group name="breadcrumb">
<template v-if="Object.is(this.navModel,'route')"> <template v-if="Object.is(this.navModel,'route')">
<el-breadcrumb-item v-for="(item, index) in breadcrumbs" :key="item.id"> <el-breadcrumb-item v-for="(item, index) in breadcrumbs" :key="item.id">
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
import { Component, Vue, Watch, Prop } from 'vue-property-decorator' import { Component, Vue, Watch, Prop } from 'vue-property-decorator'
import { RouteRecord, Route } from 'vue-router' import { RouteRecord, Route } from 'vue-router'
import { Environment } from "@/environments/environment"; import { Environment } from "@/environments/environment";
import { appConfig } from '@/config/appConfig';
import NavDataService from '@/service/app/navdata-service'; import NavDataService from '@/service/app/navdata-service';
import {Subscription } from 'rxjs'; import {Subscription } from 'rxjs';
...@@ -48,6 +49,13 @@ export default class Breadcrumb extends Vue { ...@@ -48,6 +49,13 @@ export default class Breadcrumb extends Vue {
*/ */
private breadcrumbs: Array<any> = []; private breadcrumbs: Array<any> = [];
/**
* 面包屑分隔符
*
* @memberof Breadcrumb
*/
private separator:string = appConfig.breadcrumbSeparator;
/** /**
* 导航服务 * 导航服务
* *
......
app_web/src/components/app-form-group/app-form-group.vue
浏览文件 @ a885975d
...@@ -165,7 +165,7 @@ export default class AppFormGroup extends Vue { ...@@ -165,7 +165,7 @@ export default class AppFormGroup extends Vue {
const _item = ActionModel[key]; const _item = ActionModel[key];
if(_item && _item['dataaccaction'] && UIService){ if(_item && _item['dataaccaction'] && UIService){
let dataActionResult:any; let dataActionResult:any;
if(Object.is(_item['actiontarget'],"NONE")){ if(Object.is(_item['actiontarget'],"NONE") || Object.is(_item['actiontarget'],"")){
dataActionResult = UIService.getResourceOPPrivs(_item['dataaccaction']); dataActionResult = UIService.getResourceOPPrivs(_item['dataaccaction']);
}else{ }else{
if(data && Object.keys(data).length >0){ if(data && Object.keys(data).length >0){
......
app_web/src/components/app-image-preview/app-image-preview.vue
浏览文件 @ a885975d
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</ul> </ul>
<!-- 预览 --> <!-- 预览 -->
<modal v-model="dialogVisible" footer-hide width="auto" class-name='app-image-preview-model'> <modal v-model="dialogVisible" footer-hide width="auto" class-name='app-image-preview-model'>
<el-image src="dialogImageUrl"> <el-image :src="dialogImageUrl">
<div slot='error' class='image-slot'> <div slot='error' class='image-slot'>
<img src="/assets/img/picture.png"> <img src="/assets/img/picture.png">
</div> </div>
......
app_web/src/components/app-image-upload/app-image-upload.vue
浏览文件 @ a885975d
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
</el-upload> </el-upload>
<!-- 预览 --> <!-- 预览 -->
<modal v-model="dialogVisible" footer-hide class-name='app-image-upload-model'> <modal v-model="dialogVisible" footer-hide class-name='app-image-upload-model'>
<el-image src="dialogImageUrl"> <el-image :src="dialogImageUrl">
<div slot='error' class='image-slot'> <div slot='error' class='image-slot'>
<i class='el-icon-picture-outline'></i> <i class='el-icon-picture-outline'></i>
</div> </div>
......
app_web/src/components/app-picker/app-picker.vue
浏览文件 @ a885975d
...@@ -65,7 +65,7 @@ export default class AppPicker extends Vue { ...@@ -65,7 +65,7 @@ export default class AppPicker extends Vue {
* 视图上下文 * 视图上下文
* *
* @type {*} * @type {*}
* @memberof AppFormDRUIPart * @memberof AppPicker
*/ */
@Prop() public context!: any; @Prop() public context!: any;
...@@ -73,7 +73,7 @@ export default class AppPicker extends Vue { ...@@ -73,7 +73,7 @@ export default class AppPicker extends Vue {
* 视图参数 * 视图参数
* *
* @type {*} * @type {*}
* @memberof AppFormDRUIPart * @memberof AppPicker
*/ */
@Prop() public viewparams!: any; @Prop() public viewparams!: any;
...@@ -81,15 +81,23 @@ export default class AppPicker extends Vue { ...@@ -81,15 +81,23 @@ export default class AppPicker extends Vue {
* AC参数 * AC参数
* *
* @type {*} * @type {*}
* @memberof AppFormDRUIPart * @memberof AppPicker
*/ */
@Prop({default: () => {}}) public acParams?: any; @Prop({default: () => {}}) public acParams?: any;
/**
* 外键值附加数据
*
* @type {*}
* @memberof AppPicker
*/
@Prop() public pickUpData?: string;
/** /**
* 表单服务 * 表单服务
* *
* @type {*} * @type {*}
* @memberof AppFormDRUIPart * @memberof AppPicker
*/ */
@Prop() public service?: any; @Prop() public service?: any;
...@@ -97,7 +105,7 @@ export default class AppPicker extends Vue { ...@@ -97,7 +105,7 @@ export default class AppPicker extends Vue {
* 应用实体主信息属性名称 * 应用实体主信息属性名称
* *
* @type {string} * @type {string}
* @memberof AppAutocomplete * @memberof AppPicker
*/ */
@Prop({default: 'srfmajortext'}) public deMajorField!: string; @Prop({default: 'srfmajortext'}) public deMajorField!: string;
...@@ -105,7 +113,7 @@ export default class AppPicker extends Vue { ...@@ -105,7 +113,7 @@ export default class AppPicker extends Vue {
* 应用实体主键属性名称 * 应用实体主键属性名称
* *
* @type {string} * @type {string}
* @memberof AppAutocomplete * @memberof AppPicker
*/ */
@Prop({default: 'srfkey'}) public deKeyField!: string; @Prop({default: 'srfkey'}) public deKeyField!: string;
...@@ -240,7 +248,7 @@ export default class AppPicker extends Vue { ...@@ -240,7 +248,7 @@ export default class AppPicker extends Vue {
* 输入状态 * 输入状态
* *
* @type {boolean} * @type {boolean}
* @memberof AppAutocomplete * @memberof AppPicker
*/ */
public inputState: boolean = false; public inputState: boolean = false;
...@@ -397,6 +405,7 @@ export default class AppPicker extends Vue { ...@@ -397,6 +405,7 @@ export default class AppPicker extends Vue {
if (this.name) { if (this.name) {
this.$emit('formitemvaluechange', { name: this.name, value: item[this.deMajorField] }); this.$emit('formitemvaluechange', { name: this.name, value: item[this.deMajorField] });
} }
this.fillPickUpData(item);
} }
/** /**
...@@ -430,6 +439,7 @@ export default class AppPicker extends Vue { ...@@ -430,6 +439,7 @@ export default class AppPicker extends Vue {
if (this.name) { if (this.name) {
this.$emit('formitemvaluechange', { name: this.name, value: '' }); this.$emit('formitemvaluechange', { name: this.name, value: '' });
} }
this.fillPickUpData();
this.$forceUpdate(); this.$forceUpdate();
} }
...@@ -672,6 +682,7 @@ export default class AppPicker extends Vue { ...@@ -672,6 +682,7 @@ export default class AppPicker extends Vue {
if (this.name) { if (this.name) {
this.$emit('formitemvaluechange', { name: this.name, value: item[this.deMajorField]?item[this.deMajorField]:item["srfmajortext"] }); this.$emit('formitemvaluechange', { name: this.name, value: item[this.deMajorField]?item[this.deMajorField]:item["srfmajortext"] });
} }
this.fillPickUpData(item);
} }
} }
...@@ -752,7 +763,7 @@ export default class AppPicker extends Vue { ...@@ -752,7 +763,7 @@ export default class AppPicker extends Vue {
/** /**
* 输入过程中 * 输入过程中
* *
* @memberof AppAutocomplete * @memberof AppPicker
*/ */
public onInput($event: any) { public onInput($event: any) {
if (Object.is($event, this.value)) { if (Object.is($event, this.value)) {
...@@ -784,6 +795,34 @@ export default class AppPicker extends Vue { ...@@ -784,6 +795,34 @@ export default class AppPicker extends Vue {
} }
} }
/**
* 填充外键值附加数据
*
* @param {item} 数据集
* @memberof AppPicker
*/
public fillPickUpData(item?:any){
if(this.pickUpData){
let pickUpDataArray:Array<any> = this.pickUpData.split(";")
if(pickUpDataArray && pickUpDataArray.length >0){
for(let i=0;i<pickUpDataArray.length;i++){
if(item){
this.$emit("formitemvaluechange", {
name: pickUpDataArray[i],
value: item[pickUpDataArray[i]],
});
}else{
this.$emit("formitemvaluechange", {
name: pickUpDataArray[i],
value: "",
});
}
}
}
}
}
} }
</script> </script>
......
app_web/src/components/avue-custom-form/avue-custom-form.vue
浏览文件 @ a885975d
...@@ -20,10 +20,10 @@ export default class AvueCustomForm extends Vue { ...@@ -20,10 +20,10 @@ export default class AvueCustomForm extends Vue {
/** /**
* 编辑器参数传入组件配置 * 编辑器参数传入组件配置
* *
* @type {any} * @type {*}
* @memberof AvueCustomForm * @memberof AvueCustomForm
*/ */
@Prop() public options?: any; public options: any;
/** /**
* 是否需要转换为string类型 * 是否需要转换为string类型
...@@ -47,7 +47,7 @@ export default class AvueCustomForm extends Vue { ...@@ -47,7 +47,7 @@ export default class AvueCustomForm extends Vue {
* @type {any} * @type {any}
* @memberof AvueCustomForm * @memberof AvueCustomForm
*/ */
@Model('change') public value: any; @Model("change") public value: any;
/** /**
* 是否将表单数据通过组件配置带入组件中 * 是否将表单数据通过组件配置带入组件中
...@@ -57,13 +57,22 @@ export default class AvueCustomForm extends Vue { ...@@ -57,13 +57,22 @@ export default class AvueCustomForm extends Vue {
*/ */
@Prop() public isFormData?: boolean; @Prop() public isFormData?: boolean;
/**
* 是否为子表单
*
* @type {boolean}
* @memberof AvueCustomForm
*/
@Prop() public isSubForm?: boolean;
/** /**
* 表单数据 * 表单数据
* *
* @type {any} * @type {*}
* @memberof AvueCustomForm * @memberof AvueCustomForm
*/ */
@Prop() public formData: any; @Prop()
public formData?: any;
/** /**
* 表单状态 * 表单状态
...@@ -84,6 +93,8 @@ export default class AvueCustomForm extends Vue { ...@@ -84,6 +93,8 @@ export default class AvueCustomForm extends Vue {
if (this.value) { if (this.value) {
if (this.isParseString) obj = JSON.parse(this.value); if (this.isParseString) obj = JSON.parse(this.value);
else obj = this.value; else obj = this.value;
if (this.isSubForm && obj instanceof Array)
obj = this.loadSubFormData(obj);
} }
return obj; return obj;
} }
...@@ -110,7 +121,7 @@ export default class AvueCustomForm extends Vue { ...@@ -110,7 +121,7 @@ export default class AvueCustomForm extends Vue {
/** /**
* 当前组件配置设置属性 * 当前组件配置设置属性
* *
* @type {any} * @type {*}
* @memberof AvueCustomForm * @memberof AvueCustomForm
*/ */
public formOption: any = null; public formOption: any = null;
...@@ -118,7 +129,7 @@ export default class AvueCustomForm extends Vue { ...@@ -118,7 +129,7 @@ export default class AvueCustomForm extends Vue {
/** /**
* avue-form默认配置 * avue-form默认配置
* *
* @type {any} * @type {*}
* @memberof AvueCustomForm * @memberof AvueCustomForm
*/ */
public defaultOptions: any = { public defaultOptions: any = {
...@@ -185,22 +196,26 @@ export default class AvueCustomForm extends Vue { ...@@ -185,22 +196,26 @@ export default class AvueCustomForm extends Vue {
* *
* @memberof AvueCustomForm * @memberof AvueCustomForm
*/ */
public load() { public async load() {
let that: any = this; let that: any = this;
if (!this.options && this.options == null) { if (!this.options && this.options == null) {
if (this.url && this.options == null) { if (this.url && this.options == null) {
const get: Promise<any> = this.$http.get(this.url); const get: Promise<any> = this.$http.get(this.url);
get.then((response: any) => { await get.then((response: any) => {
if (response && response.data) { if (response && response.data) {
that.formOption = response.data; let options: any = response.data;
if (this.isFormData) that.getFormData(); this.transitionDicUrlCondition(options);
that.formOption = options;
if (that.isFormData) that.getFormData();
} }
}); });
} else { } else {
this.transitionDicUrlCondition(this.defaultOptions);
this.formOption = this.defaultOptions; this.formOption = this.defaultOptions;
if (this.isFormData) that.getFormData(); if (this.isFormData) that.getFormData();
} }
} else { } else {
this.transitionDicUrlCondition(this.options);
this.formOption = this.options; this.formOption = this.options;
if (this.isFormData) that.getFormData(); if (this.isFormData) that.getFormData();
} }
...@@ -239,18 +254,77 @@ export default class AvueCustomForm extends Vue { ...@@ -239,18 +254,77 @@ export default class AvueCustomForm extends Vue {
* @memberof AvueCustomForm * @memberof AvueCustomForm
*/ */
public setValue(value: any) { public setValue(value: any) {
if (this.isSubForm) value = this.getSubFormData(value);
if (this.isParseString) this.$emit("change", JSON.stringify(value)); if (this.isParseString) this.$emit("change", JSON.stringify(value));
else this.$emit("change", value); else this.$emit("change", value);
} }
/**
* 提取第一个属性值
*
* @memberof AvueCustomForm
* @return {Array<any>}
*/
public getSubFormData(value: any): Array<any> {
let arr: Array<any> = [];
for (let val in value) {
arr = value[val];
break;
}
return arr;
}
/**
* 加载子表单值
*
* @memberof AvueCustomForm
* @return {*}
*/
public loadSubFormData(arr: Array<any>): any {
let value: any = {};
value[this.formOption.column[0].prop] = arr;
return value;
}
/**
* 配置的下拉列表转换符号支持动态配置
*
* @memberof AvueCustomForm
* @param {*}
*/
public transitionDicUrlCondition(options: any) {
let that: any = this;
let recursive: any = function (obj: any) {
if (obj.column && obj.column.length > 0) {
obj.column.forEach((col: any) => {
if (col.dicUrl && col.dicUrl.indexOf("$") > 0) {
let g = /\${[^+]+}/;
let dicGroup = col.dicUrl.match(g);
dicGroup.forEach((dic: any) => {
col.dicUrl = col.dicUrl.replace(
dic,
that.formData[dic.substring(2, dic.length - 1)]
);
});
}
if (col.children) recursive(col.children);
if (col.group) recursive(col.group);
});
}
if (obj.children) recursive(obj.children);
if (obj.group) recursive(obj.group);
};
recursive(options);
}
/** /**
* 销毁组件(vue生命周期) * 销毁组件(vue生命周期)
* *
* @type {Subject<any>} * @type {Subject<any>}
* @memberof AvueCustomForm * @memberof AvueCustomForm
*/ */
public destroy(){ public destroy() {
if(this.formStateEvent){ if (this.formStateEvent) {
this.formStateEvent.unsubscribe(); this.formStateEvent.unsubscribe();
} }
} }
......
app_web/src/config/appConfig.ts
浏览文件 @ a885975d
...@@ -35,5 +35,7 @@ export const appConfig = { ...@@ -35,5 +35,7 @@ export const appConfig = {
label: 'YouYuan', label: 'YouYuan',
value: 'YouYuan', value: 'YouYuan',
}, },
] ],
// 面包屑分隔符
breadcrumbSeparator:"/"
} }
\ No newline at end of file
app_web/src/engine/view/md-view-engine.ts
浏览文件 @ a885975d
...@@ -401,10 +401,10 @@ export default class MDViewEngine extends ViewEngine { ...@@ -401,10 +401,10 @@ export default class MDViewEngine extends ViewEngine {
if (this.view.viewparams && Object.keys(this.view.viewparams).length > 0) { if (this.view.viewparams && Object.keys(this.view.viewparams).length > 0) {
Object.assign(arg, this.view.viewparams); Object.assign(arg, this.view.viewparams);
} }
if (this.getSearchForm() && this.view.isExpandSearchForm) { if (this.getSearchForm()) {
Object.assign(arg, this.getSearchForm().getData()); Object.assign(arg, this.getSearchForm().getData());
} }
if (this.view && this.view.$refs.searchbar && this.view.isExpandSearchForm) { if (this.view && this.view.$refs.searchbar) {
Object.assign(arg, this.view.$refs.searchbar.getData()); Object.assign(arg, this.view.$refs.searchbar.getData());
} }
if (this.view && !this.view.isExpandSearchForm) { if (this.view && !this.view.isExpandSearchForm) {
......
app_web/src/engine/view/view-engine.ts
浏览文件 @ a885975d
...@@ -194,7 +194,7 @@ export default class ViewEngine { ...@@ -194,7 +194,7 @@ export default class ViewEngine {
const _item = _this.view.toolBarModels[key]; const _item = _this.view.toolBarModels[key];
if(_item && _item['dataaccaction'] && _this.view.appUIService){ if(_item && _item['dataaccaction'] && _this.view.appUIService){
let dataActionResult:any; let dataActionResult:any;
if (_item.uiaction && (Object.is(_item.uiaction.target, 'NONE'))){ if (_item.uiaction && (Object.is(_item.uiaction.target, "NONE") || Object.is(_item.uiaction.target, ""))){
dataActionResult = _this.view.appUIService.getResourceOPPrivs(_item['dataaccaction']); dataActionResult = _this.view.appUIService.getResourceOPPrivs(_item['dataaccaction']);
}else{ }else{
if(data && Object.keys(data).length >0){ if(data && Object.keys(data).length >0){
......
app_web/src/engine/view/wizard-view-engine.ts
浏览文件 @ a885975d
...@@ -78,7 +78,11 @@ export default class WizardViewEngine extends ViewEngine { ...@@ -78,7 +78,11 @@ export default class WizardViewEngine extends ViewEngine {
*/ */
public onfinish(args: any): void { public onfinish(args: any): void {
this.view.$emit('viewdataschange', [args]); this.view.$emit('viewdataschange', [args]);
if(!this.view.viewDefaultUsage){
this.view.$emit('close', null); this.view.$emit('close', null);
}else{
this.view.$tabPageExp.onClose(this.view.$route.fullPath);
}
} }
/** /**
......
app_web/src/environments/environment.ts
浏览文件 @ a885975d
...@@ -25,6 +25,8 @@ export const Environment = { ...@@ -25,6 +25,8 @@ export const Environment = {
devMode: true, devMode: true,
// 是否开启权限认证 // 是否开启权限认证
enablePermissionValid:false, enablePermissionValid:false,
// 菜单权限模式，可选值：RT(RT模式),RESOURCE(资源模式),MINIX(混合模式),默认MINIX
menuPermissionMode:"MINIX",
// 项目模板地址 // 项目模板地址
ProjectUrl: "http://demo.ibizlab.cn/ibizr7pfstdtempl/ibizvuer7", ProjectUrl: "http://demo.ibizlab.cn/ibizr7pfstdtempl/ibizvuer7",
// 打开目标工具，可选参数：sln、mos // 打开目标工具，可选参数：sln、mos
......
app_web/src/message/view-message-service.ts
浏览文件 @ a885975d
...@@ -201,7 +201,7 @@ export default class ViewMessageService { ...@@ -201,7 +201,7 @@ export default class ViewMessageService {
public async getViewMessageByTag(tag:string,context:any = {},viewparam:any = {}){ public async getViewMessageByTag(tag:string,context:any = {},viewparam:any = {}){
let messageService:any = await this.getService(tag); let messageService:any = await this.getService(tag);
if(messageService.dynamicMode && Object.is(messageService.dynamicMode,"STATIC")){ if(messageService.dynamicMode && Object.is(messageService.dynamicMode,"STATIC")){
return messageService.getStaticViewMessage(); return messageService.getStaticViewMessage(context,viewparam);
}else{ }else{
return messageService.getDynamicViewMessage(tag,messageService,context,viewparam); return messageService.getDynamicViewMessage(tag,messageService,context,viewparam);
} }
...@@ -210,9 +210,14 @@ export default class ViewMessageService { ...@@ -210,9 +210,14 @@ export default class ViewMessageService {
/** /**
* 转化消息模板标题和内容 * 转化消息模板标题和内容
* *
* @target {*} target 返回目标数据
* @param {*} context 应用上下文
* @param {*} viewparam 视图参数
* @param {*} item 源数据
*
* @memberof ViewMessageService * @memberof ViewMessageService
*/ */
public translateMessageTemp(target:any,item?:any){ public translateMessageTemp(target:any,context:any,viewparam:any,item?:any){
} }
...@@ -221,7 +226,7 @@ export default class ViewMessageService { ...@@ -221,7 +226,7 @@ export default class ViewMessageService {
* *
* @memberof ViewMessageService * @memberof ViewMessageService
*/ */
public getStaticViewMessage():Array<ViewMessage>{ public getStaticViewMessage(context:any,viewparam:any):Array<ViewMessage>{
let returnViewMessage:ViewMessage ={ let returnViewMessage:ViewMessage ={
id:this.id, id:this.id,
name:this.name, name:this.name,
...@@ -236,7 +241,7 @@ export default class ViewMessageService { ...@@ -236,7 +241,7 @@ export default class ViewMessageService {
dynamicMode:this.dynamicMode, dynamicMode:this.dynamicMode,
messageType:this.messageType messageType:this.messageType
}; };
this.translateMessageTemp(returnViewMessage); this.translateMessageTemp(returnViewMessage,context,viewparam);
return [returnViewMessage]; return [returnViewMessage];
} }
...@@ -259,10 +264,11 @@ export default class ViewMessageService { ...@@ -259,10 +264,11 @@ export default class ViewMessageService {
// 启用缓存 // 启用缓存
if(isEnableCache){ if(isEnableCache){
const callback:Function = (context:any ={},data:any ={},tag:string,promise:Promise<any>) =>{ const callback:Function = (context:any ={},data:any ={},tag:string,promise:Promise<any>) =>{
const callbackKey:string = `${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`;
promise.then((result:any) =>{ promise.then((result:any) =>{
if(result.length > 0){ if(result.length > 0){
ViewMessageService.messageCached.set(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`,{items:result}); ViewMessageService.messageCached.set(callbackKey,{items:result});
ViewMessageService.messageCache.delete(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`); ViewMessageService.messageCache.delete(callbackKey);
return resolve(result); return resolve(result);
}else{ }else{
return resolve([]); return resolve([]);
...@@ -271,9 +277,10 @@ export default class ViewMessageService { ...@@ -271,9 +277,10 @@ export default class ViewMessageService {
return reject(result); return reject(result);
}) })
} }
const key:string = `${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`;
// 加载完成,从本地缓存获取 // 加载完成,从本地缓存获取
if(ViewMessageService.messageCached.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`)){ if(ViewMessageService.messageCached.get(key)){
let items:any = ViewMessageService.messageCached.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`).items; let items:any = ViewMessageService.messageCached.get(key).items;
if(items.length >0){ if(items.length >0){
if(new Date().getTime() <= messageService.getExpirationTime()){ if(new Date().getTime() <= messageService.getExpirationTime()){
return resolve(items); return resolve(items);
...@@ -282,11 +289,11 @@ export default class ViewMessageService { ...@@ -282,11 +289,11 @@ export default class ViewMessageService {
} }
if (messageService) { if (messageService) {
// 加载中，UI又需要数据，解决连续加载同一代码表问题 // 加载中，UI又需要数据，解决连续加载同一代码表问题
if(ViewMessageService.messageCache.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`)){ if(ViewMessageService.messageCache.get(key)){
callback(context,data,tag,ViewMessageService.messageCache.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`)); callback(context,data,tag,ViewMessageService.messageCache.get(key));
}else{ }else{
let result:Promise<any> = messageService.getItems(context,data,isloading); let result:Promise<any> = messageService.getItems(context,data,isloading);
ViewMessageService.messageCache.set(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`,result); ViewMessageService.messageCache.set(key,result);
messageService.setExpirationTime(new Date().getTime() + cacheTimeout); messageService.setExpirationTime(new Date().getTime() + cacheTimeout);
callback(context,data,tag,result); callback(context,data,tag,result);
} }
......
app_web/src/pages/workflow/wfgroup-mpickup-view/wfgroup-mpickup-view-base.vue
浏览文件 @ a885975d
...@@ -2,7 +2,11 @@ ...@@ -2,7 +2,11 @@
<div class="view-container dempickupview wfgroup-mpickup-view"> <div class="view-container dempickupview wfgroup-mpickup-view">
<app-studioaction :viewTitle="$t(model.srfCaption)" viewName="wfgroupmpickupview"></app-studioaction> <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="wfgroupmpickupview"></app-studioaction>
<card class='view-card view-no-caption view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false"> <card class='view-card view-no-caption view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false">
<div class='view-top-messages'>
</div>
<div class="content-container pickup-view"> <div class="content-container pickup-view">
<div class='view-body-messages'>
</div>
<div class="translate-contant"> <div class="translate-contant">
<div class="center" :style="{width : !isShowButton ? '100%' : ''}"> <div class="center" :style="{width : !isShowButton ? '100%' : ''}">
<view_pickupviewpanel <view_pickupviewpanel
...@@ -58,6 +62,8 @@ ...@@ -58,6 +62,8 @@
</row> </row>
</card> </card>
</div> </div>
<div class='view-bottom-messages'>
</div>
</card> </card>
</div> </div>
</template> </template>
...@@ -312,6 +318,23 @@ export default class WFGroupMPickupViewBase extends Vue { ...@@ -312,6 +318,23 @@ export default class WFGroupMPickupViewBase extends Vue {
*/ */
public serviceStateEvent: Subscription | undefined; public serviceStateEvent: Subscription | undefined;
/**
* 门户部件状态对象
*
* @type {*}
* @memberof WFGroupMPickupViewBase
*/
@Prop() public portletState?: any;
/**
* 门户部件状态事件
*
* @public
* @type {(Subscription | undefined)}
* @memberof WFGroupMPickupViewBase
*/
public portletStateEvent: Subscription | undefined;
/** /**
* 应用上下文 * 应用上下文
* *
...@@ -525,6 +548,16 @@ export default class WFGroupMPickupViewBase extends Vue { ...@@ -525,6 +548,16 @@ export default class WFGroupMPickupViewBase extends Vue {
}); });
} }
}); });
if(_this.portletState){
_this.portletStateEvent = _this.portletState.subscribe((res:any) =>{
if(!Object.is(res.name,'calendar-view9')){
return;
}
if(Object.is(res.action,'refresh') && _this.refresh && _this.refresh instanceof Function){
_this.refresh();
}
})
}
} }
...@@ -658,6 +691,9 @@ export default class WFGroupMPickupViewBase extends Vue { ...@@ -658,6 +691,9 @@ export default class WFGroupMPickupViewBase extends Vue {
} }
}) })
} }
if(this.portletStateEvent){
this.portletStateEvent.unsubscribe();
}
} }
/** /**
* 是否显示按钮 * 是否显示按钮
......
app_web/src/pages/workflow/wfgroup-mpickup-view/wfgroup-mpickup-view.less
浏览文件 @ a885975d
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
.pickup-view { .pickup-view {
>.translate-contant { >.translate-contant {
overflow: auto;
flex-grow: 1; flex-grow: 1;
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
......
app_web/src/pages/workflow/wfgroup-pickup-grid-view/wfgroup-pickup-grid-view-base.vue
浏览文件 @ a885975d
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
<div class='view-container depickupgridview wfgroup-pickup-grid-view'> <div class='view-container depickupgridview wfgroup-pickup-grid-view'>
<app-studioaction :viewTitle="$t(model.srfCaption)" viewName="wfgrouppickupgridview"></app-studioaction> <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="wfgrouppickupgridview"></app-studioaction>
<card class='view-card view-no-caption view-no-toolbar' :dis-hover="true" :bordered="false"> <card class='view-card view-no-caption view-no-toolbar' :dis-hover="true" :bordered="false">
<div class='view-top-messages'>
</div>
<div class='content-container pickup-grid-view'> <div class='content-container pickup-grid-view'>
<view_searchform <view_searchform
:viewState="viewState" :viewState="viewState"
...@@ -19,7 +21,7 @@ ...@@ -19,7 +21,7 @@
@load="searchform_load($event)" @load="searchform_load($event)"
@closeview="closeView($event)"> @closeview="closeView($event)">
</view_searchform> </view_searchform>
<view_grid <div class='view-body-messages'> </div> <view_grid
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
...@@ -41,6 +43,8 @@ ...@@ -41,6 +43,8 @@
@closeview="closeView($event)"> @closeview="closeView($event)">
</view_grid> </view_grid>
</div> </div>
<div class='view-bottom-messages'>
</div>
</card> </card>
</div> </div>
</template> </template>
...@@ -216,6 +220,18 @@ export default class WFGroupPickupGridViewBase extends Vue { ...@@ -216,6 +220,18 @@ export default class WFGroupPickupGridViewBase extends Vue {
view_searchform: { name: 'searchform', type: 'SEARCHFORM' }, view_searchform: { name: 'searchform', type: 'SEARCHFORM' },
}; };
/**
* 视图刷新
*
* @param {*} args
* @memberof WFGroupPickupGridViewBase
*/
public refresh(args?: any): void {
const refs: any = this.$refs;
if (refs && refs.grid) {
refs.grid.refresh();
}
}
/** /**
* 计数器刷新 * 计数器刷新
* *
...@@ -285,6 +301,23 @@ export default class WFGroupPickupGridViewBase extends Vue { ...@@ -285,6 +301,23 @@ export default class WFGroupPickupGridViewBase extends Vue {
*/ */
public serviceStateEvent: Subscription | undefined; public serviceStateEvent: Subscription | undefined;
/**
* 门户部件状态对象
*
* @type {*}
* @memberof WFGroupPickupGridViewBase
*/
@Prop() public portletState?: any;
/**
* 门户部件状态事件
*
* @public
* @type {(Subscription | undefined)}
* @memberof WFGroupPickupGridViewBase
*/
public portletStateEvent: Subscription | undefined;
/** /**
* 应用上下文 * 应用上下文
* *
...@@ -498,6 +531,16 @@ export default class WFGroupPickupGridViewBase extends Vue { ...@@ -498,6 +531,16 @@ export default class WFGroupPickupGridViewBase extends Vue {
}); });
} }
}); });
if(_this.portletState){
_this.portletStateEvent = _this.portletState.subscribe((res:any) =>{
if(!Object.is(res.name,'calendar-view9')){
return;
}
if(Object.is(res.action,'refresh') && _this.refresh && _this.refresh instanceof Function){
_this.refresh();
}
})
}
} }
...@@ -675,6 +718,9 @@ export default class WFGroupPickupGridViewBase extends Vue { ...@@ -675,6 +718,9 @@ export default class WFGroupPickupGridViewBase extends Vue {
} }
}) })
} }
if(this.portletStateEvent){
this.portletStateEvent.unsubscribe();
}
} }
/** /**
* 选中数据字符串 * 选中数据字符串
......
app_web/src/pages/workflow/wfgroup-pickup-view/wfgroup-pickup-view-base.vue
浏览文件 @ a885975d
...@@ -2,7 +2,11 @@ ...@@ -2,7 +2,11 @@
<div class="view-container depickupview wfgroup-pickup-view"> <div class="view-container depickupview wfgroup-pickup-view">
<app-studioaction :viewTitle="$t(model.srfCaption)" viewName="wfgrouppickupview"></app-studioaction> <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="wfgrouppickupview"></app-studioaction>
<card class='view-card view-no-caption view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false"> <card class='view-card view-no-caption view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false">
<div class='view-top-messages'>
</div>
<div class="content-container pickup-view"> <div class="content-container pickup-view">
<div class='view-body-messages'>
</div>
<view_pickupviewpanel <view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
:viewparams="JSON.parse(JSON.stringify(viewparams))" :viewparams="JSON.parse(JSON.stringify(viewparams))"
...@@ -25,6 +29,8 @@ ...@@ -25,6 +29,8 @@
</row> </row>
</card> </card>
</div> </div>
<div class='view-bottom-messages'>
</div>
</card> </card>
</div> </div>
</template> </template>
...@@ -278,6 +284,23 @@ export default class WFGroupPickupViewBase extends Vue { ...@@ -278,6 +284,23 @@ export default class WFGroupPickupViewBase extends Vue {
*/ */
public serviceStateEvent: Subscription | undefined; public serviceStateEvent: Subscription | undefined;
/**
* 门户部件状态对象
*
* @type {*}
* @memberof WFGroupPickupViewBase
*/
@Prop() public portletState?: any;
/**
* 门户部件状态事件
*
* @public
* @type {(Subscription | undefined)}
* @memberof WFGroupPickupViewBase
*/
public portletStateEvent: Subscription | undefined;
/** /**
* 应用上下文 * 应用上下文
* *
...@@ -491,6 +514,16 @@ export default class WFGroupPickupViewBase extends Vue { ...@@ -491,6 +514,16 @@ export default class WFGroupPickupViewBase extends Vue {
}); });
} }
}); });
if(_this.portletState){
_this.portletStateEvent = _this.portletState.subscribe((res:any) =>{
if(!Object.is(res.name,'calendar-view9')){
return;
}
if(Object.is(res.action,'refresh') && _this.refresh && _this.refresh instanceof Function){
_this.refresh();
}
})
}
} }
...@@ -623,6 +656,9 @@ export default class WFGroupPickupViewBase extends Vue { ...@@ -623,6 +656,9 @@ export default class WFGroupPickupViewBase extends Vue {
} }
}) })
} }
if(this.portletStateEvent){
this.portletStateEvent.unsubscribe();
}
} }
/** /**
* 选中数据的字符串 * 选中数据的字符串
......
app_web/src/pages/workflow/wfindex-view/wfindex-view-base.vue
浏览文件 @ a885975d
...@@ -262,6 +262,23 @@ export default class WFIndexViewBase extends Vue { ...@@ -262,6 +262,23 @@ export default class WFIndexViewBase extends Vue {
*/ */
public serviceStateEvent: Subscription | undefined; public serviceStateEvent: Subscription | undefined;
/**
* 门户部件状态对象
*
* @type {*}
* @memberof WFIndexViewBase
*/
@Prop() public portletState?: any;
/**
* 门户部件状态事件
*
* @public
* @type {(Subscription | undefined)}
* @memberof WFIndexViewBase
*/
public portletStateEvent: Subscription | undefined;
/** /**
* 应用上下文 * 应用上下文
* *
...@@ -470,6 +487,16 @@ export default class WFIndexViewBase extends Vue { ...@@ -470,6 +487,16 @@ export default class WFIndexViewBase extends Vue {
}); });
} }
}); });
if(_this.portletState){
_this.portletStateEvent = _this.portletState.subscribe((res:any) =>{
if(!Object.is(res.name,'calendar-view9')){
return;
}
if(Object.is(res.action,'refresh') && _this.refresh && _this.refresh instanceof Function){
_this.refresh();
}
})
}
} }
......
app_web/src/pages/workflow/wfremodel-edit-view/wfremodel-edit-view-base.vue
浏览文件 @ a885975d
...@@ -16,9 +16,11 @@ ...@@ -16,9 +16,11 @@
</div> </div>
</div> </div>
<div class="content-container">
<div class='view-top-messages'> <div class='view-top-messages'>
</div> </div>
<div class="content-container">
<div class='view-body-messages'>
</div>
<view_form <view_form
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
...@@ -41,8 +43,8 @@ ...@@ -41,8 +43,8 @@
@load="form_load($event)" @load="form_load($event)"
@closeview="closeView($event)"> @closeview="closeView($event)">
</view_form> </view_form>
<div class='view-bottom-messages'>
</div> </div>
<div class='view-bottom-messages'>
</div> </div>
</card> </card>
</div> </div>
...@@ -219,6 +221,18 @@ export default class WFREModelEditViewBase extends Vue { ...@@ -219,6 +221,18 @@ export default class WFREModelEditViewBase extends Vue {
view_form: { name: 'form', type: 'FORM' }, view_form: { name: 'form', type: 'FORM' },
}; };
/**
* 视图刷新
*
* @param {*} args
* @memberof WFREModelEditViewBase
*/
public refresh(args?: any): void {
const refs: any = this.$refs;
if (refs && refs.form) {
refs.form.refresh();
}
}
/** /**
* 计数器刷新 * 计数器刷新
* *
...@@ -250,7 +264,7 @@ export default class WFREModelEditViewBase extends Vue { ...@@ -250,7 +264,7 @@ export default class WFREModelEditViewBase extends Vue {
* @memberof WFREModelEditView * @memberof WFREModelEditView
*/ */
public toolBarModels: any = { public toolBarModels: any = {
tbitem1: { name: 'tbitem1', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } }, tbitem1: { name: 'tbitem1', actiontarget: 'NONE', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
}; };
...@@ -300,6 +314,23 @@ export default class WFREModelEditViewBase extends Vue { ...@@ -300,6 +314,23 @@ export default class WFREModelEditViewBase extends Vue {
*/ */
public serviceStateEvent: Subscription | undefined; public serviceStateEvent: Subscription | undefined;
/**
* 门户部件状态对象
*
* @type {*}
* @memberof WFREModelEditViewBase
*/
@Prop() public portletState?: any;
/**
* 门户部件状态事件
*
* @public
* @type {(Subscription | undefined)}
* @memberof WFREModelEditViewBase
*/
public portletStateEvent: Subscription | undefined;
/** /**
* 应用上下文 * 应用上下文
* *
...@@ -513,6 +544,16 @@ export default class WFREModelEditViewBase extends Vue { ...@@ -513,6 +544,16 @@ export default class WFREModelEditViewBase extends Vue {
}); });
} }
}); });
if(_this.portletState){
_this.portletStateEvent = _this.portletState.subscribe((res:any) =>{
if(!Object.is(res.name,'calendar-view9')){
return;
}
if(Object.is(res.action,'refresh') && _this.refresh && _this.refresh instanceof Function){
_this.refresh();
}
})
}
} }
...@@ -710,6 +751,9 @@ export default class WFREModelEditViewBase extends Vue { ...@@ -710,6 +751,9 @@ export default class WFREModelEditViewBase extends Vue {
} }
}) })
} }
if(this.portletStateEvent){
this.portletStateEvent.unsubscribe();
}
} }
......
app_web/src/pages/workflow/wftask-grid-view/wftask-grid-view-base.vue
浏览文件 @ a885975d
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
<div slot='title' class="header-container"> <div slot='title' class="header-container">
<span class='caption-info'>{{$t(model.srfCaption)}}</span> <span class='caption-info'>{{$t(model.srfCaption)}}</span>
</div> </div>
<div class='content-container'>
<div class='view-top-messages'> <div class='view-top-messages'>
</div> </div>
<div class='content-container'>
<div style='margin-bottom: 6px;'> <div style='margin-bottom: 6px;'>
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="状态" /> <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="状态" />
<div class='pull-right'> <div class='pull-right'>
...@@ -19,11 +19,13 @@ ...@@ -19,11 +19,13 @@
</i-button> </i-button>
<div slot='content'>{{$t('entities.wftask.gridviewtoolbar_toolbar.tbitem5.tip')}}</div> <div slot='content'>{{$t('entities.wftask.gridviewtoolbar_toolbar.tbitem5.tip')}}</div>
</tooltip> </tooltip>
<span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600"> <span class='seperator'>|</span>
<tooltip :transfer="true" :max-width="600">
<app-export-excel :item="toolBarModels.tbitem13" :caption="$t('entities.wftask.gridviewtoolbar_toolbar.tbitem13.caption')" @exportexcel="toolbar_click({ tag: 'tbitem13' }, $event)"></app-export-excel> <app-export-excel :item="toolBarModels.tbitem13" :caption="$t('entities.wftask.gridviewtoolbar_toolbar.tbitem13.caption')" @exportexcel="toolbar_click({ tag: 'tbitem13' }, $event)"></app-export-excel>
<div slot='content'>{{$t('entities.wftask.gridviewtoolbar_toolbar.tbitem13.tip')}}</div> <div slot='content'>{{$t('entities.wftask.gridviewtoolbar_toolbar.tbitem13.tip')}}</div>
</tooltip> </tooltip>
<span class='seperator'>|</span> <dropdown v-show="toolBarModels.tbitem16.visabled" trigger='click'> <span class='seperator'>|</span>
<dropdown v-show="toolBarModels.tbitem16.visabled" trigger='click'>
<tooltip :transfer="true" :max-width="600"> <tooltip :transfer="true" :max-width="600">
<i-button class=''> <i-button class=''>
<i class=''></i> <i class=''></i>
...@@ -57,7 +59,8 @@ ...@@ -57,7 +59,8 @@
</dropdown-item> </dropdown-item>
</dropdown-menu> </dropdown-menu>
</dropdown> </dropdown>
<span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600"> <span class='seperator'>|</span>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem19.visabled" :disabled="toolBarModels.tbitem19.disabled" class='' @click="toolbar_click({ tag: 'tbitem19' }, $event)"> <i-button v-show="toolBarModels.tbitem19.visabled" :disabled="toolBarModels.tbitem19.disabled" class='' @click="toolbar_click({ tag: 'tbitem19' }, $event)">
<i class='fa fa-filter'></i> <i class='fa fa-filter'></i>
<span class='caption'>{{$t('entities.wftask.gridviewtoolbar_toolbar.tbitem19.caption')}}</span> <span class='caption'>{{$t('entities.wftask.gridviewtoolbar_toolbar.tbitem19.caption')}}</span>
...@@ -90,6 +93,8 @@ ...@@ -90,6 +93,8 @@
@load="searchform_load($event)" @load="searchform_load($event)"
@closeview="closeView($event)"> @closeview="closeView($event)">
</view_searchform> </view_searchform>
<div class='view-body-messages'>
</div>
<view_grid <view_grid
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
...@@ -116,8 +121,8 @@ ...@@ -116,8 +121,8 @@
@load="grid_load($event)" @load="grid_load($event)"
@closeview="closeView($event)"> @closeview="closeView($event)">
</view_grid> </view_grid>
<div class='view-bottom-messages'>
</div> </div>
<div class='view-bottom-messages'>
</div> </div>
</card> </card>
</div> </div>
...@@ -298,6 +303,18 @@ export default class WFTaskGridViewBase extends Vue { ...@@ -298,6 +303,18 @@ export default class WFTaskGridViewBase extends Vue {
view_searchform: { name: 'searchform', type: 'SEARCHFORM' }, view_searchform: { name: 'searchform', type: 'SEARCHFORM' },
}; };
/**
* 视图刷新
*
* @param {*} args
* @memberof WFTaskGridViewBase
*/
public refresh(args?: any): void {
const refs: any = this.$refs;
if (refs && refs.grid) {
refs.grid.refresh();
}
}
/** /**
* 计数器刷新 * 计数器刷新
* *
...@@ -329,22 +346,22 @@ export default class WFTaskGridViewBase extends Vue { ...@@ -329,22 +346,22 @@ export default class WFTaskGridViewBase extends Vue {
* @memberof WFTaskGridView * @memberof WFTaskGridView
*/ */
public toolBarModels: any = { public toolBarModels: any = {
tbitem5: { name: 'tbitem5', caption: '查看', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'View', target: 'SINGLEKEY' } }, tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '查看', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'View', target: 'SINGLEKEY' } },
tbitem7: { name: 'tbitem7', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem7: { name: 'tbitem7', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem13: { name: 'tbitem13', caption: '导出', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'ExportExcel', target: '' }, MaxRowCount: 1000 }, tbitem13: { name: 'tbitem13', actiontarget: 'NONE', caption: '导出', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'ExportExcel', target: '' }, MaxRowCount: 1000 },
tbitem10: { name: 'tbitem10', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem10: { name: 'tbitem10', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem16: { name: 'tbitem16', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } }, tbitem16: { name: 'tbitem16', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } },
tbitem21: { name: 'tbitem21', caption: '导出数据模型', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'ExportModel', target: '' } }, tbitem21: { name: 'tbitem21', actiontarget: 'NONE', caption: '导出数据模型', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'ExportModel', target: '' } },
tbitem23: { name: 'tbitem23', caption: '数据导入', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Import', target: '' } }, tbitem23: { name: 'tbitem23', actiontarget: 'NONE', caption: '数据导入', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Import', target: '' } },
tbitem17: { name: 'tbitem17', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem17: { name: 'tbitem17', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem19: { name: 'tbitem19', caption: '过滤', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'ToggleFilter', target: '' } }, tbitem19: { name: 'tbitem19', actiontarget: 'NONE', caption: '过滤', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'ToggleFilter', target: '' } },
tbitem18: { name: 'tbitem18', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } }, tbitem18: { name: 'tbitem18', actiontarget: 'NONE', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
}; };
...@@ -398,6 +415,23 @@ export default class WFTaskGridViewBase extends Vue { ...@@ -398,6 +415,23 @@ export default class WFTaskGridViewBase extends Vue {
*/ */
public serviceStateEvent: Subscription | undefined; public serviceStateEvent: Subscription | undefined;
/**
* 门户部件状态对象
*
* @type {*}
* @memberof WFTaskGridViewBase
*/
@Prop() public portletState?: any;
/**
* 门户部件状态事件
*
* @public
* @type {(Subscription | undefined)}
* @memberof WFTaskGridViewBase
*/
public portletStateEvent: Subscription | undefined;
/** /**
* 应用上下文 * 应用上下文
* *
...@@ -611,6 +645,16 @@ export default class WFTaskGridViewBase extends Vue { ...@@ -611,6 +645,16 @@ export default class WFTaskGridViewBase extends Vue {
}); });
} }
}); });
if(_this.portletState){
_this.portletStateEvent = _this.portletState.subscribe((res:any) =>{
if(!Object.is(res.name,'calendar-view9')){
return;
}
if(Object.is(res.action,'refresh') && _this.refresh && _this.refresh instanceof Function){
_this.refresh();
}
})
}
if(this.formDruipart){ if(this.formDruipart){
this.formDruipart.subscribe((res:any) =>{ this.formDruipart.subscribe((res:any) =>{
if(Object.is(res.action,'save')){ if(Object.is(res.action,'save')){
...@@ -1522,6 +1566,9 @@ export default class WFTaskGridViewBase extends Vue { ...@@ -1522,6 +1566,9 @@ export default class WFTaskGridViewBase extends Vue {
} }
}) })
} }
if(this.portletStateEvent){
this.portletStateEvent.unsubscribe();
}
} }
/** /**
......
app_web/src/pages/workflow/wfuser-mpickup-view/wfuser-mpickup-view-base.vue
浏览文件 @ a885975d
...@@ -2,7 +2,11 @@ ...@@ -2,7 +2,11 @@
<div class="view-container dempickupview wfuser-mpickup-view"> <div class="view-container dempickupview wfuser-mpickup-view">
<app-studioaction :viewTitle="$t(model.srfCaption)" viewName="wfusermpickupview"></app-studioaction> <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="wfusermpickupview"></app-studioaction>
<card class='view-card view-no-caption view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false"> <card class='view-card view-no-caption view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false">
<div class='view-top-messages'>
</div>
<div class="content-container pickup-view"> <div class="content-container pickup-view">
<div class='view-body-messages'>
</div>
<div class="translate-contant"> <div class="translate-contant">
<div class="center" :style="{width : !isShowButton ? '100%' : ''}"> <div class="center" :style="{width : !isShowButton ? '100%' : ''}">
<view_pickupviewpanel <view_pickupviewpanel
...@@ -58,6 +62,8 @@ ...@@ -58,6 +62,8 @@
</row> </row>
</card> </card>
</div> </div>
<div class='view-bottom-messages'>
</div>
</card> </card>
</div> </div>
</template> </template>
...@@ -312,6 +318,23 @@ export default class WFUserMPickupViewBase extends Vue { ...@@ -312,6 +318,23 @@ export default class WFUserMPickupViewBase extends Vue {
*/ */
public serviceStateEvent: Subscription | undefined; public serviceStateEvent: Subscription | undefined;
/**
* 门户部件状态对象
*
* @type {*}
* @memberof WFUserMPickupViewBase
*/
@Prop() public portletState?: any;
/**
* 门户部件状态事件
*
* @public
* @type {(Subscription | undefined)}
* @memberof WFUserMPickupViewBase
*/
public portletStateEvent: Subscription | undefined;
/** /**
* 应用上下文 * 应用上下文
* *
...@@ -525,6 +548,16 @@ export default class WFUserMPickupViewBase extends Vue { ...@@ -525,6 +548,16 @@ export default class WFUserMPickupViewBase extends Vue {
}); });
} }
}); });
if(_this.portletState){
_this.portletStateEvent = _this.portletState.subscribe((res:any) =>{
if(!Object.is(res.name,'calendar-view9')){
return;
}
if(Object.is(res.action,'refresh') && _this.refresh && _this.refresh instanceof Function){
_this.refresh();
}
})
}
} }
...@@ -658,6 +691,9 @@ export default class WFUserMPickupViewBase extends Vue { ...@@ -658,6 +691,9 @@ export default class WFUserMPickupViewBase extends Vue {
} }
}) })
} }
if(this.portletStateEvent){
this.portletStateEvent.unsubscribe();
}
} }
/** /**
* 是否显示按钮 * 是否显示按钮
......
app_web/src/pages/workflow/wfuser-mpickup-view/wfuser-mpickup-view.less
浏览文件 @ a885975d
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
.pickup-view { .pickup-view {
>.translate-contant { >.translate-contant {
overflow: auto;
flex-grow: 1; flex-grow: 1;
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
......
app_web/src/pages/workflow/wfuser-pickup-grid-view/wfuser-pickup-grid-view-base.vue
浏览文件 @ a885975d
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
<div class='view-container depickupgridview wfuser-pickup-grid-view'> <div class='view-container depickupgridview wfuser-pickup-grid-view'>
<app-studioaction :viewTitle="$t(model.srfCaption)" viewName="wfuserpickupgridview"></app-studioaction> <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="wfuserpickupgridview"></app-studioaction>
<card class='view-card view-no-caption view-no-toolbar' :dis-hover="true" :bordered="false"> <card class='view-card view-no-caption view-no-toolbar' :dis-hover="true" :bordered="false">
<div class='view-top-messages'>
</div>
<div class='content-container pickup-grid-view'> <div class='content-container pickup-grid-view'>
<view_searchform <view_searchform
:viewState="viewState" :viewState="viewState"
...@@ -19,7 +21,7 @@ ...@@ -19,7 +21,7 @@
@load="searchform_load($event)" @load="searchform_load($event)"
@closeview="closeView($event)"> @closeview="closeView($event)">
</view_searchform> </view_searchform>
<view_grid <div class='view-body-messages'> </div> <view_grid
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
:context="context" :context="context"
...@@ -41,6 +43,8 @@ ...@@ -41,6 +43,8 @@
@closeview="closeView($event)"> @closeview="closeView($event)">
</view_grid> </view_grid>
</div> </div>
<div class='view-bottom-messages'>
</div>
</card> </card>
</div> </div>
</template> </template>
...@@ -216,6 +220,18 @@ export default class WFUserPickupGridViewBase extends Vue { ...@@ -216,6 +220,18 @@ export default class WFUserPickupGridViewBase extends Vue {
view_searchform: { name: 'searchform', type: 'SEARCHFORM' }, view_searchform: { name: 'searchform', type: 'SEARCHFORM' },
}; };
/**
* 视图刷新
*
* @param {*} args
* @memberof WFUserPickupGridViewBase
*/
public refresh(args?: any): void {
const refs: any = this.$refs;
if (refs && refs.grid) {
refs.grid.refresh();
}
}
/** /**
* 计数器刷新 * 计数器刷新
* *
...@@ -285,6 +301,23 @@ export default class WFUserPickupGridViewBase extends Vue { ...@@ -285,6 +301,23 @@ export default class WFUserPickupGridViewBase extends Vue {
*/ */
public serviceStateEvent: Subscription | undefined; public serviceStateEvent: Subscription | undefined;
/**
* 门户部件状态对象
*
* @type {*}
* @memberof WFUserPickupGridViewBase
*/
@Prop() public portletState?: any;
/**
* 门户部件状态事件
*
* @public
* @type {(Subscription | undefined)}
* @memberof WFUserPickupGridViewBase
*/
public portletStateEvent: Subscription | undefined;
/** /**
* 应用上下文 * 应用上下文
* *
...@@ -498,6 +531,16 @@ export default class WFUserPickupGridViewBase extends Vue { ...@@ -498,6 +531,16 @@ export default class WFUserPickupGridViewBase extends Vue {
}); });
} }
}); });
if(_this.portletState){
_this.portletStateEvent = _this.portletState.subscribe((res:any) =>{
if(!Object.is(res.name,'calendar-view9')){
return;
}
if(Object.is(res.action,'refresh') && _this.refresh && _this.refresh instanceof Function){
_this.refresh();
}
})
}
} }
...@@ -675,6 +718,9 @@ export default class WFUserPickupGridViewBase extends Vue { ...@@ -675,6 +718,9 @@ export default class WFUserPickupGridViewBase extends Vue {
} }
}) })
} }
if(this.portletStateEvent){
this.portletStateEvent.unsubscribe();
}
} }
/** /**
* 选中数据字符串 * 选中数据字符串
......
app_web/src/pages/workflow/wfuser-pickup-view/wfuser-pickup-view-base.vue
浏览文件 @ a885975d
...@@ -2,7 +2,11 @@ ...@@ -2,7 +2,11 @@
<div class="view-container depickupview wfuser-pickup-view"> <div class="view-container depickupview wfuser-pickup-view">
<app-studioaction :viewTitle="$t(model.srfCaption)" viewName="wfuserpickupview"></app-studioaction> <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="wfuserpickupview"></app-studioaction>
<card class='view-card view-no-caption view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false"> <card class='view-card view-no-caption view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false">
<div class='view-top-messages'>
</div>
<div class="content-container pickup-view"> <div class="content-container pickup-view">
<div class='view-body-messages'>
</div>
<view_pickupviewpanel <view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
:viewparams="JSON.parse(JSON.stringify(viewparams))" :viewparams="JSON.parse(JSON.stringify(viewparams))"
...@@ -25,6 +29,8 @@ ...@@ -25,6 +29,8 @@
</row> </row>
</card> </card>
</div> </div>
<div class='view-bottom-messages'>
</div>
</card> </card>
</div> </div>
</template> </template>
...@@ -278,6 +284,23 @@ export default class WFUserPickupViewBase extends Vue { ...@@ -278,6 +284,23 @@ export default class WFUserPickupViewBase extends Vue {
*/ */
public serviceStateEvent: Subscription | undefined; public serviceStateEvent: Subscription | undefined;
/**
* 门户部件状态对象
*
* @type {*}
* @memberof WFUserPickupViewBase
*/
@Prop() public portletState?: any;
/**
* 门户部件状态事件
*
* @public
* @type {(Subscription | undefined)}
* @memberof WFUserPickupViewBase
*/
public portletStateEvent: Subscription | undefined;
/** /**
* 应用上下文 * 应用上下文
* *
...@@ -491,6 +514,16 @@ export default class WFUserPickupViewBase extends Vue { ...@@ -491,6 +514,16 @@ export default class WFUserPickupViewBase extends Vue {
}); });
} }
}); });
if(_this.portletState){
_this.portletStateEvent = _this.portletState.subscribe((res:any) =>{
if(!Object.is(res.name,'calendar-view9')){
return;
}
if(Object.is(res.action,'refresh') && _this.refresh && _this.refresh instanceof Function){
_this.refresh();
}
})
}
} }
...@@ -623,6 +656,9 @@ export default class WFUserPickupViewBase extends Vue { ...@@ -623,6 +656,9 @@ export default class WFUserPickupViewBase extends Vue {
} }
}) })
} }
if(this.portletStateEvent){
this.portletStateEvent.unsubscribe();
}
} }
/** /**
* 选中数据的字符串 * 选中数据的字符串
......
app_web/src/store/getters.ts
浏览文件 @ a885975d
...@@ -47,12 +47,21 @@ export const getLocalData = (state: any) => () => { ...@@ -47,12 +47,21 @@ export const getLocalData = (state: any) => () => {
* @param state * @param state
*/ */
export const getAppData = (state: any) => () => { export const getAppData = (state: any) => () => {
if(!state.appdata){
state.appdata = {};
}
let result:any = JSON.parse(JSON.stringify(state.appdata)); let result:any = JSON.parse(JSON.stringify(state.appdata));
if(state.localdata && Object.keys(state.localdata).length >0){
let copyContext:any = result.context?result.context:{}; let copyContext:any = result.context?result.context:{};
if(state.localdata && Object.keys(state.localdata).length >0){
Object.assign(copyContext,state.localdata); Object.assign(copyContext,state.localdata);
result.context = copyContext; }else if(localStorage.getItem('localdata')){
try{
Object.assign(copyContext,JSON.parse(localStorage.getItem('localdata') as string));
}catch(error){
console.warn(error);
}
} }
result.context = copyContext;
return result; return result;
} }
......
app_web/src/store/modules/auth-resource/getters.ts
浏览文件 @ a885975d
...@@ -32,23 +32,56 @@ export const getEnablePermissionValid = (state: any) => { ...@@ -32,23 +32,56 @@ export const getEnablePermissionValid = (state: any) => {
} }
/** /**
* 判断指定菜单是否显示 * 判断指定菜单是否显示(混合模式)
* *
* @param state * @param state
*/ */
export const getAuthMenu = (state: any) => (menu:any) =>{ export const getAuthMenu = (state: any) => (menu: any) => {
// 存在权限 if (state.enablePermissionValid) {
let resourceIndex: any; let resourceIndex: any;
let menuIndex:any; let menuIndex: any;
if(state.enablePermissionValid){ resourceIndex = state.resourceData.findIndex((resourcetag: any, objIndex: any, objs: any) => {
resourceIndex= state.resourceData.findIndex((resourcetag: any, objIndex: any, objs: any) => {
return Object.is(menu.resourcetag, resourcetag); return Object.is(menu.resourcetag, resourcetag);
}) })
menuIndex= state.menuData.findIndex((menutag: any, objIndex: any, objs: any) => { menuIndex = state.menuData.findIndex((menutag: any, objIndex: any, objs: any) => {
return Object.is(menu.authtag, menutag); return Object.is(menu.authtag, menutag);
}) })
return (resourceIndex !== -1 || menuIndex !== -1)?true:false; return (resourceIndex !== -1 || menuIndex !== -1) ? true : false;
}else{ } else {
return true;
}
}
/**
* 判断指定菜单是否显示(资源模式)
*
* @param state
*/
export const getAuthMenuWithResource = (state: any) => (menu: any) => {
if (state.enablePermissionValid && menu.resourcetag) {
let resourceIndex: any;
resourceIndex = state.resourceData.findIndex((resourcetag: any, objIndex: any, objs: any) => {
return Object.is(menu.resourcetag, resourcetag);
})
return resourceIndex !== -1 ? true : false;
} else {
return true;
}
}
/**
* 判断指定菜单是否显示(RT模式)
*
* @param state
*/
export const getAuthMenuWithRT = (state: any) => (menu: any) => {
if (state.enablePermissionValid) {
let menuIndex: any;
menuIndex = state.menuData.findIndex((menutag: any, objIndex: any, objs: any) => {
return Object.is(menu.authtag, menutag);
})
return menuIndex !== -1 ? true : false;
} else {
return true; return true;
} }
} }
\ No newline at end of file
app_web/src/styles/default.less
浏览文件 @ a885975d
...@@ -124,11 +124,14 @@ ...@@ -124,11 +124,14 @@
// flex-grow: 1; // flex-grow: 1;
height: calc(100% - 74px); height: calc(100% - 74px);
padding: 0px; padding: 0px;
display: flex;
flex-direction: column;
> .content-container { > .content-container {
height: 100%; height: 100%;
display: flex; display: flex;
margin: 0; margin: 0;
flex-direction: column; flex-direction: column;
overflow: auto;
} }
} }
} }
......
app_web/src/uiservice/ui-service.ts
浏览文件 @ a885975d
import { Store } from 'vuex'; import { Store } from 'vuex';
import AuthService from '@/authservice/auth-service';
/** /**
* 界面服务基类 * 界面服务基类
...@@ -63,6 +64,9 @@ export default class UIService { ...@@ -63,6 +64,9 @@ export default class UIService {
* @memberof UIService * @memberof UIService
*/ */
public getResourceOPPrivs(tag:any){ public getResourceOPPrivs(tag:any){
if(!this.authService) {
this.authService = new AuthService(this.getStore());
}
return this.authService.getResourcePermission(this.authService.sysOPPrivsMap.get(tag))?1:0; return this.authService.getResourcePermission(this.authService.sysOPPrivsMap.get(tag))?1:0;
} }
......
app_web/src/uiservice/wfgroup/wfgroup-ui-service-base.ts
浏览文件 @ a885975d
...@@ -89,11 +89,11 @@ export default class WFGroupUIServiceBase extends UIService { ...@@ -89,11 +89,11 @@ export default class WFGroupUIServiceBase extends UIService {
* @memberof WFGroupUIServiceBase * @memberof WFGroupUIServiceBase
*/ */
public initViewMap(){ public initViewMap(){
this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'wfgroups'}); this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'wfgroups',component:'wfgroup-pickup-grid-view'});
this.allViewMap.set('MPICKUPVIEW:',{viewname:'mpickupview',srfappde:'wfgroups'}); this.allViewMap.set('MPICKUPVIEW:',{viewname:'mpickupview',srfappde:'wfgroups',component:'wfgroup-mpickup-view'});
this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'wfgroups'}); this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'wfgroups',component:'wfgroup-pickup-view'});
this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'wfgroups'}); this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'wfgroups',component:'wfgroup-edit-view'});
this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'wfgroups'}); this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'wfgroups',component:'wfgroup-grid-view'});
} }
/** /**
...@@ -202,17 +202,17 @@ export default class WFGroupUIServiceBase extends UIService { ...@@ -202,17 +202,17 @@ export default class WFGroupUIServiceBase extends UIService {
this.mainStateFields.forEach((singleMainField:any) =>{ this.mainStateFields.forEach((singleMainField:any) =>{
if(!(singleMainField in curData)){ if(!(singleMainField in curData)){
console.warn(`当前数据对象不包含属性${singleMainField}，可能会发生错误`); console.warn(`当前数据对象不包含属性「${singleMainField}」，根据「${singleMainField}」属性进行的主状态计算默认为空值`);
} }
}) })
for (let i = 0; i <= 1; i++) { for (let i = 0; i <= 1; i++) {
let strTag:string = (curData[this.mainStateFields[0]])?(i == 0) ? `${curData[this.mainStateFields[0]]}` : "":""; let strTag:string = (curData[this.mainStateFields[0]] != null && curData[this.mainStateFields[0]] !== "")?(i == 0) ? `${curData[this.mainStateFields[0]]}` : "":"";
if (this.mainStateFields.length >= 2) { if (this.mainStateFields.length >= 2) {
for (let j = 0; j <= 1; j++) { for (let j = 0; j <= 1; j++) {
let strTag2:string = (curData[this.mainStateFields[1]])?`${strTag}__${(j == 0) ? `${curData[this.mainStateFields[1]]}` : ""}`:strTag; let strTag2:string = (curData[this.mainStateFields[1]] != null && curData[this.mainStateFields[1]] !== "")?`${strTag}__${(j == 0) ? `${curData[this.mainStateFields[1]]}` : ""}`:strTag;
if (this.mainStateFields.length >= 3) { if (this.mainStateFields.length >= 3) {
for (let k = 0; k <= 1; k++) { for (let k = 0; k <= 1; k++) {
let strTag3:string = (curData[this.mainStateFields[2]])?`${strTag2}__${(k == 0) ? `${curData[this.mainStateFields[2]]}` : ""}`:strTag2; let strTag3:string = (curData[this.mainStateFields[2]] != null && curData[this.mainStateFields[2]] !== "")?`${strTag2}__${(k == 0) ? `${curData[this.mainStateFields[2]]}` : ""}`:strTag2;
// 判断是否存在 // 判断是否存在
return this.allDeMainStateMap.get(strTag3); return this.allDeMainStateMap.get(strTag3);
} }
......
app_web/src/uiservice/wfmember/wfmember-ui-service-base.ts
浏览文件 @ a885975d
...@@ -89,8 +89,8 @@ export default class WFMemberUIServiceBase extends UIService { ...@@ -89,8 +89,8 @@ export default class WFMemberUIServiceBase extends UIService {
* @memberof WFMemberUIServiceBase * @memberof WFMemberUIServiceBase
*/ */
public initViewMap(){ public initViewMap(){
this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'wfmembers'}); this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'wfmembers',component:'wfmember-grid-view'});
this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'wfmembers'}); this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'wfmembers',component:'wfmember-edit-view'});
} }
/** /**
...@@ -199,17 +199,17 @@ export default class WFMemberUIServiceBase extends UIService { ...@@ -199,17 +199,17 @@ export default class WFMemberUIServiceBase extends UIService {
this.mainStateFields.forEach((singleMainField:any) =>{ this.mainStateFields.forEach((singleMainField:any) =>{
if(!(singleMainField in curData)){ if(!(singleMainField in curData)){
console.warn(`当前数据对象不包含属性${singleMainField}，可能会发生错误`); console.warn(`当前数据对象不包含属性「${singleMainField}」，根据「${singleMainField}」属性进行的主状态计算默认为空值`);
} }
}) })
for (let i = 0; i <= 1; i++) { for (let i = 0; i <= 1; i++) {
let strTag:string = (curData[this.mainStateFields[0]])?(i == 0) ? `${curData[this.mainStateFields[0]]}` : "":""; let strTag:string = (curData[this.mainStateFields[0]] != null && curData[this.mainStateFields[0]] !== "")?(i == 0) ? `${curData[this.mainStateFields[0]]}` : "":"";
if (this.mainStateFields.length >= 2) { if (this.mainStateFields.length >= 2) {
for (let j = 0; j <= 1; j++) { for (let j = 0; j <= 1; j++) {
let strTag2:string = (curData[this.mainStateFields[1]])?`${strTag}__${(j == 0) ? `${curData[this.mainStateFields[1]]}` : ""}`:strTag; let strTag2:string = (curData[this.mainStateFields[1]] != null && curData[this.mainStateFields[1]] !== "")?`${strTag}__${(j == 0) ? `${curData[this.mainStateFields[1]]}` : ""}`:strTag;
if (this.mainStateFields.length >= 3) { if (this.mainStateFields.length >= 3) {
for (let k = 0; k <= 1; k++) { for (let k = 0; k <= 1; k++) {
let strTag3:string = (curData[this.mainStateFields[2]])?`${strTag2}__${(k == 0) ? `${curData[this.mainStateFields[2]]}` : ""}`:strTag2; let strTag3:string = (curData[this.mainStateFields[2]] != null && curData[this.mainStateFields[2]] !== "")?`${strTag2}__${(k == 0) ? `${curData[this.mainStateFields[2]]}` : ""}`:strTag2;
// 判断是否存在 // 判断是否存在
return this.allDeMainStateMap.get(strTag3); return this.allDeMainStateMap.get(strTag3);
} }
......
app_web/src/uiservice/wfprocess-definition/wfprocess-definition-ui-service-base.ts
浏览文件 @ a885975d
...@@ -89,8 +89,8 @@ export default class WFProcessDefinitionUIServiceBase extends UIService { ...@@ -89,8 +89,8 @@ export default class WFProcessDefinitionUIServiceBase extends UIService {
* @memberof WFProcessDefinitionUIServiceBase * @memberof WFProcessDefinitionUIServiceBase
*/ */
public initViewMap(){ public initViewMap(){
this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'wfprocessdefinitions'}); this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'wfprocessdefinitions',component:'wfprocess-definition-edit-view'});
this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'wfprocessdefinitions'}); this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'wfprocessdefinitions',component:'wfprocess-definition-grid-view'});
} }
/** /**
...@@ -199,17 +199,17 @@ export default class WFProcessDefinitionUIServiceBase extends UIService { ...@@ -199,17 +199,17 @@ export default class WFProcessDefinitionUIServiceBase extends UIService {
this.mainStateFields.forEach((singleMainField:any) =>{ this.mainStateFields.forEach((singleMainField:any) =>{
if(!(singleMainField in curData)){ if(!(singleMainField in curData)){
console.warn(`当前数据对象不包含属性${singleMainField}，可能会发生错误`); console.warn(`当前数据对象不包含属性「${singleMainField}」，根据「${singleMainField}」属性进行的主状态计算默认为空值`);
} }
}) })
for (let i = 0; i <= 1; i++) { for (let i = 0; i <= 1; i++) {
let strTag:string = (curData[this.mainStateFields[0]])?(i == 0) ? `${curData[this.mainStateFields[0]]}` : "":""; let strTag:string = (curData[this.mainStateFields[0]] != null && curData[this.mainStateFields[0]] !== "")?(i == 0) ? `${curData[this.mainStateFields[0]]}` : "":"";
if (this.mainStateFields.length >= 2) { if (this.mainStateFields.length >= 2) {
for (let j = 0; j <= 1; j++) { for (let j = 0; j <= 1; j++) {
let strTag2:string = (curData[this.mainStateFields[1]])?`${strTag}__${(j == 0) ? `${curData[this.mainStateFields[1]]}` : ""}`:strTag; let strTag2:string = (curData[this.mainStateFields[1]] != null && curData[this.mainStateFields[1]] !== "")?`${strTag}__${(j == 0) ? `${curData[this.mainStateFields[1]]}` : ""}`:strTag;
if (this.mainStateFields.length >= 3) { if (this.mainStateFields.length >= 3) {
for (let k = 0; k <= 1; k++) { for (let k = 0; k <= 1; k++) {
let strTag3:string = (curData[this.mainStateFields[2]])?`${strTag2}__${(k == 0) ? `${curData[this.mainStateFields[2]]}` : ""}`:strTag2; let strTag3:string = (curData[this.mainStateFields[2]] != null && curData[this.mainStateFields[2]] !== "")?`${strTag2}__${(k == 0) ? `${curData[this.mainStateFields[2]]}` : ""}`:strTag2;
// 判断是否存在 // 判断是否存在
return this.allDeMainStateMap.get(strTag3); return this.allDeMainStateMap.get(strTag3);
} }
......
app_web/src/uiservice/wfremodel/wfremodel-ui-service-base.ts
浏览文件 @ a885975d
...@@ -89,7 +89,7 @@ export default class WFREModelUIServiceBase extends UIService { ...@@ -89,7 +89,7 @@ export default class WFREModelUIServiceBase extends UIService {
* @memberof WFREModelUIServiceBase * @memberof WFREModelUIServiceBase
*/ */
public initViewMap(){ public initViewMap(){
this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'wfremodels'}); this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'wfremodels',component:'wfremodel-edit-view'});
} }
/** /**
...@@ -198,17 +198,17 @@ export default class WFREModelUIServiceBase extends UIService { ...@@ -198,17 +198,17 @@ export default class WFREModelUIServiceBase extends UIService {
this.mainStateFields.forEach((singleMainField:any) =>{ this.mainStateFields.forEach((singleMainField:any) =>{
if(!(singleMainField in curData)){ if(!(singleMainField in curData)){
console.warn(`当前数据对象不包含属性${singleMainField}，可能会发生错误`); console.warn(`当前数据对象不包含属性「${singleMainField}」，根据「${singleMainField}」属性进行的主状态计算默认为空值`);
} }
}) })
for (let i = 0; i <= 1; i++) { for (let i = 0; i <= 1; i++) {
let strTag:string = (curData[this.mainStateFields[0]])?(i == 0) ? `${curData[this.mainStateFields[0]]}` : "":""; let strTag:string = (curData[this.mainStateFields[0]] != null && curData[this.mainStateFields[0]] !== "")?(i == 0) ? `${curData[this.mainStateFields[0]]}` : "":"";
if (this.mainStateFields.length >= 2) { if (this.mainStateFields.length >= 2) {
for (let j = 0; j <= 1; j++) { for (let j = 0; j <= 1; j++) {
let strTag2:string = (curData[this.mainStateFields[1]])?`${strTag}__${(j == 0) ? `${curData[this.mainStateFields[1]]}` : ""}`:strTag; let strTag2:string = (curData[this.mainStateFields[1]] != null && curData[this.mainStateFields[1]] !== "")?`${strTag}__${(j == 0) ? `${curData[this.mainStateFields[1]]}` : ""}`:strTag;
if (this.mainStateFields.length >= 3) { if (this.mainStateFields.length >= 3) {
for (let k = 0; k <= 1; k++) { for (let k = 0; k <= 1; k++) {
let strTag3:string = (curData[this.mainStateFields[2]])?`${strTag2}__${(k == 0) ? `${curData[this.mainStateFields[2]]}` : ""}`:strTag2; let strTag3:string = (curData[this.mainStateFields[2]] != null && curData[this.mainStateFields[2]] !== "")?`${strTag2}__${(k == 0) ? `${curData[this.mainStateFields[2]]}` : ""}`:strTag2;
// 判断是否存在 // 判断是否存在
return this.allDeMainStateMap.get(strTag3); return this.allDeMainStateMap.get(strTag3);
} }
......
app_web/src/uiservice/wfsystem/wfsystem-ui-service-base.ts
浏览文件 @ a885975d
...@@ -197,17 +197,17 @@ export default class WFSystemUIServiceBase extends UIService { ...@@ -197,17 +197,17 @@ export default class WFSystemUIServiceBase extends UIService {
this.mainStateFields.forEach((singleMainField:any) =>{ this.mainStateFields.forEach((singleMainField:any) =>{
if(!(singleMainField in curData)){ if(!(singleMainField in curData)){
console.warn(`当前数据对象不包含属性${singleMainField}，可能会发生错误`); console.warn(`当前数据对象不包含属性「${singleMainField}」，根据「${singleMainField}」属性进行的主状态计算默认为空值`);
} }
}) })
for (let i = 0; i <= 1; i++) { for (let i = 0; i <= 1; i++) {
let strTag:string = (curData[this.mainStateFields[0]])?(i == 0) ? `${curData[this.mainStateFields[0]]}` : "":""; let strTag:string = (curData[this.mainStateFields[0]] != null && curData[this.mainStateFields[0]] !== "")?(i == 0) ? `${curData[this.mainStateFields[0]]}` : "":"";
if (this.mainStateFields.length >= 2) { if (this.mainStateFields.length >= 2) {
for (let j = 0; j <= 1; j++) { for (let j = 0; j <= 1; j++) {
let strTag2:string = (curData[this.mainStateFields[1]])?`${strTag}__${(j == 0) ? `${curData[this.mainStateFields[1]]}` : ""}`:strTag; let strTag2:string = (curData[this.mainStateFields[1]] != null && curData[this.mainStateFields[1]] !== "")?`${strTag}__${(j == 0) ? `${curData[this.mainStateFields[1]]}` : ""}`:strTag;
if (this.mainStateFields.length >= 3) { if (this.mainStateFields.length >= 3) {
for (let k = 0; k <= 1; k++) { for (let k = 0; k <= 1; k++) {
let strTag3:string = (curData[this.mainStateFields[2]])?`${strTag2}__${(k == 0) ? `${curData[this.mainStateFields[2]]}` : ""}`:strTag2; let strTag3:string = (curData[this.mainStateFields[2]] != null && curData[this.mainStateFields[2]] !== "")?`${strTag2}__${(k == 0) ? `${curData[this.mainStateFields[2]]}` : ""}`:strTag2;
// 判断是否存在 // 判断是否存在
return this.allDeMainStateMap.get(strTag3); return this.allDeMainStateMap.get(strTag3);
} }
......
app_web/src/uiservice/wftask/wftask-ui-service-base.ts
浏览文件 @ a885975d
...@@ -89,8 +89,8 @@ export default class WFTaskUIServiceBase extends UIService { ...@@ -89,8 +89,8 @@ export default class WFTaskUIServiceBase extends UIService {
* @memberof WFTaskUIServiceBase * @memberof WFTaskUIServiceBase
*/ */
public initViewMap(){ public initViewMap(){
this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'wftasks'}); this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'wftasks',component:'wftask-grid-view'});
this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'wftasks'}); this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'wftasks',component:'wftask-edit-view'});
} }
/** /**
...@@ -199,17 +199,17 @@ export default class WFTaskUIServiceBase extends UIService { ...@@ -199,17 +199,17 @@ export default class WFTaskUIServiceBase extends UIService {
this.mainStateFields.forEach((singleMainField:any) =>{ this.mainStateFields.forEach((singleMainField:any) =>{
if(!(singleMainField in curData)){ if(!(singleMainField in curData)){
console.warn(`当前数据对象不包含属性${singleMainField}，可能会发生错误`); console.warn(`当前数据对象不包含属性「${singleMainField}」，根据「${singleMainField}」属性进行的主状态计算默认为空值`);
} }
}) })
for (let i = 0; i <= 1; i++) { for (let i = 0; i <= 1; i++) {
let strTag:string = (curData[this.mainStateFields[0]])?(i == 0) ? `${curData[this.mainStateFields[0]]}` : "":""; let strTag:string = (curData[this.mainStateFields[0]] != null && curData[this.mainStateFields[0]] !== "")?(i == 0) ? `${curData[this.mainStateFields[0]]}` : "":"";
if (this.mainStateFields.length >= 2) { if (this.mainStateFields.length >= 2) {
for (let j = 0; j <= 1; j++) { for (let j = 0; j <= 1; j++) {
let strTag2:string = (curData[this.mainStateFields[1]])?`${strTag}__${(j == 0) ? `${curData[this.mainStateFields[1]]}` : ""}`:strTag; let strTag2:string = (curData[this.mainStateFields[1]] != null && curData[this.mainStateFields[1]] !== "")?`${strTag}__${(j == 0) ? `${curData[this.mainStateFields[1]]}` : ""}`:strTag;
if (this.mainStateFields.length >= 3) { if (this.mainStateFields.length >= 3) {
for (let k = 0; k <= 1; k++) { for (let k = 0; k <= 1; k++) {
let strTag3:string = (curData[this.mainStateFields[2]])?`${strTag2}__${(k == 0) ? `${curData[this.mainStateFields[2]]}` : ""}`:strTag2; let strTag3:string = (curData[this.mainStateFields[2]] != null && curData[this.mainStateFields[2]] !== "")?`${strTag2}__${(k == 0) ? `${curData[this.mainStateFields[2]]}` : ""}`:strTag2;
// 判断是否存在 // 判断是否存在
return this.allDeMainStateMap.get(strTag3); return this.allDeMainStateMap.get(strTag3);
} }
......
app_web/src/uiservice/wfuser/wfuser-ui-service-base.ts
浏览文件 @ a885975d
...@@ -89,11 +89,11 @@ export default class WFUserUIServiceBase extends UIService { ...@@ -89,11 +89,11 @@ export default class WFUserUIServiceBase extends UIService {
* @memberof WFUserUIServiceBase * @memberof WFUserUIServiceBase
*/ */
public initViewMap(){ public initViewMap(){
this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'wfusers'}); this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'wfusers',component:'wfuser-pickup-view'});
this.allViewMap.set('MPICKUPVIEW:',{viewname:'mpickupview',srfappde:'wfusers'}); this.allViewMap.set('MPICKUPVIEW:',{viewname:'mpickupview',srfappde:'wfusers',component:'wfuser-mpickup-view'});
this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'wfusers'}); this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'wfusers',component:'wfuser-pickup-grid-view'});
this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'wfusers'}); this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'wfusers',component:'wfuser-grid-view'});
this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'wfusers'}); this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'wfusers',component:'wfuser-edit-view'});
} }
/** /**
...@@ -202,17 +202,17 @@ export default class WFUserUIServiceBase extends UIService { ...@@ -202,17 +202,17 @@ export default class WFUserUIServiceBase extends UIService {
this.mainStateFields.forEach((singleMainField:any) =>{ this.mainStateFields.forEach((singleMainField:any) =>{
if(!(singleMainField in curData)){ if(!(singleMainField in curData)){
console.warn(`当前数据对象不包含属性${singleMainField}，可能会发生错误`); console.warn(`当前数据对象不包含属性「${singleMainField}」，根据「${singleMainField}」属性进行的主状态计算默认为空值`);
} }
}) })
for (let i = 0; i <= 1; i++) { for (let i = 0; i <= 1; i++) {
let strTag:string = (curData[this.mainStateFields[0]])?(i == 0) ? `${curData[this.mainStateFields[0]]}` : "":""; let strTag:string = (curData[this.mainStateFields[0]] != null && curData[this.mainStateFields[0]] !== "")?(i == 0) ? `${curData[this.mainStateFields[0]]}` : "":"";
if (this.mainStateFields.length >= 2) { if (this.mainStateFields.length >= 2) {
for (let j = 0; j <= 1; j++) { for (let j = 0; j <= 1; j++) {
let strTag2:string = (curData[this.mainStateFields[1]])?`${strTag}__${(j == 0) ? `${curData[this.mainStateFields[1]]}` : ""}`:strTag; let strTag2:string = (curData[this.mainStateFields[1]] != null && curData[this.mainStateFields[1]] !== "")?`${strTag}__${(j == 0) ? `${curData[this.mainStateFields[1]]}` : ""}`:strTag;
if (this.mainStateFields.length >= 3) { if (this.mainStateFields.length >= 3) {
for (let k = 0; k <= 1; k++) { for (let k = 0; k <= 1; k++) {
let strTag3:string = (curData[this.mainStateFields[2]])?`${strTag2}__${(k == 0) ? `${curData[this.mainStateFields[2]]}` : ""}`:strTag2; let strTag3:string = (curData[this.mainStateFields[2]] != null && curData[this.mainStateFields[2]] !== "")?`${strTag2}__${(k == 0) ? `${curData[this.mainStateFields[2]]}` : ""}`:strTag2;
// 判断是否存在 // 判断是否存在
return this.allDeMainStateMap.get(strTag3); return this.allDeMainStateMap.get(strTag3);
} }
......
app_web/src/utils/view-tool/view-tool.ts
浏览文件 @ a885975d
...@@ -260,7 +260,7 @@ export class ViewTool { ...@@ -260,7 +260,7 @@ export class ViewTool {
const _item = ActionModel[key]; const _item = ActionModel[key];
if(_item && _item['dataaccaction'] && UIService){ if(_item && _item['dataaccaction'] && UIService){
let dataActionResult:any; let dataActionResult:any;
if(Object.is(_item['actiontarget'],"NONE")){ if(Object.is(_item['actiontarget'],"NONE") || Object.is(_item['actiontarget'],"")){
dataActionResult = UIService.getResourceOPPrivs(_item['dataaccaction']); dataActionResult = UIService.getResourceOPPrivs(_item['dataaccaction']);
}else{ }else{
if(data && Object.keys(data).length >0){ if(data && Object.keys(data).length >0){
......
app_web/src/widgets/app/wfindex-view-appmenu/wfindex-view-appmenu-base.vue
浏览文件 @ a885975d
...@@ -223,6 +223,7 @@ export default class WFIndexViewBase extends Vue implements ControlInterface { ...@@ -223,6 +223,7 @@ export default class WFIndexViewBase extends Vue implements ControlInterface {
} }
/** /**
* 获取多项数据 * 获取多项数据
* *
......
app_web/src/widgets/wfgroup/default-searchform/default-searchform-base.vue
浏览文件 @ a885975d
...@@ -172,6 +172,7 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -172,6 +172,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
} }
/** /**
* 获取多项数据 * 获取多项数据
* *
......
app_web/src/widgets/wfgroup/default-searchform/default-searchform-service.ts
浏览文件 @ a885975d
...@@ -41,6 +41,14 @@ export default class DefaultService extends ControlService { ...@@ -41,6 +41,14 @@ export default class DefaultService extends ControlService {
this.model = new DefaultModel(); this.model = new DefaultModel();
} }
/**
* 远端数据
*
* @type {*}
* @memberof DefaultService
*/
private remoteCopyData:any = {};
/** /**
* 处理数据 * 处理数据
* *
...@@ -271,6 +279,7 @@ export default class DefaultService extends ControlService { ...@@ -271,6 +279,7 @@ export default class DefaultService extends ControlService {
result = this.appEntityService.Get(Context,Data, isloading); result = this.appEntityService.Get(Context,Data, isloading);
} }
result.then((response) => { result.then((response) => {
this.setRemoteCopyData(response);
this.handleResponse(action, response); this.handleResponse(action, response);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
...@@ -301,6 +310,7 @@ export default class DefaultService extends ControlService { ...@@ -301,6 +310,7 @@ export default class DefaultService extends ControlService {
result = this.appEntityService.GetDraft(Context,Data, isloading); result = this.appEntityService.GetDraft(Context,Data, isloading);
} }
result.then((response) => { result.then((response) => {
this.setRemoteCopyData(response);
this.handleResponse(action, response, true); this.handleResponse(action, response, true);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
...@@ -434,5 +444,24 @@ export default class DefaultService extends ControlService { ...@@ -434,5 +444,24 @@ export default class DefaultService extends ControlService {
return item; return item;
} }
/**
* 设置远端数据
*
* @param result 远端请求结果
* @memberof DefaultService
*/
public setRemoteCopyData(result:any){
if (result && result.status === 200) {
this.remoteCopyData = Util.deepCopy(result.data);
}
}
/**
* 获取远端数据
*
* @memberof DefaultService
*/
public getRemoteCopyData(){
return this.remoteCopyData;
}
} }
\ No newline at end of file
app_web/src/widgets/wfgroup/main-form/main-form-base.vue
浏览文件 @ a885975d
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,7 @@
<i-form :model="this.data" class='app-form' ref='form' id='wfgroup_main' style=""> <i-form :model="this.data" class='app-form' ref='form' id='wfgroup_main' style="">
<input style="display:none;" /> <input style="display:none;" />
<row > <row >
<i-col v-show="detailsModel.group1.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<i-col v-show="detailsModel.group1.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-group :uiService="appUIService" :data="transformData(data)" :manageContainerStatus="detailsModel.group1.manageContainerStatus" :isManageContainer="detailsModel.group1.isManageContainer" @managecontainerclick="manageContainerClick('group1')" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.wfgroup.main_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" > <app-form-group :uiService="appUIService" :data="transformData(data)" :manageContainerStatus="detailsModel.group1.manageContainerStatus" :isManageContainer="detailsModel.group1.isManageContainer" @managecontainerclick="manageContainerClick('group1')" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.wfgroup.main_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >
<row> <row>
<i-col v-show="detailsModel.groupname.visible" :style="{}" :lg="{ span: 24, offset: 0 }"> <i-col v-show="detailsModel.groupname.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
...@@ -216,6 +215,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -216,6 +215,7 @@ export default class MainBase extends Vue implements ControlInterface {
} }
/** /**
* 视图默认使用 * 视图默认使用
* *
...@@ -459,66 +459,14 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -459,66 +459,14 @@ export default class MainBase extends Vue implements ControlInterface {
*/ */
public rules() :any { public rules() :any {
return { return {
srforikey: [
{ type: 'string', message: ' 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: ' 值必须为字符串类型', trigger: 'blur' },
{ required: this.detailsModel.srforikey.required, type: 'string', message: ' 值不能为空', trigger: 'change' },
{ required: this.detailsModel.srforikey.required, type: 'string', message: ' 值不能为空', trigger: 'blur' },
],
srfkey: [
{ type: 'string', message: '组标识 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '组标识 值必须为字符串类型', trigger: 'blur' },
{ required: this.detailsModel.srfkey.required, type: 'string', message: '组标识 值不能为空', trigger: 'change' },
{ required: this.detailsModel.srfkey.required, type: 'string', message: '组标识 值不能为空', trigger: 'blur' },
],
srfmajortext: [
{ type: 'string', message: '组名称 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '组名称 值必须为字符串类型', trigger: 'blur' },
{ required: this.detailsModel.srfmajortext.required, type: 'string', message: '组名称 值不能为空', trigger: 'change' },
{ required: this.detailsModel.srfmajortext.required, type: 'string', message: '组名称 值不能为空', trigger: 'blur' },
],
srftempmode: [
{ type: 'string', message: ' 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: ' 值必须为字符串类型', trigger: 'blur' },
{ required: this.detailsModel.srftempmode.required, type: 'string', message: ' 值不能为空', trigger: 'change' },
{ required: this.detailsModel.srftempmode.required, type: 'string', message: ' 值不能为空', trigger: 'blur' },
],
srfuf: [
{ type: 'string', message: ' 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: ' 值必须为字符串类型', trigger: 'blur' },
{ required: this.detailsModel.srfuf.required, type: 'string', message: ' 值不能为空', trigger: 'change' },
{ required: this.detailsModel.srfuf.required, type: 'string', message: ' 值不能为空', trigger: 'blur' },
],
srfdeid: [
{ type: 'string', message: ' 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: ' 值必须为字符串类型', trigger: 'blur' },
{ required: this.detailsModel.srfdeid.required, type: 'string', message: ' 值不能为空', trigger: 'change' },
{ required: this.detailsModel.srfdeid.required, type: 'string', message: ' 值不能为空', trigger: 'blur' },
],
srfsourcekey: [
{ type: 'string', message: ' 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: ' 值必须为字符串类型', trigger: 'blur' },
{ required: this.detailsModel.srfsourcekey.required, type: 'string', message: ' 值不能为空', trigger: 'change' },
{ required: this.detailsModel.srfsourcekey.required, type: 'string', message: ' 值不能为空', trigger: 'blur' },
],
groupname: [ groupname: [
{ type: 'string', message: '组名称 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '组名称 值必须为字符串类型', trigger: 'blur' },
{ required: this.detailsModel.groupname.required, type: 'string', message: '组名称 值不能为空', trigger: 'change' }, { required: this.detailsModel.groupname.required, type: 'string', message: '组名称 值不能为空', trigger: 'change' },
{ required: this.detailsModel.groupname.required, type: 'string', message: '组名称 值不能为空', trigger: 'blur' }, { required: this.detailsModel.groupname.required, type: 'string', message: '组名称 值不能为空', trigger: 'blur' },
], ],
groupscope: [ groupscope: [
{ type: 'string', message: '范围 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '范围 值必须为字符串类型', trigger: 'blur' },
{ required: this.detailsModel.groupscope.required, type: 'string', message: '范围 值不能为空', trigger: 'change' }, { required: this.detailsModel.groupscope.required, type: 'string', message: '范围 值不能为空', trigger: 'change' },
{ required: this.detailsModel.groupscope.required, type: 'string', message: '范围 值不能为空', trigger: 'blur' }, { required: this.detailsModel.groupscope.required, type: 'string', message: '范围 值不能为空', trigger: 'blur' },
], ],
groupid: [
{ type: 'string', message: '组标识 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '组标识 值必须为字符串类型', trigger: 'blur' },
{ required: this.detailsModel.groupid.required, type: 'string', message: '组标识 值不能为空', trigger: 'change' },
{ required: this.detailsModel.groupid.required, type: 'string', message: '组标识 值不能为空', trigger: 'blur' },
],
} }
} }
...@@ -555,32 +503,38 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -555,32 +503,38 @@ export default class MainBase extends Vue implements ControlInterface {
falg.isPast = val; falg.isPast = val;
} }
} }
rule[name].forEach((item:any) => { for(let i=0;i<rule[name].length;i++){
let item:any = rule[name][i];
let dataValue = item.deName?this.data[this.service.getItemNameByDeName(item.deName)]:""; let dataValue = item.deName?this.data[this.service.getItemNameByDeName(item.deName)]:"";
// 常规规则 // 常规规则
if(item.type == 'SIMPLE'){ if(item.type == 'SIMPLE'){
startOp(!this.$verify.checkFieldSimpleRule(dataValue,item.condOP,item.paramValue,item.ruleInfo,item.paramType,this.data,item.isKeyCond)); startOp(!this.$verify.checkFieldSimpleRule(dataValue,item.condOP,item.paramValue,item.ruleInfo,item.paramType,this.data,item.isKeyCond));
falg.infoMessage = item.ruleInfo; falg.infoMessage = item.ruleInfo;
if(!falg.isPast) return falg;
} }
// 数值范围 // 数值范围
if(item.type == 'VALUERANGE2'){ if(item.type == 'VALUERANGE2'){
startOp( !this.$verify.checkFieldValueRangeRule(dataValue,item.minValue,item.isIncludeMinValue,item.maxValue,item.isIncludeMaxValue,item.ruleInfo,item.isKeyCond)); startOp( !this.$verify.checkFieldValueRangeRule(dataValue,item.minValue,item.isIncludeMinValue,item.maxValue,item.isIncludeMaxValue,item.ruleInfo,item.isKeyCond));
falg.infoMessage = item.ruleInfo; falg.infoMessage = item.ruleInfo;
if(!falg.isPast) return falg;
} }
// 正则式 // 正则式
if (item.type == "REGEX") { if (item.type == "REGEX") {
startOp(!this.$verify.checkFieldRegExRule(dataValue,item.regExCode,item.ruleInfo,item.isKeyCond)); startOp(!this.$verify.checkFieldRegExRule(dataValue,item.regExCode,item.ruleInfo,item.isKeyCond));
falg.infoMessage = item.ruleInfo; falg.infoMessage = item.ruleInfo;
if(!falg.isPast) return falg;
} }
// 长度 // 长度
if (item.type == "STRINGLENGTH") { if (item.type == "STRINGLENGTH") {
startOp(!this.$verify.checkFieldStringLengthRule(dataValue,item.minValue,item.isIncludeMinValue,item.maxValue,item.isIncludeMaxValue,item.ruleInfo,item.isKeyCond)); startOp(!this.$verify.checkFieldStringLengthRule(dataValue,item.minValue,item.isIncludeMinValue,item.maxValue,item.isIncludeMaxValue,item.ruleInfo,item.isKeyCond));
falg.infoMessage = item.ruleInfo; falg.infoMessage = item.ruleInfo;
if(!falg.isPast) return falg;
} }
// 系统值规则 // 系统值规则
if(item.type == "SYSVALUERULE") { if(item.type == "SYSVALUERULE") {
startOp(!this.$verify.checkFieldSysValueRule(dataValue,item.sysRule.regExCode,item.ruleInfo,item.isKeyCond)); startOp(!this.$verify.checkFieldSysValueRule(dataValue,item.sysRule.regExCode,item.ruleInfo,item.isKeyCond));
falg.infoMessage = item.ruleInfo; falg.infoMessage = item.ruleInfo;
if(!falg.isPast) return falg;
} }
// 分组 // 分组
if(item.type == 'GROUP'){ if(item.type == 'GROUP'){
...@@ -588,9 +542,9 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -588,9 +542,9 @@ export default class MainBase extends Vue implements ControlInterface {
if(item.isNotMode){ if(item.isNotMode){
falg.isPast = !falg.isPast; falg.isPast = !falg.isPast;
} }
if(!falg.isPast) return falg;
}
} }
});
if(!falg.hasOwnProperty("isPast")){ if(!falg.hasOwnProperty("isPast")){
falg.isPast = true; falg.isPast = true;
} }
...@@ -1180,12 +1134,12 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1180,12 +1134,12 @@ export default class MainBase extends Vue implements ControlInterface {
/** /**
* 部件刷新 * 部件刷新
* *
* @param {any[]} args * @param {any} args
* @memberof MainBase * @memberof MainBase
*/ */
public refresh(args: any[]): void { public refresh(args?: any): void {
let arg: any = {}; let arg: any = {};
Object.assign(arg,args[0]); Object.assign(arg,args?args[0]:{});
if (this.data.srfkey && !Object.is(this.data.srfkey, '')) { if (this.data.srfkey && !Object.is(this.data.srfkey, '')) {
Object.assign(arg, { srfkey: this.data.srfkey }); Object.assign(arg, { srfkey: this.data.srfkey });
this.load(arg); this.load(arg);
......
app_web/src/widgets/wfgroup/main-form/main-form-service.ts
浏览文件 @ a885975d
...@@ -41,6 +41,14 @@ export default class MainService extends ControlService { ...@@ -41,6 +41,14 @@ export default class MainService extends ControlService {
this.model = new MainModel(); this.model = new MainModel();
} }
/**
* 远端数据
*
* @type {*}
* @memberof MainService
*/
private remoteCopyData:any = {};
/** /**
* 处理数据 * 处理数据
* *
...@@ -271,6 +279,7 @@ export default class MainService extends ControlService { ...@@ -271,6 +279,7 @@ export default class MainService extends ControlService {
result = this.appEntityService.Get(Context,Data, isloading); result = this.appEntityService.Get(Context,Data, isloading);
} }
result.then((response) => { result.then((response) => {
this.setRemoteCopyData(response);
this.handleResponse(action, response); this.handleResponse(action, response);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
...@@ -305,6 +314,7 @@ export default class MainService extends ControlService { ...@@ -305,6 +314,7 @@ export default class MainService extends ControlService {
result = this.appEntityService.GetDraft(Context,Data, isloading); result = this.appEntityService.GetDraft(Context,Data, isloading);
} }
result.then((response) => { result.then((response) => {
this.setRemoteCopyData(response);
response.data.id = PrimaryKey; response.data.id = PrimaryKey;
this.handleResponse(action, response, true); this.handleResponse(action, response, true);
resolve(response); resolve(response);
...@@ -439,5 +449,24 @@ export default class MainService extends ControlService { ...@@ -439,5 +449,24 @@ export default class MainService extends ControlService {
return item; return item;
} }
/**
* 设置远端数据
*
* @param result 远端请求结果
* @memberof MainService
*/
public setRemoteCopyData(result:any){
if (result && result.status === 200) {
this.remoteCopyData = Util.deepCopy(result.data);
}
}
/**
* 获取远端数据
*
* @memberof MainService
*/
public getRemoteCopyData(){
return this.remoteCopyData;
}
} }
\ No newline at end of file
app_web/src/widgets/wfgroup/main-grid/main-grid-base.vue
浏览文件 @ a885975d
...@@ -241,6 +241,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -241,6 +241,7 @@ export default class MainBase extends Vue implements ControlInterface {
} }
/** /**
* 代码表服务对象 * 代码表服务对象
* *
...@@ -568,10 +569,10 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -568,10 +569,10 @@ export default class MainBase extends Vue implements ControlInterface {
/** /**
* 部件刷新 * 部件刷新
* *
* @param {any[]} args * @param {any} args
* @memberof MainBase * @memberof MainBase
*/ */
public refresh(args: any[]): void { public refresh(args?: any): void {
this.load(); this.load();
} }
...@@ -789,7 +790,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -789,7 +790,7 @@ export default class MainBase extends Vue implements ControlInterface {
this.totalrow = response.total; this.totalrow = response.total;
this.items = JSON.parse(JSON.stringify(data)); this.items = JSON.parse(JSON.stringify(data));
// 清空selections,gridItemsModel // 清空selections,gridItemsModel
this.selections = []; //this.selections = [];
this.gridItemsModel = []; this.gridItemsModel = [];
this.items.forEach(()=>{this.gridItemsModel.push(this.getGridRowModel())}); this.items.forEach(()=>{this.gridItemsModel.push(this.getGridRowModel())});
this.items.forEach((item:any)=>{ this.items.forEach((item:any)=>{
...@@ -799,8 +800,18 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -799,8 +800,18 @@ export default class MainBase extends Vue implements ControlInterface {
// 设置默认选中 // 设置默认选中
let _this = this; let _this = this;
setTimeout(() => { setTimeout(() => {
//在导航视图中，如已有选中数据，则右侧展开已选中数据的视图，如无选中数据则默认选中第一条
if(_this.isSelectFirstDefault){ if(_this.isSelectFirstDefault){
_this.rowClick(_this.items[0]); if(_this.selections && _this.selections.length > 0){
_this.selections.forEach((select: any)=>{
const index = _this.items.findIndex((item:any) => Object.is(item.srfkey,select.srfkey));
if(index != -1){
_this.rowClick(_this.items[index]);
}
})
}else{
_this.rowClick(this.items[0]);
}
} }
if(_this.selectedData){ if(_this.selectedData){
const refs: any = _this.$refs; const refs: any = _this.$refs;
...@@ -1919,6 +1930,33 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1919,6 +1930,33 @@ export default class MainBase extends Vue implements ControlInterface {
public updateDefault(row: any){ public updateDefault(row: any){
} }
/**
* 计算数据对象类型的默认值
* @param {string} action 行为
* @param {string} param 默认值参数
* @param {*} data 当前行数据
* @memberof MainBase
*/
public computeDefaultValueWithParam(action:string,param:string,data:any){
if(Object.is(action,"UPDATE")){
const nativeData:any = this.service.getCopynativeData();
if(nativeData && (nativeData instanceof Array) && nativeData.length >0){
let targetData:any = nativeData.find((item:any) =>{
return item.id === data.srfkey;
})
if(targetData){
return targetData[param]?targetData[param]:null;
}else{
return null;
}
}else{
return null;
}
}else{
return this.service.getRemoteCopyData()[param]?this.service.getRemoteCopyData()[param]:null;
}
}
/** /**
* 校验属性值规则 * 校验属性值规则
* *
......
app_web/src/widgets/wfgroup/main-grid/main-grid-service.ts
浏览文件 @ a885975d
...@@ -47,7 +47,15 @@ export default class MainService extends ControlService { ...@@ -47,7 +47,15 @@ export default class MainService extends ControlService {
* @type {*} * @type {*}
* @memberof MainService * @memberof MainService
*/ */
public copynativeData:any; private copynativeData:any;
/**
* 远端数据
*
* @type {*}
* @memberof MainService
*/
private remoteCopyData:any = {};
/** /**
...@@ -239,7 +247,7 @@ export default class MainService extends ControlService { ...@@ -239,7 +247,7 @@ export default class MainService extends ControlService {
result =_appEntityService.FetchDefault(Context,Data, isloading); result =_appEntityService.FetchDefault(Context,Data, isloading);
} }
result.then((response) => { result.then((response) => {
this.copynativeData = Util.deepCopy(response.data); this.setCopynativeData(response.data);
this.handleResponse(action, response); this.handleResponse(action, response);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
...@@ -277,6 +285,7 @@ export default class MainService extends ControlService { ...@@ -277,6 +285,7 @@ export default class MainService extends ControlService {
//仿真主键数据 //仿真主键数据
response.data.id = Util.createUUID(); response.data.id = Util.createUUID();
} }
this.setRemoteCopyData(response);
this.handleResponse(action, response, true); this.handleResponse(action, response, true);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
...@@ -443,4 +452,43 @@ export default class MainService extends ControlService { ...@@ -443,4 +452,43 @@ export default class MainService extends ControlService {
}); });
} }
/**
* 设置远端数据
*
* @param result 远端请求结果
* @memberof MainService
*/
public setRemoteCopyData(result:any){
if (result && result.status === 200) {
this.remoteCopyData = Util.deepCopy(result.data);
}
}
/**
* 获取远端数据
*
* @memberof MainService
*/
public getRemoteCopyData(){
return this.remoteCopyData;
}
/**
* 设置备份原生数据
*
* @param data 远端请求结果
* @memberof MainService
*/
public setCopynativeData(data:any){
this.copynativeData = Util.deepCopy(data);
}
/**
* 获取备份原生数据
*
* @memberof MainService
*/
public getCopynativeData(){
return this.copynativeData;
}
} }
\ No newline at end of file
app_web/src/widgets/wfgroup/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-base.vue
浏览文件 @ a885975d
...@@ -151,6 +151,7 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr ...@@ -151,6 +151,7 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr
/** /**
* 选中数据字符串 * 选中数据字符串
* *
......
app_web/src/widgets/wfgroup/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-base.vue
浏览文件 @ a885975d
...@@ -151,6 +151,7 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro ...@@ -151,6 +151,7 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro
/** /**
* 选中数据字符串 * 选中数据字符串
* *
......
app_web/src/widgets/wfmember/default-searchform/default-searchform-base.vue
浏览文件 @ a885975d
...@@ -172,6 +172,7 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -172,6 +172,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
} }
/** /**
* 获取多项数据 * 获取多项数据
* *
......
app_web/src/widgets/wfmember/default-searchform/default-searchform-service.ts
浏览文件 @ a885975d
...@@ -41,6 +41,14 @@ export default class DefaultService extends ControlService { ...@@ -41,6 +41,14 @@ export default class DefaultService extends ControlService {
this.model = new DefaultModel(); this.model = new DefaultModel();
} }
/**
* 远端数据
*
* @type {*}
* @memberof DefaultService
*/
private remoteCopyData:any = {};
/** /**
* 处理数据 * 处理数据
* *
...@@ -271,6 +279,7 @@ export default class DefaultService extends ControlService { ...@@ -271,6 +279,7 @@ export default class DefaultService extends ControlService {
result = this.appEntityService.Get(Context,Data, isloading); result = this.appEntityService.Get(Context,Data, isloading);
} }
result.then((response) => { result.then((response) => {
this.setRemoteCopyData(response);
this.handleResponse(action, response); this.handleResponse(action, response);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
...@@ -301,6 +310,7 @@ export default class DefaultService extends ControlService { ...@@ -301,6 +310,7 @@ export default class DefaultService extends ControlService {
result = this.appEntityService.GetDraft(Context,Data, isloading); result = this.appEntityService.GetDraft(Context,Data, isloading);
} }
result.then((response) => { result.then((response) => {
this.setRemoteCopyData(response);
this.handleResponse(action, response, true); this.handleResponse(action, response, true);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
...@@ -434,5 +444,24 @@ export default class DefaultService extends ControlService { ...@@ -434,5 +444,24 @@ export default class DefaultService extends ControlService {
return item; return item;
} }
/**
* 设置远端数据
*
* @param result 远端请求结果
* @memberof DefaultService
*/
public setRemoteCopyData(result:any){
if (result && result.status === 200) {
this.remoteCopyData = Util.deepCopy(result.data);
}
}
/**
* 获取远端数据
*
* @memberof DefaultService
*/
public getRemoteCopyData(){
return this.remoteCopyData;
}
} }
\ No newline at end of file
app_web/src/widgets/wfmember/main-form/main-form-service.ts
浏览文件 @ a885975d
...@@ -59,6 +59,14 @@ export default class MainService extends ControlService { ...@@ -59,6 +59,14 @@ export default class MainService extends ControlService {
*/ */
public wfgroupService: WFGroupService = new WFGroupService(); public wfgroupService: WFGroupService = new WFGroupService();
/**
* 远端数据
*
* @type {*}
* @memberof MainService
*/
private remoteCopyData:any = {};
/** /**
* 处理数据 * 处理数据
* *
...@@ -295,6 +303,7 @@ export default class MainService extends ControlService { ...@@ -295,6 +303,7 @@ export default class MainService extends ControlService {
result = this.appEntityService.Get(Context,Data, isloading); result = this.appEntityService.Get(Context,Data, isloading);
} }
result.then((response) => { result.then((response) => {
this.setRemoteCopyData(response);
this.handleResponse(action, response); this.handleResponse(action, response);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
...@@ -329,6 +338,7 @@ export default class MainService extends ControlService { ...@@ -329,6 +338,7 @@ export default class MainService extends ControlService {
result = this.appEntityService.GetDraft(Context,Data, isloading); result = this.appEntityService.GetDraft(Context,Data, isloading);
} }
result.then((response) => { result.then((response) => {
this.setRemoteCopyData(response);
response.data.memberid = PrimaryKey; response.data.memberid = PrimaryKey;
this.handleResponse(action, response, true); this.handleResponse(action, response, true);
resolve(response); resolve(response);
...@@ -463,5 +473,24 @@ export default class MainService extends ControlService { ...@@ -463,5 +473,24 @@ export default class MainService extends ControlService {
return item; return item;
} }
/**
* 设置远端数据
*
* @param result 远端请求结果
* @memberof MainService
*/
public setRemoteCopyData(result:any){
if (result && result.status === 200) {
this.remoteCopyData = Util.deepCopy(result.data);
}
}
/**
* 获取远端数据
*
* @memberof MainService
*/
public getRemoteCopyData(){
return this.remoteCopyData;
}
} }
\ No newline at end of file
app_web/src/widgets/wfmember/main-grid/main-grid-base.vue
浏览文件 @ a885975d
...@@ -253,6 +253,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -253,6 +253,7 @@ export default class MainBase extends Vue implements ControlInterface {
} }
/** /**
* 代码表服务对象 * 代码表服务对象
* *
...@@ -580,10 +581,10 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -580,10 +581,10 @@ export default class MainBase extends Vue implements ControlInterface {
/** /**
* 部件刷新 * 部件刷新
* *
* @param {any[]} args * @param {any} args
* @memberof MainBase * @memberof MainBase
*/ */
public refresh(args: any[]): void { public refresh(args?: any): void {
this.load(); this.load();
} }
...@@ -809,7 +810,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -809,7 +810,7 @@ export default class MainBase extends Vue implements ControlInterface {
this.totalrow = response.total; this.totalrow = response.total;
this.items = JSON.parse(JSON.stringify(data)); this.items = JSON.parse(JSON.stringify(data));
// 清空selections,gridItemsModel // 清空selections,gridItemsModel
this.selections = []; //this.selections = [];
this.gridItemsModel = []; this.gridItemsModel = [];
this.items.forEach(()=>{this.gridItemsModel.push(this.getGridRowModel())}); this.items.forEach(()=>{this.gridItemsModel.push(this.getGridRowModel())});
this.items.forEach((item:any)=>{ this.items.forEach((item:any)=>{
...@@ -819,8 +820,18 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -819,8 +820,18 @@ export default class MainBase extends Vue implements ControlInterface {
// 设置默认选中 // 设置默认选中
let _this = this; let _this = this;
setTimeout(() => { setTimeout(() => {
//在导航视图中，如已有选中数据，则右侧展开已选中数据的视图，如无选中数据则默认选中第一条
if(_this.isSelectFirstDefault){ if(_this.isSelectFirstDefault){
_this.rowClick(_this.items[0]); if(_this.selections && _this.selections.length > 0){
_this.selections.forEach((select: any)=>{
const index = _this.items.findIndex((item:any) => Object.is(item.srfkey,select.srfkey));
if(index != -1){
_this.rowClick(_this.items[index]);
}
})
}else{
_this.rowClick(this.items[0]);
}
} }
if(_this.selectedData){ if(_this.selectedData){
const refs: any = _this.$refs; const refs: any = _this.$refs;
...@@ -1940,6 +1951,33 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1940,6 +1951,33 @@ export default class MainBase extends Vue implements ControlInterface {
public updateDefault(row: any){ public updateDefault(row: any){
} }
/**
* 计算数据对象类型的默认值
* @param {string} action 行为
* @param {string} param 默认值参数
* @param {*} data 当前行数据
* @memberof MainBase
*/
public computeDefaultValueWithParam(action:string,param:string,data:any){
if(Object.is(action,"UPDATE")){
const nativeData:any = this.service.getCopynativeData();
if(nativeData && (nativeData instanceof Array) && nativeData.length >0){
let targetData:any = nativeData.find((item:any) =>{
return item.memberid === data.srfkey;
})
if(targetData){
return targetData[param]?targetData[param]:null;
}else{
return null;
}
}else{
return null;
}
}else{
return this.service.getRemoteCopyData()[param]?this.service.getRemoteCopyData()[param]:null;
}
}
/** /**
* 校验属性值规则 * 校验属性值规则
* *
......
app_web/src/widgets/wfprocess-definition/default-searchform/default-searchform-base.vue
浏览文件 @ a885975d
...@@ -186,6 +186,7 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -186,6 +186,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
} }
/** /**
* 获取多项数据 * 获取多项数据
* *
......
app_web/src/widgets/wftask/default-searchform/default-searchform-base.vue
浏览文件 @ a885975d
...@@ -221,6 +221,7 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -221,6 +221,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
} }
/** /**
* 获取多项数据 * 获取多项数据
* *
......
app_web/src/widgets/wfuser/default-searchform/default-searchform-base.vue
浏览文件 @ a885975d
...@@ -172,6 +172,7 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -172,6 +172,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
} }
/** /**
* 获取多项数据 * 获取多项数据
* *
......
app_web/src/widgets/wfuser/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-base.vue
浏览文件 @ a885975d
...@@ -151,6 +151,7 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr ...@@ -151,6 +151,7 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr
/** /**
* 选中数据字符串 * 选中数据字符串
* *
......
app_web/src/widgets/wfuser/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-base.vue
浏览文件 @ a885975d
...@@ -151,6 +151,7 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro ...@@ -151,6 +151,7 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro
/** /**
* 选中数据字符串 * 选中数据字符串
* *
......
ibzwf-app/ibzwf-app-web/src/main/resources/application-web-prod.yml
浏览文件 @ a885975d
...@@ -48,7 +48,7 @@ zuul: ...@@ -48,7 +48,7 @@ zuul:
serviceId: ${ibiz.ref.service.uaa:ibzuaa-api} serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
stripPrefix: false stripPrefix: false
config: config:
path: /config/** path: /configs/**
serviceId: ${ibiz.ref.service.uaa:ibzuaa-api} serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
stripPrefix: false stripPrefix: false
oucore: oucore:
......
ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFGroup.java
浏览文件 @ a885975d
...@@ -18,6 +18,7 @@ import cn.ibizlab.util.domain.EntityBase; ...@@ -18,6 +18,7 @@ import cn.ibizlab.util.domain.EntityBase;
import cn.ibizlab.util.annotation.DEField; import cn.ibizlab.util.annotation.DEField;
import cn.ibizlab.util.enums.DEPredefinedFieldType; import cn.ibizlab.util.enums.DEPredefinedFieldType;
import cn.ibizlab.util.enums.DEFieldDefaultValueType; import cn.ibizlab.util.enums.DEFieldDefaultValueType;
import cn.ibizlab.util.helper.DataObject;
import java.io.Serializable; import java.io.Serializable;
import lombok.*; import lombok.*;
import org.springframework.data.annotation.Transient; import org.springframework.data.annotation.Transient;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或