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]
### Bug修复
......
app_web/package.json
浏览文件 @ a885975d
......@@ -43,7 +43,7 @@
"vue-property-decorator": "^8.3.0",
"vue-router": "^3.1.3",
"vuex": "^3.1.2",
"xlsx": "^0.15.6"
"xlsx": "^0.15.6"
},
"devDependencies": {
"@types/echarts": "^4.4.3",
......
app_web/src/authservice/auth-service.ts
浏览文件 @ a885975d
import store from '@/store';
import { Environment } from '@/environments/environment';
/**
* 实体权限服务
*
......@@ -115,7 +117,13 @@ export default class AuthService {
if(!this.$store.getters['authresource/getEnablePermissionValid']) {
return true;
}
return this.$store.getters['authresource/getAuthMenu'](item);
if(Object.is(Environment.menuPermissionMode,"RT")){
return this.$store.getters['authresource/getAuthMenuWithRT'](item);
}else if(Object.is(Environment.menuPermissionMode,"RESOURCE")){
return this.$store.getters['authresource/getAuthMenuWithResource'](item);
}else{
return this.$store.getters['authresource/getAuthMenu'](item);
}
}
/**
......
app_web/src/codelist/codelist-service.ts
浏览文件 @ a885975d
......@@ -149,10 +149,11 @@ export default class CodeListService {
// 启用缓存
if(isEnableCache){
const callback:Function = (context:any ={},data:any ={},tag:string,promise:Promise<any>) =>{
const callbackKey:string = `${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`;
promise.then((result:any) =>{
if(result.length > 0){
CodeListService.codelistCached.set(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`,{items:result});
CodeListService.codelistCache.delete(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`);
CodeListService.codelistCached.set(callbackKey,{items:result});
CodeListService.codelistCache.delete(callbackKey);
return resolve(result);
}else{
return resolve([]);
......@@ -162,8 +163,9 @@ export default class CodeListService {
})
}
// 加载完成,从本地缓存获取
if(CodeListService.codelistCached.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`)){
let items:any = CodeListService.codelistCached.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`).items;
const key:string = `${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`;
if(CodeListService.codelistCached.get(key)){
let items:any = CodeListService.codelistCached.get(key).items;
if(items.length >0){
if(new Date().getTime() <= codelist.getExpirationTime()){
return resolve(items);
......@@ -172,11 +174,11 @@ export default class CodeListService {
}
if (codelist) {
// 加载中，UI又需要数据，解决连续加载同一代码表问题
if(CodeListService.codelistCache.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`)){
callback(context,data,tag,CodeListService.codelistCache.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`));
if(CodeListService.codelistCache.get(key)){
callback(context,data,tag,CodeListService.codelistCache.get(key));
}else{
let result:Promise<any> = codelist.getItems(context,data,isloading);
CodeListService.codelistCache.set(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`,result);
CodeListService.codelistCache.set(key,result);
codelist.setExpirationTime(new Date().getTime() + cacheTimeout);
callback(context,data,tag,result);
}
......
app_web/src/codelist/wfsystem-list.ts
浏览文件 @ a885975d
......@@ -106,15 +106,17 @@ export default class WFSystemList {
*/
public doItems(items: any[]): any[] {
let _items: any[] = [];
items.forEach((item: any) => {
let itemdata:any = {};
Object.assign(itemdata,{id:item.pssystemid});
Object.assign(itemdata,{value:item.pssystemid});
Object.assign(itemdata,{text:item.pssystemname});
Object.assign(itemdata,{label:item.pssystemname});
_items.push(itemdata);
});
if(items && items instanceof Array && items.length >0){
items.forEach((item: any) => {
let itemdata:any = {};
Object.assign(itemdata,{id:item.pssystemid});
Object.assign(itemdata,{value:item.pssystemid});
Object.assign(itemdata,{text:item.pssystemname});
Object.assign(itemdata,{label:item.pssystemname});
_items.push(itemdata);
});
}
return _items;
}
......
app_web/src/components/app-actionbar/app-actionbar.vue
浏览文件 @ a885975d
......@@ -66,7 +66,7 @@ export default class AppActionBar extends Vue {
public created(){
if (this.viewState) {
this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
if (!Object.is(tag, "app-actionbar")) {
if (!Object.is(tag, "all-portlet")) {
return;
}
if(Object.is(action,'loadmodel')){
......@@ -107,7 +107,7 @@ export default class AppActionBar extends Vue {
const _item = ActionModel[key];
if(_item && _item['dataaccaction'] && UIService){
let dataActionResult:any;
if(Object.is(_item['actiontarget'],"NONE")){
if(Object.is(_item['actiontarget'],"NONE") || Object.is(_item['actiontarget'],"")){
dataActionResult = UIService.getResourceOPPrivs(_item['dataaccaction']);
}else{
if(data && Object.keys(data).length >0){
......
app_web/src/components/app-alert-group/app-alert-group.vue
浏览文件 @ a885975d
......@@ -4,7 +4,11 @@
<app-alert
:key="index"
:tag="item.tag"
:position="item.position"/>
:context="context"
:viewparam="viewparam"
:position="item.position"
:infoGroup="infoGroup"
:viewname="viewname"/>
</template>
</div>
......@@ -32,6 +36,23 @@ export default class AppAlertGroup extends Vue {
*/
@Prop() infoGroup: any;
/**
* 应用上下文
*
* @type {any}
* @memberof AppAlertGroup
*/
@Prop() context: any;
/**
* 视图参数
*
* @type {any}
* @memberof AppAlertGroup
*/
@Prop() viewparam: any;
/**
* 视图消息组显示位置
*
......@@ -40,6 +61,14 @@ export default class AppAlertGroup extends Vue {
*/
@Prop() position: any;
/**
* 视图名称
*
* @type {any}
* @memberof AppAlertGroup
*/
@Prop() viewname: any;
/**
* 当前位置视图消息集合
*
......
app_web/src/components/app-alert/app-alert.vue
浏览文件 @ a885975d
......@@ -43,6 +43,39 @@ export default class AppAlert extends Vue {
* @memberof AppAlert
*/
@Prop() position: any;
/**
* 应用上下文
*
* @type {any}
* @memberof AppAlert
*/
@Prop() context: any;
/**
* 视图参数
*
* @type {any}
* @memberof AppAlert
*/
@Prop() viewparam: any;
/**
* 视图消息组tag
*
* @type {any}
* @memberof AppAlert
*/
@Prop() infoGroup!: any;
/**
* 视图名称
*
* @type {any}
* @memberof AppAlert
*/
@Prop() viewname!: any;
/**
* 视图消息对象
......@@ -79,7 +112,7 @@ export default class AppAlert extends Vue {
* @memberof AppAlert
*/
public async getData() {
let response: any = await this.viewMessageService.getViewMessageByTag(this.tag, null, null)
let response: any = await this.viewMessageService.getViewMessageByTag(this.tag, this.context, this.viewparam);
if(response && response.length > 0) {
response.forEach((item: any) => {
let tempData: any = JSON.parse(JSON.stringify(item));
......@@ -118,7 +151,8 @@ export default class AppAlert extends Vue {
data.showState = true;
if(data.closeMode || data.closeMode == 0) {
if(data.closeMode == 1) {
const id = this.$store.getters.getViewMessage(data.codename);
const tag = this.viewname + '_' + this.infoGroup + '_' + data.codename;
const id = localStorage.getItem(tag);
if(id) {
data.showState = false;
flag = false;
......@@ -182,14 +216,14 @@ export default class AppAlert extends Vue {
let tempArr: any[] = data.customClass.toString().split(',');
if(tempArr && tempArr.length > 0) {
if(Object.is("1", tempArr[1])) {
const args = { tag: tempArr[0], id: data.customClass };
this.$store.commit('addViewMessage', args);
const tag = this.viewname + '_' + this.infoGroup + '_' + tempArr[0];
localStorage.setItem(tag, data.customClass);
}
}
}
if(data.closeMode && data.closeMode == 1) {
const args = {tag: data.codename, id: data.id};
this.$store.commit('addViewMessage', args);
const tag = this.viewname + '_' + this.infoGroup + '_' + data.codename;
localStorage.setItem(tag,data.id);
}
}
......
app_web/src/components/app-breadcrumb/app-breadcrumb.vue
浏览文件 @ a885975d
<template>
<el-breadcrumb class="app-breadcrumb" separator="/">
<el-breadcrumb class="app-breadcrumb" :separator="separator">
<transition-group name="breadcrumb">
<template v-if="Object.is(this.navModel,'route')">
<el-breadcrumb-item v-for="(item, index) in breadcrumbs" :key="item.id">
......@@ -34,6 +34,7 @@
import { Component, Vue, Watch, Prop } from 'vue-property-decorator'
import { RouteRecord, Route } from 'vue-router'
import { Environment } from "@/environments/environment";
import { appConfig } from '@/config/appConfig';
import NavDataService from '@/service/app/navdata-service';
import {Subscription } from 'rxjs';
......@@ -48,6 +49,13 @@ export default class Breadcrumb extends Vue {
*/
private breadcrumbs: Array<any> = [];
/**
* 面包屑分隔符
*
* @memberof Breadcrumb
*/
private separator:string = appConfig.breadcrumbSeparator;
/**
* 导航服务
*
......
app_web/src/components/app-form-group/app-form-group.vue
浏览文件 @ a885975d
......@@ -165,7 +165,7 @@ export default class AppFormGroup extends Vue {
const _item = ActionModel[key];
if(_item && _item['dataaccaction'] && UIService){
let dataActionResult:any;
if(Object.is(_item['actiontarget'],"NONE")){
if(Object.is(_item['actiontarget'],"NONE") || Object.is(_item['actiontarget'],"")){
dataActionResult = UIService.getResourceOPPrivs(_item['dataaccaction']);
}else{
if(data && Object.keys(data).length >0){
......
app_web/src/components/app-image-preview/app-image-preview.vue
浏览文件 @ a885975d
......@@ -21,7 +21,7 @@
</ul>
<!-- 预览 -->
<modal v-model="dialogVisible" footer-hide width="auto" class-name='app-image-preview-model'>
<el-image src="dialogImageUrl">
<el-image :src="dialogImageUrl">
<div slot='error' class='image-slot'>
<img src="/assets/img/picture.png">
</div>
......
app_web/src/components/app-image-upload/app-image-upload.vue
浏览文件 @ a885975d
......@@ -49,7 +49,7 @@
</el-upload>
<!-- 预览 -->
<modal v-model="dialogVisible" footer-hide class-name='app-image-upload-model'>
<el-image src="dialogImageUrl">
<el-image :src="dialogImageUrl">
<div slot='error' class='image-slot'>
<i class='el-icon-picture-outline'></i>
</div>
......
app_web/src/components/app-picker/app-picker.vue
浏览文件 @ a885975d
......@@ -65,7 +65,7 @@ export default class AppPicker extends Vue {
* 视图上下文
*
* @type {*}
* @memberof AppFormDRUIPart
* @memberof AppPicker
*/
@Prop() public context!: any;
......@@ -73,7 +73,7 @@ export default class AppPicker extends Vue {
* 视图参数
*
* @type {*}
* @memberof AppFormDRUIPart
* @memberof AppPicker
*/
@Prop() public viewparams!: any;
......@@ -81,15 +81,23 @@ export default class AppPicker extends Vue {
* AC参数
*
* @type {*}
* @memberof AppFormDRUIPart
* @memberof AppPicker
*/
@Prop({default: () => {}}) public acParams?: any;
/**
* 外键值附加数据
*
* @type {*}
* @memberof AppPicker
*/
@Prop() public pickUpData?: string;
/**
* 表单服务
*
* @type {*}
* @memberof AppFormDRUIPart
* @memberof AppPicker
*/
@Prop() public service?: any;
......@@ -97,7 +105,7 @@ export default class AppPicker extends Vue {
* 应用实体主信息属性名称
*
* @type {string}
* @memberof AppAutocomplete
* @memberof AppPicker
*/
@Prop({default: 'srfmajortext'}) public deMajorField!: string;
......@@ -105,7 +113,7 @@ export default class AppPicker extends Vue {
* 应用实体主键属性名称
*
* @type {string}
* @memberof AppAutocomplete
* @memberof AppPicker
*/
@Prop({default: 'srfkey'}) public deKeyField!: string;
......@@ -240,7 +248,7 @@ export default class AppPicker extends Vue {
* 输入状态
*
* @type {boolean}
* @memberof AppAutocomplete
* @memberof AppPicker
*/
public inputState: boolean = false;
......@@ -397,6 +405,7 @@ export default class AppPicker extends Vue {
if (this.name) {
this.$emit('formitemvaluechange', { name: this.name, value: item[this.deMajorField] });
}
this.fillPickUpData(item);
}
/**
......@@ -430,6 +439,7 @@ export default class AppPicker extends Vue {
if (this.name) {
this.$emit('formitemvaluechange', { name: this.name, value: '' });
}
this.fillPickUpData();
this.$forceUpdate();
}
......@@ -672,6 +682,7 @@ export default class AppPicker extends Vue {
if (this.name) {
this.$emit('formitemvaluechange', { name: this.name, value: item[this.deMajorField]?item[this.deMajorField]:item["srfmajortext"] });
}
this.fillPickUpData(item);
}
}
......@@ -752,7 +763,7 @@ export default class AppPicker extends Vue {
/**
* 输入过程中
*
* @memberof AppAutocomplete
* @memberof AppPicker
*/
public onInput($event: any) {
if (Object.is($event, this.value)) {
......@@ -783,6 +794,34 @@ export default class AppPicker extends Vue {
appPicker.blur();
}
}
/**
* 填充外键值附加数据
*
* @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: "",
});
}
}
}
}
}
}
......
app_web/src/components/avue-custom-form/avue-custom-form.vue
浏览文件 @ a885975d
......@@ -20,10 +20,10 @@ export default class AvueCustomForm extends Vue {
/**
* 编辑器参数传入组件配置
*
* @type {any}
* @type {*}
* @memberof AvueCustomForm
*/
@Prop() public options?: any;
public options: any;
/**
* 是否需要转换为string类型
......@@ -47,7 +47,7 @@ export default class AvueCustomForm extends Vue {
* @type {any}
* @memberof AvueCustomForm
*/
@Model('change') public value: any;
@Model("change") public value: any;
/**
* 是否将表单数据通过组件配置带入组件中
......@@ -57,13 +57,22 @@ export default class AvueCustomForm extends Vue {
*/
@Prop() public isFormData?: boolean;
/**
* 是否为子表单
*
* @type {boolean}
* @memberof AvueCustomForm
*/
@Prop() public isSubForm?: boolean;
/**
* 表单数据
*
* @type {any}
* @type {*}
* @memberof AvueCustomForm
*/
@Prop() public formData: any;
@Prop()
public formData?: any;
/**
* 表单状态
......@@ -81,10 +90,12 @@ export default class AvueCustomForm extends Vue {
*/
get formVal() {
let obj: any = {};
if (this.value) {
if (this.isParseString) obj = JSON.parse(this.value);
else obj = this.value;
}
if (this.value) {
if (this.isParseString) obj = JSON.parse(this.value);
else obj = this.value;
if (this.isSubForm && obj instanceof Array)
obj = this.loadSubFormData(obj);
}
return obj;
}
......@@ -110,7 +121,7 @@ export default class AvueCustomForm extends Vue {
/**
* 当前组件配置设置属性
*
* @type {any}
* @type {*}
* @memberof AvueCustomForm
*/
public formOption: any = null;
......@@ -118,7 +129,7 @@ export default class AvueCustomForm extends Vue {
/**
* avue-form默认配置
*
* @type {any}
* @type {*}
* @memberof AvueCustomForm
*/
public defaultOptions: any = {
......@@ -185,22 +196,26 @@ export default class AvueCustomForm extends Vue {
*
* @memberof AvueCustomForm
*/
public load() {
public async load() {
let that: any = this;
if (!this.options && this.options == null) {
if (this.url && this.options == null) {
const get: Promise<any> = this.$http.get(this.url);
get.then((response: any) => {
await get.then((response: any) => {
if (response && response.data) {
that.formOption = response.data;
if (this.isFormData) that.getFormData();
let options: any = response.data;
this.transitionDicUrlCondition(options);
that.formOption = options;
if (that.isFormData) that.getFormData();
}
});
} else {
this.transitionDicUrlCondition(this.defaultOptions);
this.formOption = this.defaultOptions;
if (this.isFormData) that.getFormData();
}
} else {
this.transitionDicUrlCondition(this.options);
this.formOption = this.options;
if (this.isFormData) that.getFormData();
}
......@@ -239,19 +254,78 @@ export default class AvueCustomForm extends Vue {
* @memberof AvueCustomForm
*/
public setValue(value: any) {
if (this.isSubForm) value = this.getSubFormData(value);
if (this.isParseString) this.$emit("change", JSON.stringify(value));
else this.$emit("change", value);
}
/**
* 提取第一个属性值
*
* @memberof AvueCustomForm
* @return {Array<any>}
*/
public getSubFormData(value: any): Array<any> {
let arr: Array<any> = [];
for (let val in value) {
arr = value[val];
break;
}
return arr;
}
/**
* 加载子表单值
*
* @memberof AvueCustomForm
* @return {*}
*/
public loadSubFormData(arr: Array<any>): any {
let value: any = {};
value[this.formOption.column[0].prop] = arr;
return value;
}
/**
* 配置的下拉列表转换符号支持动态配置
*
* @memberof AvueCustomForm
* @param {*}
*/
public transitionDicUrlCondition(options: any) {
let that: any = this;
let recursive: any = function (obj: any) {
if (obj.column && obj.column.length > 0) {
obj.column.forEach((col: any) => {
if (col.dicUrl && col.dicUrl.indexOf("$") > 0) {
let g = /\${[^+]+}/;
let dicGroup = col.dicUrl.match(g);
dicGroup.forEach((dic: any) => {
col.dicUrl = col.dicUrl.replace(
dic,
that.formData[dic.substring(2, dic.length - 1)]
);
});
}
if (col.children) recursive(col.children);
if (col.group) recursive(col.group);
});
}
if (obj.children) recursive(obj.children);
if (obj.group) recursive(obj.group);
};
recursive(options);
}
/**
* 销毁组件(vue生命周期)
*
* @type {Subject<any>}
* @memberof AvueCustomForm
*/
public destroy(){
if(this.formStateEvent){
this.formStateEvent.unsubscribe();
public destroy() {
if (this.formStateEvent) {
this.formStateEvent.unsubscribe();
}
}
}
......
app_web/src/config/appConfig.ts
浏览文件 @ a885975d
......@@ -35,5 +35,7 @@ export const appConfig = {
label: 'YouYuan',
value: 'YouYuan',
},
]
],
// 面包屑分隔符
breadcrumbSeparator:"/"
}
\ No newline at end of file
app_web/src/engine/view/md-view-engine.ts
浏览文件 @ a885975d
......@@ -401,10 +401,10 @@ export default class MDViewEngine extends ViewEngine {
if (this.view.viewparams && Object.keys(this.view.viewparams).length > 0) {
Object.assign(arg, this.view.viewparams);
}
if (this.getSearchForm() && this.view.isExpandSearchForm) {
if (this.getSearchForm()) {
Object.assign(arg, this.getSearchForm().getData());
}
if (this.view && this.view.$refs.searchbar && this.view.isExpandSearchForm) {
if (this.view && this.view.$refs.searchbar) {
Object.assign(arg, this.view.$refs.searchbar.getData());
}
if (this.view && !this.view.isExpandSearchForm) {
......
app_web/src/engine/view/view-engine.ts
浏览文件 @ a885975d
......@@ -194,7 +194,7 @@ export default class ViewEngine {
const _item = _this.view.toolBarModels[key];
if(_item && _item['dataaccaction'] && _this.view.appUIService){
let dataActionResult:any;
if (_item.uiaction && (Object.is(_item.uiaction.target, 'NONE'))){
if (_item.uiaction && (Object.is(_item.uiaction.target, "NONE") || Object.is(_item.uiaction.target, ""))){
dataActionResult = _this.view.appUIService.getResourceOPPrivs(_item['dataaccaction']);
}else{
if(data && Object.keys(data).length >0){
......
app_web/src/engine/view/wizard-view-engine.ts
浏览文件 @ a885975d
......@@ -78,7 +78,11 @@ export default class WizardViewEngine extends ViewEngine {
*/
public onfinish(args: any): void {
this.view.$emit('viewdataschange', [args]);
this.view.$emit('close', null);
if(!this.view.viewDefaultUsage){
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 = {
devMode: true,
// 是否开启权限认证
enablePermissionValid:false,
// 菜单权限模式，可选值：RT(RT模式),RESOURCE(资源模式),MINIX(混合模式),默认MINIX
menuPermissionMode:"MINIX",
// 项目模板地址
ProjectUrl: "http://demo.ibizlab.cn/ibizr7pfstdtempl/ibizvuer7",
// 打开目标工具，可选参数：sln、mos
......
app_web/src/message/view-message-service.ts
浏览文件 @ a885975d
......@@ -201,7 +201,7 @@ export default class ViewMessageService {
public async getViewMessageByTag(tag:string,context:any = {},viewparam:any = {}){
let messageService:any = await this.getService(tag);
if(messageService.dynamicMode && Object.is(messageService.dynamicMode,"STATIC")){
return messageService.getStaticViewMessage();
return messageService.getStaticViewMessage(context,viewparam);
}else{
return messageService.getDynamicViewMessage(tag,messageService,context,viewparam);
}
......@@ -209,10 +209,15 @@ export default class ViewMessageService {
/**
* 转化消息模板标题和内容
*
* @target {*} target 返回目标数据
* @param {*} context 应用上下文
* @param {*} viewparam 视图参数
* @param {*} item 源数据
*
* @memberof ViewMessageService
*/
public translateMessageTemp(target:any,item?:any){
public translateMessageTemp(target:any,context:any,viewparam:any,item?:any){
}
......@@ -221,7 +226,7 @@ export default class ViewMessageService {
*
* @memberof ViewMessageService
*/
public getStaticViewMessage():Array<ViewMessage>{
public getStaticViewMessage(context:any,viewparam:any):Array<ViewMessage>{
let returnViewMessage:ViewMessage ={
id:this.id,
name:this.name,
......@@ -236,7 +241,7 @@ export default class ViewMessageService {
dynamicMode:this.dynamicMode,
messageType:this.messageType
};
this.translateMessageTemp(returnViewMessage);
this.translateMessageTemp(returnViewMessage,context,viewparam);
return [returnViewMessage];
}
......@@ -259,10 +264,11 @@ export default class ViewMessageService {
// 启用缓存
if(isEnableCache){
const callback:Function = (context:any ={},data:any ={},tag:string,promise:Promise<any>) =>{
const callbackKey:string = `${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`;
promise.then((result:any) =>{
if(result.length > 0){
ViewMessageService.messageCached.set(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`,{items:result});
ViewMessageService.messageCache.delete(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`);
ViewMessageService.messageCached.set(callbackKey,{items:result});
ViewMessageService.messageCache.delete(callbackKey);
return resolve(result);
}else{
return resolve([]);
......@@ -271,9 +277,10 @@ export default class ViewMessageService {
return reject(result);
})
}
const key:string = `${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`;
// 加载完成,从本地缓存获取
if(ViewMessageService.messageCached.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`)){
let items:any = ViewMessageService.messageCached.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`).items;
if(ViewMessageService.messageCached.get(key)){
let items:any = ViewMessageService.messageCached.get(key).items;
if(items.length >0){
if(new Date().getTime() <= messageService.getExpirationTime()){
return resolve(items);
......@@ -282,11 +289,11 @@ export default class ViewMessageService {
}
if (messageService) {
// 加载中，UI又需要数据，解决连续加载同一代码表问题
if(ViewMessageService.messageCache.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`)){
callback(context,data,tag,ViewMessageService.messageCache.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`));
if(ViewMessageService.messageCache.get(key)){
callback(context,data,tag,ViewMessageService.messageCache.get(key));
}else{
let result:Promise<any> = messageService.getItems(context,data,isloading);
ViewMessageService.messageCache.set(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`,result);
ViewMessageService.messageCache.set(key,result);
messageService.setExpirationTime(new Date().getTime() + cacheTimeout);
callback(context,data,tag,result);
}
......
app_web/src/pages/workflow/wfgroup-mpickup-view/wfgroup-mpickup-view-base.vue
浏览文件 @ a885975d
......@@ -2,7 +2,11 @@
<div class="view-container dempickupview wfgroup-mpickup-view">
<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">
<div class='view-top-messages'>
</div>
<div class="content-container pickup-view">
<div class='view-body-messages'>
</div>
<div class="translate-contant">
<div class="center" :style="{width : !isShowButton ? '100%' : ''}">
<view_pickupviewpanel
......@@ -58,6 +62,8 @@
</row>
</card>
</div>
<div class='view-bottom-messages'>
</div>
</card>
</div>
</template>
......@@ -312,6 +318,23 @@ export default class WFGroupMPickupViewBase extends Vue {
*/
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 {
});
}
});
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 {
}
})
}
if(this.portletStateEvent){
this.portletStateEvent.unsubscribe();
}
}
/**
* 是否显示按钮
......
app_web/src/pages/workflow/wfgroup-mpickup-view/wfgroup-mpickup-view.less
浏览文件 @ a885975d
......@@ -6,6 +6,7 @@
.pickup-view {
>.translate-contant {
overflow: auto;
flex-grow: 1;
display: flex;
justify-content: flex-end;
......
app_web/src/pages/workflow/wfgroup-pickup-grid-view/wfgroup-pickup-grid-view-base.vue
浏览文件 @ a885975d
......@@ -2,6 +2,8 @@
<div class='view-container depickupgridview wfgroup-pickup-grid-view'>
<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">
<div class='view-top-messages'>
</div>
<div class='content-container pickup-grid-view'>
<view_searchform
:viewState="viewState"
......@@ -19,7 +21,7 @@
@load="searchform_load($event)"
@closeview="closeView($event)">
</view_searchform>
<view_grid
<div class='view-body-messages'> </div> <view_grid
:viewState="viewState"
:viewparams="viewparams"
:context="context"
......@@ -41,6 +43,8 @@
@closeview="closeView($event)">
</view_grid>
</div>
<div class='view-bottom-messages'>
</div>
</card>
</div>
</template>
......@@ -216,6 +220,18 @@ export default class WFGroupPickupGridViewBase extends Vue {
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 {
*/
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 {
});
}
});
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 {
}
})
}
if(this.portletStateEvent){
this.portletStateEvent.unsubscribe();
}
}
/**
* 选中数据字符串
......
app_web/src/pages/workflow/wfgroup-pickup-view/wfgroup-pickup-view-base.vue
浏览文件 @ a885975d
......@@ -2,7 +2,11 @@
<div class="view-container depickupview wfgroup-pickup-view">
<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">
<div class='view-top-messages'>
</div>
<div class="content-container pickup-view">
<div class='view-body-messages'>
</div>
<view_pickupviewpanel
:viewState="viewState"
:viewparams="JSON.parse(JSON.stringify(viewparams))"
......@@ -25,6 +29,8 @@
</row>
</card>
</div>
<div class='view-bottom-messages'>
</div>
</card>
</div>
</template>
......@@ -278,6 +284,23 @@ export default class WFGroupPickupViewBase extends Vue {
*/
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 {
});
}
});
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 {
}
})
}
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 {
*/
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 {
});
}
});
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 @@
</div>
</div>
<div class="content-container">
<div class='view-top-messages'>
</div>
<div class="content-container">
<div class='view-body-messages'>
</div>
<view_form
:viewState="viewState"
:viewparams="viewparams"
......@@ -41,9 +43,9 @@
@load="form_load($event)"
@closeview="closeView($event)">
</view_form>
</div>
<div class='view-bottom-messages'>
</div>
</div>
</card>
</div>
</template>
......@@ -219,6 +221,18 @@ export default class WFREModelEditViewBase extends Vue {
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 {
* @memberof WFREModelEditView
*/
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 {
*/
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 {
});
}
});
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 {
}
})
}
if(this.portletStateEvent){
this.portletStateEvent.unsubscribe();
}
}
......
app_web/src/pages/workflow/wftask-grid-view/wftask-grid-view-base.vue
浏览文件 @ a885975d
......@@ -5,9 +5,9 @@
<div slot='title' class="header-container">
<span class='caption-info'>{{$t(model.srfCaption)}}</span>
</div>
<div class='content-container'>
<div class='view-top-messages'>
</div>
<div class='content-container'>
<div style='margin-bottom: 6px;'>
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="状态" />
<div class='pull-right'>
......@@ -19,11 +19,13 @@
</i-button>
<div slot='content'>{{$t('entities.wftask.gridviewtoolbar_toolbar.tbitem5.tip')}}</div>
</tooltip>
<span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600">
<span class='seperator'>|</span>
<tooltip :transfer="true" :max-width="600">
<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>
</tooltip>
<span class='seperator'>|</span> <dropdown v-show="toolBarModels.tbitem16.visabled" trigger='click'>
<span class='seperator'>|</span>
<dropdown v-show="toolBarModels.tbitem16.visabled" trigger='click'>
<tooltip :transfer="true" :max-width="600">
<i-button class=''>
<i class=''></i>
......@@ -57,7 +59,8 @@
</dropdown-item>
</dropdown-menu>
</dropdown>
<span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600">
<span class='seperator'>|</span>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem19.visabled" :disabled="toolBarModels.tbitem19.disabled" class='' @click="toolbar_click({ tag: 'tbitem19' }, $event)">
<i class='fa fa-filter'></i>
<span class='caption'>{{$t('entities.wftask.gridviewtoolbar_toolbar.tbitem19.caption')}}</span>
......@@ -90,6 +93,8 @@
@load="searchform_load($event)"
@closeview="closeView($event)">
</view_searchform>
<div class='view-body-messages'>
</div>
<view_grid
:viewState="viewState"
:viewparams="viewparams"
......@@ -116,9 +121,9 @@
@load="grid_load($event)"
@closeview="closeView($event)">
</view_grid>
</div>
<div class='view-bottom-messages'>
</div>
</div>
</card>
</div>
</template>
......@@ -298,6 +303,18 @@ export default class WFTaskGridViewBase extends Vue {
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 {
* @memberof WFTaskGridView
*/
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: { } },
tbitem13: { name: 'tbitem13', caption: '导出', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'ExportExcel', target: '' }, MaxRowCount: 1000 },
tbitem13: { name: 'tbitem13', actiontarget: 'NONE', caption: '导出', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'ExportExcel', target: '' }, MaxRowCount: 1000 },
tbitem10: { name: 'tbitem10', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem16: { name: 'tbitem16', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } },
tbitem21: { name: 'tbitem21', caption: '导出数据模型', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'ExportModel', target: '' } },
tbitem21: { name: 'tbitem21', actiontarget: 'NONE', caption: '导出数据模型', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'ExportModel', target: '' } },
tbitem23: { name: 'tbitem23', caption: '数据导入', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Import', target: '' } },
tbitem23: { name: 'tbitem23', actiontarget: 'NONE', caption: '数据导入', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Import', target: '' } },
tbitem17: { name: 'tbitem17', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem19: { name: 'tbitem19', caption: '过滤', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'ToggleFilter', target: '' } },
tbitem19: { name: 'tbitem19', actiontarget: 'NONE', caption: '过滤', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'ToggleFilter', target: '' } },
tbitem18: { name: 'tbitem18', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
tbitem18: { name: 'tbitem18', actiontarget: 'NONE', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
};
......@@ -398,6 +415,23 @@ export default class WFTaskGridViewBase extends Vue {
*/
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 {
});
}
});
if(_this.portletState){
_this.portletStateEvent = _this.portletState.subscribe((res:any) =>{
if(!Object.is(res.name,'calendar-view9')){
return;
}
if(Object.is(res.action,'refresh') && _this.refresh && _this.refresh instanceof Function){
_this.refresh();
}
})
}
if(this.formDruipart){
this.formDruipart.subscribe((res:any) =>{
if(Object.is(res.action,'save')){
......@@ -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.less
浏览文件 @ a885975d
......@@ -6,6 +6,7 @@
.pickup-view {
>.translate-contant {
overflow: auto;
flex-grow: 1;
display: flex;
justify-content: flex-end;
......
app_web/src/store/getters.ts
浏览文件 @ a885975d
此差异已折叠。
app_web/src/styles/default.less
浏览文件 @ a885975d
......@@ -124,11 +124,14 @@
// flex-grow: 1;
height: calc(100% - 74px);
padding: 0px;
display: flex;
flex-direction: column;
> .content-container {
height: 100%;
display: flex;
margin: 0;
flex-direction: column;
overflow: auto;
}
}
}
......
app_web/src/uiservice/ui-service.ts
浏览文件 @ a885975d
此差异已折叠。
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或