提交 f6b52616 编写于 作者: ibizdev's avatar ibizdev

ibiz4j 发布系统代码

上级 bf339ab4
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
<component <component
:is="viewname" :is="viewname"
class="viewcontainer2" class="viewcontainer2"
:viewdata ="viewdata" :viewdata ="viewdata"
:viewparam="viewparam"
:viewDefaultUsage="false" :viewDefaultUsage="false"
:formDruipart="formDruipart" :formDruipart="formDruipart"
:isformDruipart="true" :isformDruipart="true"
...@@ -119,6 +120,22 @@ export default class AppFormDRUIPart extends Vue { ...@@ -119,6 +120,22 @@ export default class AppFormDRUIPart extends Vue {
*/ */
@Prop() public viewparams!: any; @Prop() public viewparams!: any;
/**
* 局部上下文
*
* @type {*}
* @memberof AppFormDRUIPart
*/
@Prop() public localContext!:any;
/**
* 局部参数
*
* @type {*}
* @memberof AppFormDRUIPart
*/
@Prop() public localParam!:any;
/** /**
* 应用实体参数名称 * 应用实体参数名称
* *
...@@ -240,21 +257,32 @@ export default class AppFormDRUIPart extends Vue { ...@@ -240,21 +257,32 @@ export default class AppFormDRUIPart extends Vue {
} }
const formData: any = data?data:JSON.parse(this.data); const formData: any = data?data:JSON.parse(this.data);
const _paramitem = formData[this.paramItem]; const _paramitem = formData[this.paramItem];
let viewdata = {}; let tempContext:any = {};
Object.assign(viewdata, this.$viewTool.getIndexViewParam()); let tempParam:any = {};
Object.assign(tempContext, this.$viewTool.getIndexViewParam());
const _parameters: any[] = [...this.$viewTool.getIndexParameters(), ...this.parameters]; const _parameters: any[] = [...this.$viewTool.getIndexParameters(), ...this.parameters];
_parameters.forEach((parameter: any) => { _parameters.forEach((parameter: any) => {
const { pathName, parameterName }: { pathName: string, parameterName: string } = parameter; const { pathName, parameterName }: { pathName: string, parameterName: string } = parameter;
if (formData[parameterName] && !Object.is(formData[parameterName], '')) { if (formData[parameterName] && !Object.is(formData[parameterName], '')) {
Object.assign(viewdata, { [parameterName]: formData[parameterName] }); Object.assign(tempContext, { [parameterName]: formData[parameterName] });
} }
}); });
Object.assign(viewdata, { [this.paramItem]: _paramitem }); Object.assign(tempContext, { [this.paramItem]: _paramitem });
//设置顶层视图唯一标识 //设置顶层视图唯一标识
Object.assign(viewdata,this.context); Object.assign(tempContext,this.context);
Object.assign(viewdata,{srfparentdename:this.parentName,srfparentkey:_paramitem}); Object.assign(tempContext,{srfparentdename:this.parentName,srfparentkey:_paramitem});
this.viewdata = JSON.stringify(viewdata); // 设置局部上下文
this.viewparam = JSON.stringify(this.viewparams); if(this.localContext && Object.keys(this.localContext).length >0){
let _context:any = this.$util.computedNavData(formData,tempContext,this.viewparams,this.localContext);
Object.assign(tempContext,_context);
}
this.viewdata = JSON.stringify(tempContext);
// 设置局部参数
if(this.localParam && Object.keys(this.localParam).length >0){
let _param:any = this.$util.computedNavData(formData,tempContext,this.viewparams,this.localParam);
Object.assign(tempParam,_param);
}
this.viewparam = JSON.stringify(tempParam);
if (this.isRelationalData) { if (this.isRelationalData) {
if (!_paramitem || _paramitem == null || Object.is(_paramitem, '')) { if (!_paramitem || _paramitem == null || Object.is(_paramitem, '')) {
this.blockUIStart(); this.blockUIStart();
......
<template> <template>
<div class="app-picker-select-view"> <div class="app-picker-select-view">
<Dropdown :visible="visible" trigger="custom" style="left:0px;width: 100%" @on-clickoutside="() => {triggerMenu(false);}" > <Dropdown :visible="visible" trigger="custom" style="left:0px;width: 100%" @on-clickoutside="() => {triggerMenu(false);}" >
<Input v-if="isSingleSelect" v-model="queryValue" class="tree-input" type="text" :placeholder="placeholder ? placeholder : $t('components.AppPickerSelectViewSelectView.placeholder')" :disabled="disabled" @on-change="OnInputChange" @on-focus="()=>{triggerMenu(true);}" > <Input v-if="isSingleSelect" v-model="queryValue" class="tree-input" type="text" :placeholder="placeholder ? placeholder : $t('components.appPickerSelectView.placeholder')" :disabled="disabled" @on-change="OnInputChange" @on-focus="()=>{triggerMenu(true);}" >
<template v-slot:suffix> <template v-slot:suffix>
<i v-if="queryValue && !disabled" class='el-icon-circle-close' @click="onClear"></i> <i v-if="queryValue && !disabled" class='el-icon-circle-close' @click="onClear"></i>
<Icon :type="visible ? 'ios-arrow-up' : 'ios-arrow-down'" class="icon-arrow" @click="() => {triggerMenu();}"></Icon> <Icon :type="visible ? 'ios-arrow-up' : 'ios-arrow-down'" class="icon-arrow" @click="() => {triggerMenu();}"></Icon>
...@@ -34,7 +34,7 @@ import { ViewTool } from '@/utils/view-tool/view-tool'; ...@@ -34,7 +34,7 @@ import { ViewTool } from '@/utils/view-tool/view-tool';
@Component({ @Component({
}) })
export default class AppPickerSelectViewSelectView extends Vue { export default class AppPickerSelectView extends Vue {
/** /**
* 视图上下文 * 视图上下文
* *
...@@ -256,7 +256,7 @@ export default class AppPickerSelectViewSelectView extends Vue { ...@@ -256,7 +256,7 @@ export default class AppPickerSelectViewSelectView extends Vue {
*/ */
public handlePublicParams(arg: any): boolean { public handlePublicParams(arg: any): boolean {
if (!this.data) { if (!this.data) {
this.$Notice.error({ title: (this.$t('components.AppPickerSelectViewSelectView.error') as any), desc: (this.$t('components.AppPickerSelectViewSelectView.formdataException') as any) }); this.$Notice.error({ title: (this.$t('components.appPickerSelectView.error') as any), desc: (this.$t('components.appPickerSelectView.formdataException') as any) });
return false; return false;
} }
// 合并表单参数 // 合并表单参数
...@@ -306,7 +306,7 @@ export default class AppPickerSelectViewSelectView extends Vue { ...@@ -306,7 +306,7 @@ export default class AppPickerSelectViewSelectView extends Vue {
if(this.isSingleSelect){ if(this.isSingleSelect){
this.queryValue = newVal; this.queryValue = newVal;
if (!this.data || !this.valueitem || !this.data[this.valueitem]) { if (!this.data || !this.valueitem || !this.data[this.valueitem]) {
this.$Notice.error({ title: (this.$t('components.AppPickerSelectViewSelectView.error') as any), desc: (this.$t('components.AppPickerSelectViewSelectView.editor') as any)+this.name+(this.$t('components.AppPickerSelectViewSelectView.valueitemException') as any) }); this.$Notice.error({ title: (this.$t('components.appPickerSelectView.error') as any), desc: (this.$t('components.appPickerSelectView.editor') as any)+this.name+(this.$t('components.appPickerSelectView.valueitemException') as any) });
}else{ }else{
let _viewparam = JSON.parse(this.viewparam); let _viewparam = JSON.parse(this.viewparam);
_viewparam.selectedData = [{srfkey: this.data[this.valueitem], srfmajortext: this.value }]; _viewparam.selectedData = [{srfkey: this.data[this.valueitem], srfmajortext: this.value }];
...@@ -418,7 +418,7 @@ export default class AppPickerSelectViewSelectView extends Vue { ...@@ -418,7 +418,7 @@ export default class AppPickerSelectViewSelectView extends Vue {
*/ */
public openLinkView($event: any): void { public openLinkView($event: any): void {
if (!this.data || !this.valueitem || !this.data[this.valueitem]) { if (!this.data || !this.valueitem || !this.data[this.valueitem]) {
console.error({ title: (this.$t('components.AppPickerSelectViewSelectView.error') as any), desc: (this.$t('components.AppPickerSelectViewSelectView.editor') as any)+this.name+(this.$t('components.AppPickerSelectViewSelectView.valueitemException') as any) }); console.error({ title: (this.$t('components.appPickerSelectView.error') as any), desc: (this.$t('components.appPickerSelectView.editor') as any)+this.name+(this.$t('components.appPickerSelectView.valueitemException') as any) });
return; return;
} }
// 公共参数处理 // 公共参数处理
......
<template> <template>
<codelist v-if="tag" :tag="tag" :value="value" :codelistType="codelistType" :renderMode="renderMode" :valueSeparator="valueSeparator" :textSeparator="textSeparator" :data="data" :itemParam="itemParam" :context="context" :viewparams="viewparams"></codelist> <codelist v-if="tag" :tag="tag" :value="value" :codelistType="codelistType" :renderMode="renderMode" :valueSeparator="valueSeparator" :textSeparator="textSeparator" :data="data" :localContext="localContext" :localParam="localParam" :context="context" :viewparams="viewparams"></codelist>
<app-upload-file-info v-else-if="Object.is(this.editorType,'PICTURE') || Object.is(this.editorType,'PICTURE_ONE') || Object.is(this.editorType,'FILEUPLOADER')" :value="value" :name="name"></app-upload-file-info> <app-upload-file-info v-else-if="Object.is(this.editorType,'PICTURE') || Object.is(this.editorType,'PICTURE_ONE') || Object.is(this.editorType,'FILEUPLOADER')" :value="value" :name="name"></app-upload-file-info>
<span class="app-span" v-else >{{text}}</span> <span class="app-span" v-else >{{text}}</span>
</template> </template>
...@@ -145,9 +145,8 @@ export default class AppSpan extends Vue { ...@@ -145,9 +145,8 @@ export default class AppSpan extends Vue {
* @memberof AppSpan * @memberof AppSpan
*/ */
public load(){ public load(){
if(!this.value || this.tag){ if(this.tag){
return; //代码表走codelist组件 return; //代码表走codelist组件
}else if(this.editorType === "ADDRESSPICKUP"){ }else if(this.editorType === "ADDRESSPICKUP"){
JSON.parse(this.value).forEach((item:any,index:number) => { JSON.parse(this.value).forEach((item:any,index:number) => {
this.text += index === 0 ? item.srfmajortext : ","+item.srfmajortext; this.text += index === 0 ? item.srfmajortext : ","+item.srfmajortext;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
v-for="(item,i) in dataRight" v-for="(item,i) in dataRight"
:key="i" :key="i"
>{{dataLeft[item-1].label}}</Option> >{{dataLeft[item-1].label}}</Option>
<el-transfer v-model="dataRight" :data="dataLeft" @change=dataChange></el-transfer> <el-transfer v-model="dataRight" :data="dataLeft" @change="dataChange" :titles="['未选择', '已选择']"></el-transfer>
</Select> </Select>
</template> </template>
<script lang="ts"> <script lang="ts">
...@@ -14,11 +14,11 @@ import { Vue, Component, Watch, Prop, Model } from "vue-property-decorator"; ...@@ -14,11 +14,11 @@ import { Vue, Component, Watch, Prop, Model } from "vue-property-decorator";
import CodeListService from "@service/app/codelist-service"; import CodeListService from "@service/app/codelist-service";
@Component({}) @Component({})
export default class FromTransfer extends Vue { export default class AppTransfer extends Vue {
/** /**
* 表单传递右侧框中的数据 * 表单传递右侧框中的数据
*/ */
@Prop() public data: any; @Prop() public data?: any;
/** /**
* 左侧框数据 * 左侧框数据
*/ */
...@@ -31,7 +31,7 @@ export default class FromTransfer extends Vue { ...@@ -31,7 +31,7 @@ export default class FromTransfer extends Vue {
* 代码表服务对象 * 代码表服务对象
* *
* @type {CodeListService} * @type {CodeListService}
* @memberof FromTransfer * @memberof AppTransfer
*/ */
public codeListService: CodeListService = new CodeListService({ public codeListService: CodeListService = new CodeListService({
...@@ -42,21 +42,21 @@ export default class FromTransfer extends Vue { ...@@ -42,21 +42,21 @@ export default class FromTransfer extends Vue {
* 额外参数 * 额外参数
* *
* @type {*} * @type {*}
* @memberof FromTransfer * @memberof AppTransfer
*/ */
public otherParam: any; public otherParam: any;
/** /**
* 查询参数 * 查询参数
* @type {*} * @type {*}
* @memberof FromTransfer * @memberof AppTransfer
*/ */
public queryParam: any; public queryParam: any;
/** /**
* 当前选中值 * 当前选中值
* @type {any} * @type {any}
* @memberof Drop * @memberof AppTransfer
*/ */
@Model("change") readonly itemValue!: any; @Model("change") readonly itemValue!: any;
...@@ -64,7 +64,7 @@ export default class FromTransfer extends Vue { ...@@ -64,7 +64,7 @@ export default class FromTransfer extends Vue {
* 代码表标识 * 代码表标识
* *
* @type {string} * @type {string}
* @memberof FromTransfer * @memberof AppTransfer
*/ */
@Prop() public tag?: string; @Prop() public tag?: string;
...@@ -72,15 +72,14 @@ export default class FromTransfer extends Vue { ...@@ -72,15 +72,14 @@ export default class FromTransfer extends Vue {
* 代码表类型 * 代码表类型
* *
* @type {string} * @type {string}
* @memberof FromTransfer * @memberof AppTransfer
*/ */
@Prop() public codelistType?: string; @Prop() public codelistType?: string;
/** /**
* 监听表单数据 * 监听表单数据
* *
* @memberof FromTransfer * @memberof AppTransfer
*/ */
@Watch("data", { deep: true }) @Watch("data", { deep: true })
...@@ -90,27 +89,27 @@ export default class FromTransfer extends Vue { ...@@ -90,27 +89,27 @@ export default class FromTransfer extends Vue {
} }
/** /**
* 组件change事件,右侧框数据变化时 * 组件change事件,右侧框数据变化时
* @memberof FromTransfer * @memberof AppTransfer
*/ */
dataChange(e:any){ dataChange(e: any) {
console.log(e); console.log(e);
let val:any[]=[]; let val: any[] = [];
let newVal:any; let newVal: any;
this.dataLeft.forEach((elem: any) => { this.dataLeft.forEach((elem: any) => {
e.forEach((item: any) => { e.forEach((item: any) => {
if (elem.key === item) val.push(elem.value); if (elem.key === item) val.push(elem.value);
}); });
}); });
newVal=val.join(','); newVal = val.join(",");
console.log(newVal); console.log(newVal, typeof newVal);
this.$emit("change", newVal); if (newVal) this.$emit("change", newVal);
} }
/** /**
* 传入额外参数 * 传入额外参数
* *
* @type {*} * @type {*}
* @memberof FromTransfer * @memberof AppTransfer
*/ */
@Prop() public itemParam?: any; @Prop() public itemParam?: any;
...@@ -133,7 +132,7 @@ export default class FromTransfer extends Vue { ...@@ -133,7 +132,7 @@ export default class FromTransfer extends Vue {
/** /**
* 是否禁用 * 是否禁用
* @type {any} * @type {any}
* @memberof FromTransfer * @memberof AppTransfer
* *
*/ */
@Prop() public disabled?: any; @Prop() public disabled?: any;
...@@ -141,43 +140,22 @@ export default class FromTransfer extends Vue { ...@@ -141,43 +140,22 @@ export default class FromTransfer extends Vue {
/** /**
* 是否支持过滤 * 是否支持过滤
* @type {boolean} * @type {boolean}
* @memberof FromTransfer * @memberof AppTransfer
*/ */
@Prop() public filterable?: boolean; @Prop() public filterable?: boolean;
/** /**
* 下拉选提示内容 * 下拉选提示内容
* @type {string} * @type {string}
* @memberof FromTransfer * @memberof AppTransfer
*/ */
@Prop() public placeholder?: string; @Prop() public placeholder?: string;
/**
* 计算属性(当前值)
* @type {any}
* @memberof FromTransfer
*/
set currentVal(val: any) {
// const type: string = this.$util.typeOf(val);
// val =
// Object.is(type, "null") || Object.is(type, "undefined") ? undefined : val;
// this.dataLeft.forEach((elem: any) => {
// this.dataRight.forEach((item: any) => {
// if (elem.key === item) val.push(elem.value);
// });
// });
// val=val.join(',');
// this.$emit("change", val);
}
/** /**
* 获取值对象 * 获取值对象
* *
* @memberof FromTransfer * @memberof AppTransfer
*/ */
// get currentVal() {
// return this.itemValue;
// }
get currentVal() { get currentVal() {
return this.itemValue; return this.itemValue;
} }
...@@ -186,7 +164,7 @@ export default class FromTransfer extends Vue { ...@@ -186,7 +164,7 @@ export default class FromTransfer extends Vue {
* 代码表 * 代码表
* *
* @type {any[]} * @type {any[]}
* @memberof FromTransfer * @memberof AppTransfer
*/ */
// public items: any[] = []; // public items: any[] = [];
...@@ -195,7 +173,7 @@ export default class FromTransfer extends Vue { ...@@ -195,7 +173,7 @@ export default class FromTransfer extends Vue {
* *
* @param {*} arg * @param {*} arg
* @returns * @returns
* @memberof FromTransfer * @memberof AppTransfer
*/ */
public handlePublicParams(arg: any) { public handlePublicParams(arg: any) {
// 合并表单参数 // 合并表单参数
...@@ -225,11 +203,10 @@ export default class FromTransfer extends Vue { ...@@ -225,11 +203,10 @@ export default class FromTransfer extends Vue {
/** /**
* vue 生命周期 * vue 生命周期
* *
* @memberof FromTransfer * @memberof AppTransfer
*/ */
public created() { public created() {
this.dataHandle(); this.dataHandle();
this.initRight();
} }
/** /**
...@@ -241,7 +218,9 @@ export default class FromTransfer extends Vue { ...@@ -241,7 +218,9 @@ export default class FromTransfer extends Vue {
if (codelist) { if (codelist) {
this.dataLeft = [...JSON.parse(JSON.stringify(codelist.items))]; this.dataLeft = [...JSON.parse(JSON.stringify(codelist.items))];
this.initLeft(); this.initLeft();
this.initRight();
console.log(this.dataLeft); console.log(this.dataLeft);
console.log(this.dataRight);
} else { } else {
console.log(`----${this.tag}----代码表不存在`); console.log(`----${this.tag}----代码表不存在`);
} }
...@@ -257,8 +236,8 @@ export default class FromTransfer extends Vue { ...@@ -257,8 +236,8 @@ export default class FromTransfer extends Vue {
.then((res: any) => { .then((res: any) => {
this.dataLeft = res; this.dataLeft = res;
console.log(this.dataLeft); console.log(this.dataLeft);
this.initLeft(); this.initLeft();
this.initRight();
}) })
.catch((error: any) => { .catch((error: any) => {
console.log(`----${this.tag}----代码表不存在`); console.log(`----${this.tag}----代码表不存在`);
...@@ -286,9 +265,16 @@ export default class FromTransfer extends Vue { ...@@ -286,9 +265,16 @@ export default class FromTransfer extends Vue {
* 初始化右侧框数据 * 初始化右侧框数据
*/ */
public initRight() { public initRight() {
if (this.data) { let _data: string = this.data;
this.data.forEach((elem: any) => { console.log(_data);
this.dataRight.push(elem); if (_data) {
let newData: any[] = _data.split(",");
this.dataLeft.forEach((elem: any) => {
newData.forEach((item: any) => {
if (item === elem.value) {
this.dataRight.push(elem.key);
}
});
}); });
} }
} }
......
...@@ -249,7 +249,9 @@ export default class EditViewEngine extends ViewEngine { ...@@ -249,7 +249,9 @@ export default class EditViewEngine extends ViewEngine {
let viewdata: any = this.view.model; let viewdata: any = this.view.model;
if (viewdata && info && !Object.is(info, '') && this.view.$tabPageExp && (viewdata.srfTitle.indexOf(" - ") === -1)) { if (viewdata && info && !Object.is(info, '') && this.view.$tabPageExp && (viewdata.srfTitle.indexOf(" - ") === -1)) {
this.view.$tabPageExp.setCurPageCaption(viewdata.srfTitle, viewdata.srfTitle, info); this.view.$tabPageExp.setCurPageCaption(viewdata.srfTitle, viewdata.srfTitle, info);
this.view.$route.meta.info = info; if(this.view.$route){
this.view.$route.meta.info = info;
}
this.view.model.srfTitle = `${this.view.$t(viewdata.srfTitle)} - ${viewdata.dataInfo}`; this.view.model.srfTitle = `${this.view.$t(viewdata.srfTitle)} - ${viewdata.dataInfo}`;
} }
} }
......
...@@ -664,7 +664,6 @@ export default class WFGroupEditViewBase extends Vue { ...@@ -664,7 +664,6 @@ export default class WFGroupEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -693,7 +692,6 @@ export default class WFGroupEditViewBase extends Vue { ...@@ -693,7 +692,6 @@ export default class WFGroupEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -722,7 +720,6 @@ export default class WFGroupEditViewBase extends Vue { ...@@ -722,7 +720,6 @@ export default class WFGroupEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -751,7 +748,6 @@ export default class WFGroupEditViewBase extends Vue { ...@@ -751,7 +748,6 @@ export default class WFGroupEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -780,7 +776,6 @@ export default class WFGroupEditViewBase extends Vue { ...@@ -780,7 +776,6 @@ export default class WFGroupEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -809,7 +804,6 @@ export default class WFGroupEditViewBase extends Vue { ...@@ -809,7 +804,6 @@ export default class WFGroupEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -838,7 +832,6 @@ export default class WFGroupEditViewBase extends Vue { ...@@ -838,7 +832,6 @@ export default class WFGroupEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -867,7 +860,6 @@ export default class WFGroupEditViewBase extends Vue { ...@@ -867,7 +860,6 @@ export default class WFGroupEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -896,7 +888,6 @@ export default class WFGroupEditViewBase extends Vue { ...@@ -896,7 +888,6 @@ export default class WFGroupEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -925,7 +916,6 @@ export default class WFGroupEditViewBase extends Vue { ...@@ -925,7 +916,6 @@ export default class WFGroupEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -954,7 +944,6 @@ export default class WFGroupEditViewBase extends Vue { ...@@ -954,7 +944,6 @@ export default class WFGroupEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -983,7 +972,6 @@ export default class WFGroupEditViewBase extends Vue { ...@@ -983,7 +972,6 @@ export default class WFGroupEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -1012,7 +1000,6 @@ export default class WFGroupEditViewBase extends Vue { ...@@ -1012,7 +1000,6 @@ export default class WFGroupEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -1041,7 +1028,6 @@ export default class WFGroupEditViewBase extends Vue { ...@@ -1041,7 +1028,6 @@ export default class WFGroupEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
......
...@@ -764,7 +764,6 @@ export default class WFGroupGridViewBase extends Vue { ...@@ -764,7 +764,6 @@ export default class WFGroupGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -793,7 +792,6 @@ export default class WFGroupGridViewBase extends Vue { ...@@ -793,7 +792,6 @@ export default class WFGroupGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -822,7 +820,6 @@ export default class WFGroupGridViewBase extends Vue { ...@@ -822,7 +820,6 @@ export default class WFGroupGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -851,7 +848,6 @@ export default class WFGroupGridViewBase extends Vue { ...@@ -851,7 +848,6 @@ export default class WFGroupGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -880,7 +876,6 @@ export default class WFGroupGridViewBase extends Vue { ...@@ -880,7 +876,6 @@ export default class WFGroupGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -909,7 +904,6 @@ export default class WFGroupGridViewBase extends Vue { ...@@ -909,7 +904,6 @@ export default class WFGroupGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -938,7 +932,6 @@ export default class WFGroupGridViewBase extends Vue { ...@@ -938,7 +932,6 @@ export default class WFGroupGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -967,7 +960,6 @@ export default class WFGroupGridViewBase extends Vue { ...@@ -967,7 +960,6 @@ export default class WFGroupGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -996,7 +988,6 @@ export default class WFGroupGridViewBase extends Vue { ...@@ -996,7 +988,6 @@ export default class WFGroupGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -1025,7 +1016,6 @@ export default class WFGroupGridViewBase extends Vue { ...@@ -1025,7 +1016,6 @@ export default class WFGroupGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -1054,7 +1044,6 @@ export default class WFGroupGridViewBase extends Vue { ...@@ -1054,7 +1044,6 @@ export default class WFGroupGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -1083,7 +1072,6 @@ export default class WFGroupGridViewBase extends Vue { ...@@ -1083,7 +1072,6 @@ export default class WFGroupGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -1112,7 +1100,6 @@ export default class WFGroupGridViewBase extends Vue { ...@@ -1112,7 +1100,6 @@ export default class WFGroupGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -1136,14 +1123,16 @@ export default class WFGroupGridViewBase extends Vue { ...@@ -1136,14 +1123,16 @@ export default class WFGroupGridViewBase extends Vue {
* @memberof WFGroupGridView * @memberof WFGroupGridView
*/ */
public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) { public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
let localContext:any = null;
let localViewParam:any =null;
const data: any = {}; const data: any = {};
if(args[0].srfsourcekey){ if(args[0].srfsourcekey){
data.srfsourcekey = args[0].srfsourcekey; data.srfsourcekey = args[0].srfsourcekey;
} }
let curViewParam = JSON.parse(JSON.stringify(this.context)); let tempContext = JSON.parse(JSON.stringify(this.context));
delete curViewParam.wfgroup; delete tempContext.wfgroup;
if(args.length >0){ if(args.length >0){
Object.assign(curViewParam,args[0]); Object.assign(tempContext,args[0]);
} }
const deResParameters: any[] = []; const deResParameters: any[] = [];
const parameters: any[] = [ const parameters: any[] = [
...@@ -1154,7 +1143,7 @@ export default class WFGroupGridViewBase extends Vue { ...@@ -1154,7 +1143,7 @@ export default class WFGroupGridViewBase extends Vue {
const openIndexViewTab = (data: any) => { const openIndexViewTab = (data: any) => {
const _data: any = { w: (new Date().getTime()) }; const _data: any = { w: (new Date().getTime()) };
Object.assign(_data, data); Object.assign(_data, data);
const routePath = this.$viewTool.buildUpRoutePath(this.$route, curViewParam, deResParameters, parameters, args, _data); const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
this.$router.push(routePath); this.$router.push(routePath);
} }
openIndexViewTab(data); openIndexViewTab(data);
...@@ -1172,10 +1161,12 @@ export default class WFGroupGridViewBase extends Vue { ...@@ -1172,10 +1161,12 @@ export default class WFGroupGridViewBase extends Vue {
* @memberof WFGroupGridView * @memberof WFGroupGridView
*/ */
public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) { public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
let localContext:any = null;
let localViewParam:any =null;
const data: any = {}; const data: any = {};
let curViewParam = JSON.parse(JSON.stringify(this.context)); let tempContext = JSON.parse(JSON.stringify(this.context));
if(args.length >0){ if(args.length >0){
Object.assign(curViewParam,args[0]); Object.assign(tempContext,args[0]);
} }
const deResParameters: any[] = []; const deResParameters: any[] = [];
const parameters: any[] = [ const parameters: any[] = [
...@@ -1184,7 +1175,7 @@ export default class WFGroupGridViewBase extends Vue { ...@@ -1184,7 +1175,7 @@ export default class WFGroupGridViewBase extends Vue {
]; ];
const _this: any = this; const _this: any = this;
const openIndexViewTab = (data: any) => { const openIndexViewTab = (data: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, curViewParam, deResParameters, parameters, args, data); const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
this.$router.push(routePath); this.$router.push(routePath);
} }
openIndexViewTab(data); openIndexViewTab(data);
......
...@@ -664,7 +664,6 @@ export default class WFMemberEditViewBase extends Vue { ...@@ -664,7 +664,6 @@ export default class WFMemberEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -693,7 +692,6 @@ export default class WFMemberEditViewBase extends Vue { ...@@ -693,7 +692,6 @@ export default class WFMemberEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -722,7 +720,6 @@ export default class WFMemberEditViewBase extends Vue { ...@@ -722,7 +720,6 @@ export default class WFMemberEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -751,7 +748,6 @@ export default class WFMemberEditViewBase extends Vue { ...@@ -751,7 +748,6 @@ export default class WFMemberEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -780,7 +776,6 @@ export default class WFMemberEditViewBase extends Vue { ...@@ -780,7 +776,6 @@ export default class WFMemberEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -809,7 +804,6 @@ export default class WFMemberEditViewBase extends Vue { ...@@ -809,7 +804,6 @@ export default class WFMemberEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -838,7 +832,6 @@ export default class WFMemberEditViewBase extends Vue { ...@@ -838,7 +832,6 @@ export default class WFMemberEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -867,7 +860,6 @@ export default class WFMemberEditViewBase extends Vue { ...@@ -867,7 +860,6 @@ export default class WFMemberEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -896,7 +888,6 @@ export default class WFMemberEditViewBase extends Vue { ...@@ -896,7 +888,6 @@ export default class WFMemberEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -925,7 +916,6 @@ export default class WFMemberEditViewBase extends Vue { ...@@ -925,7 +916,6 @@ export default class WFMemberEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -954,7 +944,6 @@ export default class WFMemberEditViewBase extends Vue { ...@@ -954,7 +944,6 @@ export default class WFMemberEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -983,7 +972,6 @@ export default class WFMemberEditViewBase extends Vue { ...@@ -983,7 +972,6 @@ export default class WFMemberEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -1012,7 +1000,6 @@ export default class WFMemberEditViewBase extends Vue { ...@@ -1012,7 +1000,6 @@ export default class WFMemberEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -1041,7 +1028,6 @@ export default class WFMemberEditViewBase extends Vue { ...@@ -1041,7 +1028,6 @@ export default class WFMemberEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
......
...@@ -764,7 +764,6 @@ export default class WFMemberGridViewBase extends Vue { ...@@ -764,7 +764,6 @@ export default class WFMemberGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -793,7 +792,6 @@ export default class WFMemberGridViewBase extends Vue { ...@@ -793,7 +792,6 @@ export default class WFMemberGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -822,7 +820,6 @@ export default class WFMemberGridViewBase extends Vue { ...@@ -822,7 +820,6 @@ export default class WFMemberGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -851,7 +848,6 @@ export default class WFMemberGridViewBase extends Vue { ...@@ -851,7 +848,6 @@ export default class WFMemberGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -880,7 +876,6 @@ export default class WFMemberGridViewBase extends Vue { ...@@ -880,7 +876,6 @@ export default class WFMemberGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -909,7 +904,6 @@ export default class WFMemberGridViewBase extends Vue { ...@@ -909,7 +904,6 @@ export default class WFMemberGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -938,7 +932,6 @@ export default class WFMemberGridViewBase extends Vue { ...@@ -938,7 +932,6 @@ export default class WFMemberGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -967,7 +960,6 @@ export default class WFMemberGridViewBase extends Vue { ...@@ -967,7 +960,6 @@ export default class WFMemberGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -996,7 +988,6 @@ export default class WFMemberGridViewBase extends Vue { ...@@ -996,7 +988,6 @@ export default class WFMemberGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -1025,7 +1016,6 @@ export default class WFMemberGridViewBase extends Vue { ...@@ -1025,7 +1016,6 @@ export default class WFMemberGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -1054,7 +1044,6 @@ export default class WFMemberGridViewBase extends Vue { ...@@ -1054,7 +1044,6 @@ export default class WFMemberGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -1083,7 +1072,6 @@ export default class WFMemberGridViewBase extends Vue { ...@@ -1083,7 +1072,6 @@ export default class WFMemberGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -1112,7 +1100,6 @@ export default class WFMemberGridViewBase extends Vue { ...@@ -1112,7 +1100,6 @@ export default class WFMemberGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -1136,6 +1123,8 @@ export default class WFMemberGridViewBase extends Vue { ...@@ -1136,6 +1123,8 @@ export default class WFMemberGridViewBase extends Vue {
* @memberof WFMemberGridView * @memberof WFMemberGridView
*/ */
public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) { public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
let localContext:any = null;
let localViewParam:any =null;
const batchAddPSAppViews=[ const batchAddPSAppViews=[
{view:{viewname:'wfgroup-mpickup-view',height: 0,width: 0,title: '角色/用户组数据多项选择视图'}, {view:{viewname:'wfgroup-mpickup-view',height: 0,width: 0,title: '角色/用户组数据多项选择视图'},
res:['WFGroup'], res:['WFGroup'],
...@@ -1194,13 +1183,15 @@ export default class WFMemberGridViewBase extends Vue { ...@@ -1194,13 +1183,15 @@ export default class WFMemberGridViewBase extends Vue {
* @memberof WFMemberGridView * @memberof WFMemberGridView
*/ */
public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) { public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
let localContext:any = null;
let localViewParam:any =null;
const data: any = {}; const data: any = {};
let curViewParam = JSON.parse(JSON.stringify(this.context)); let tempContext = JSON.parse(JSON.stringify(this.context));
if(args.length >0){ if(args.length >0){
Object.assign(curViewParam,args[0]); Object.assign(tempContext,args[0]);
} }
let deResParameters: any[] = []; let deResParameters: any[] = [];
if(curViewParam.wfgroup && true){ if(tempContext.wfgroup && true){
deResParameters = [ deResParameters = [
{ pathName: 'wfgroups', parameterName: 'wfgroup' }, { pathName: 'wfgroups', parameterName: 'wfgroup' },
] ]
...@@ -1211,7 +1202,7 @@ export default class WFMemberGridViewBase extends Vue { ...@@ -1211,7 +1202,7 @@ export default class WFMemberGridViewBase extends Vue {
]; ];
const _this: any = this; const _this: any = this;
const openIndexViewTab = (data: any) => { const openIndexViewTab = (data: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, curViewParam, deResParameters, parameters, args, data); const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
this.$router.push(routePath); this.$router.push(routePath);
} }
openIndexViewTab(data); openIndexViewTab(data);
......
...@@ -664,7 +664,6 @@ export default class WFProcessDefinitionEditViewBase extends Vue { ...@@ -664,7 +664,6 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -693,7 +692,6 @@ export default class WFProcessDefinitionEditViewBase extends Vue { ...@@ -693,7 +692,6 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -722,7 +720,6 @@ export default class WFProcessDefinitionEditViewBase extends Vue { ...@@ -722,7 +720,6 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -751,7 +748,6 @@ export default class WFProcessDefinitionEditViewBase extends Vue { ...@@ -751,7 +748,6 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -780,7 +776,6 @@ export default class WFProcessDefinitionEditViewBase extends Vue { ...@@ -780,7 +776,6 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -809,7 +804,6 @@ export default class WFProcessDefinitionEditViewBase extends Vue { ...@@ -809,7 +804,6 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -838,7 +832,6 @@ export default class WFProcessDefinitionEditViewBase extends Vue { ...@@ -838,7 +832,6 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -867,7 +860,6 @@ export default class WFProcessDefinitionEditViewBase extends Vue { ...@@ -867,7 +860,6 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -896,7 +888,6 @@ export default class WFProcessDefinitionEditViewBase extends Vue { ...@@ -896,7 +888,6 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -925,7 +916,6 @@ export default class WFProcessDefinitionEditViewBase extends Vue { ...@@ -925,7 +916,6 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -954,7 +944,6 @@ export default class WFProcessDefinitionEditViewBase extends Vue { ...@@ -954,7 +944,6 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -983,7 +972,6 @@ export default class WFProcessDefinitionEditViewBase extends Vue { ...@@ -983,7 +972,6 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -1012,7 +1000,6 @@ export default class WFProcessDefinitionEditViewBase extends Vue { ...@@ -1012,7 +1000,6 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -1041,7 +1028,6 @@ export default class WFProcessDefinitionEditViewBase extends Vue { ...@@ -1041,7 +1028,6 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
......
...@@ -764,7 +764,6 @@ export default class WFProcessDefinitionGridViewBase extends Vue { ...@@ -764,7 +764,6 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -793,7 +792,6 @@ export default class WFProcessDefinitionGridViewBase extends Vue { ...@@ -793,7 +792,6 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -822,7 +820,6 @@ export default class WFProcessDefinitionGridViewBase extends Vue { ...@@ -822,7 +820,6 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -851,7 +848,6 @@ export default class WFProcessDefinitionGridViewBase extends Vue { ...@@ -851,7 +848,6 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -880,7 +876,6 @@ export default class WFProcessDefinitionGridViewBase extends Vue { ...@@ -880,7 +876,6 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -909,7 +904,6 @@ export default class WFProcessDefinitionGridViewBase extends Vue { ...@@ -909,7 +904,6 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -938,7 +932,6 @@ export default class WFProcessDefinitionGridViewBase extends Vue { ...@@ -938,7 +932,6 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -967,7 +960,6 @@ export default class WFProcessDefinitionGridViewBase extends Vue { ...@@ -967,7 +960,6 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -996,7 +988,6 @@ export default class WFProcessDefinitionGridViewBase extends Vue { ...@@ -996,7 +988,6 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -1025,7 +1016,6 @@ export default class WFProcessDefinitionGridViewBase extends Vue { ...@@ -1025,7 +1016,6 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -1054,7 +1044,6 @@ export default class WFProcessDefinitionGridViewBase extends Vue { ...@@ -1054,7 +1044,6 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -1083,7 +1072,6 @@ export default class WFProcessDefinitionGridViewBase extends Vue { ...@@ -1083,7 +1072,6 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -1112,7 +1100,6 @@ export default class WFProcessDefinitionGridViewBase extends Vue { ...@@ -1112,7 +1100,6 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -1136,14 +1123,16 @@ export default class WFProcessDefinitionGridViewBase extends Vue { ...@@ -1136,14 +1123,16 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
* @memberof WFProcessDefinitionGridView * @memberof WFProcessDefinitionGridView
*/ */
public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) { public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
let localContext:any = null;
let localViewParam:any =null;
const data: any = {}; const data: any = {};
if(args[0].srfsourcekey){ if(args[0].srfsourcekey){
data.srfsourcekey = args[0].srfsourcekey; data.srfsourcekey = args[0].srfsourcekey;
} }
let curViewParam = JSON.parse(JSON.stringify(this.context)); let tempContext = JSON.parse(JSON.stringify(this.context));
delete curViewParam.wfprocessdefinition; delete tempContext.wfprocessdefinition;
if(args.length >0){ if(args.length >0){
Object.assign(curViewParam,args[0]); Object.assign(tempContext,args[0]);
} }
const deResParameters: any[] = []; const deResParameters: any[] = [];
const parameters: any[] = [ const parameters: any[] = [
...@@ -1154,7 +1143,7 @@ export default class WFProcessDefinitionGridViewBase extends Vue { ...@@ -1154,7 +1143,7 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
const openIndexViewTab = (data: any) => { const openIndexViewTab = (data: any) => {
const _data: any = { w: (new Date().getTime()) }; const _data: any = { w: (new Date().getTime()) };
Object.assign(_data, data); Object.assign(_data, data);
const routePath = this.$viewTool.buildUpRoutePath(this.$route, curViewParam, deResParameters, parameters, args, _data); const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
this.$router.push(routePath); this.$router.push(routePath);
} }
openIndexViewTab(data); openIndexViewTab(data);
...@@ -1172,10 +1161,12 @@ export default class WFProcessDefinitionGridViewBase extends Vue { ...@@ -1172,10 +1161,12 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
* @memberof WFProcessDefinitionGridView * @memberof WFProcessDefinitionGridView
*/ */
public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) { public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
let localContext:any = null;
let localViewParam:any =null;
const data: any = {}; const data: any = {};
let curViewParam = JSON.parse(JSON.stringify(this.context)); let tempContext = JSON.parse(JSON.stringify(this.context));
if(args.length >0){ if(args.length >0){
Object.assign(curViewParam,args[0]); Object.assign(tempContext,args[0]);
} }
const deResParameters: any[] = []; const deResParameters: any[] = [];
const parameters: any[] = [ const parameters: any[] = [
...@@ -1184,7 +1175,7 @@ export default class WFProcessDefinitionGridViewBase extends Vue { ...@@ -1184,7 +1175,7 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
]; ];
const _this: any = this; const _this: any = this;
const openIndexViewTab = (data: any) => { const openIndexViewTab = (data: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, curViewParam, deResParameters, parameters, args, data); const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
this.$router.push(routePath); this.$router.push(routePath);
} }
openIndexViewTab(data); openIndexViewTab(data);
......
...@@ -530,7 +530,6 @@ export default class WFREModelEditViewBase extends Vue { ...@@ -530,7 +530,6 @@ export default class WFREModelEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
......
...@@ -664,7 +664,6 @@ export default class WFUserEditViewBase extends Vue { ...@@ -664,7 +664,6 @@ export default class WFUserEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -693,7 +692,6 @@ export default class WFUserEditViewBase extends Vue { ...@@ -693,7 +692,6 @@ export default class WFUserEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -722,7 +720,6 @@ export default class WFUserEditViewBase extends Vue { ...@@ -722,7 +720,6 @@ export default class WFUserEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -751,7 +748,6 @@ export default class WFUserEditViewBase extends Vue { ...@@ -751,7 +748,6 @@ export default class WFUserEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -780,7 +776,6 @@ export default class WFUserEditViewBase extends Vue { ...@@ -780,7 +776,6 @@ export default class WFUserEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -809,7 +804,6 @@ export default class WFUserEditViewBase extends Vue { ...@@ -809,7 +804,6 @@ export default class WFUserEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -838,7 +832,6 @@ export default class WFUserEditViewBase extends Vue { ...@@ -838,7 +832,6 @@ export default class WFUserEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -867,7 +860,6 @@ export default class WFUserEditViewBase extends Vue { ...@@ -867,7 +860,6 @@ export default class WFUserEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -896,7 +888,6 @@ export default class WFUserEditViewBase extends Vue { ...@@ -896,7 +888,6 @@ export default class WFUserEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -925,7 +916,6 @@ export default class WFUserEditViewBase extends Vue { ...@@ -925,7 +916,6 @@ export default class WFUserEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -954,7 +944,6 @@ export default class WFUserEditViewBase extends Vue { ...@@ -954,7 +944,6 @@ export default class WFUserEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -983,7 +972,6 @@ export default class WFUserEditViewBase extends Vue { ...@@ -983,7 +972,6 @@ export default class WFUserEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -1012,7 +1000,6 @@ export default class WFUserEditViewBase extends Vue { ...@@ -1012,7 +1000,6 @@ export default class WFUserEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -1041,7 +1028,6 @@ export default class WFUserEditViewBase extends Vue { ...@@ -1041,7 +1028,6 @@ export default class WFUserEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
......
...@@ -764,7 +764,6 @@ export default class WFUserGridViewBase extends Vue { ...@@ -764,7 +764,6 @@ export default class WFUserGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -793,7 +792,6 @@ export default class WFUserGridViewBase extends Vue { ...@@ -793,7 +792,6 @@ export default class WFUserGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -822,7 +820,6 @@ export default class WFUserGridViewBase extends Vue { ...@@ -822,7 +820,6 @@ export default class WFUserGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -851,7 +848,6 @@ export default class WFUserGridViewBase extends Vue { ...@@ -851,7 +848,6 @@ export default class WFUserGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -880,7 +876,6 @@ export default class WFUserGridViewBase extends Vue { ...@@ -880,7 +876,6 @@ export default class WFUserGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -909,7 +904,6 @@ export default class WFUserGridViewBase extends Vue { ...@@ -909,7 +904,6 @@ export default class WFUserGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -938,7 +932,6 @@ export default class WFUserGridViewBase extends Vue { ...@@ -938,7 +932,6 @@ export default class WFUserGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -967,7 +960,6 @@ export default class WFUserGridViewBase extends Vue { ...@@ -967,7 +960,6 @@ export default class WFUserGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -996,7 +988,6 @@ export default class WFUserGridViewBase extends Vue { ...@@ -996,7 +988,6 @@ export default class WFUserGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -1025,7 +1016,6 @@ export default class WFUserGridViewBase extends Vue { ...@@ -1025,7 +1016,6 @@ export default class WFUserGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -1054,7 +1044,6 @@ export default class WFUserGridViewBase extends Vue { ...@@ -1054,7 +1044,6 @@ export default class WFUserGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -1083,7 +1072,6 @@ export default class WFUserGridViewBase extends Vue { ...@@ -1083,7 +1072,6 @@ export default class WFUserGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -1112,7 +1100,6 @@ export default class WFUserGridViewBase extends Vue { ...@@ -1112,7 +1100,6 @@ export default class WFUserGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -1136,14 +1123,16 @@ export default class WFUserGridViewBase extends Vue { ...@@ -1136,14 +1123,16 @@ export default class WFUserGridViewBase extends Vue {
* @memberof WFUserGridView * @memberof WFUserGridView
*/ */
public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) { public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
let localContext:any = null;
let localViewParam:any =null;
const data: any = {}; const data: any = {};
if(args[0].srfsourcekey){ if(args[0].srfsourcekey){
data.srfsourcekey = args[0].srfsourcekey; data.srfsourcekey = args[0].srfsourcekey;
} }
let curViewParam = JSON.parse(JSON.stringify(this.context)); let tempContext = JSON.parse(JSON.stringify(this.context));
delete curViewParam.wfuser; delete tempContext.wfuser;
if(args.length >0){ if(args.length >0){
Object.assign(curViewParam,args[0]); Object.assign(tempContext,args[0]);
} }
const deResParameters: any[] = []; const deResParameters: any[] = [];
const parameters: any[] = [ const parameters: any[] = [
...@@ -1154,7 +1143,7 @@ export default class WFUserGridViewBase extends Vue { ...@@ -1154,7 +1143,7 @@ export default class WFUserGridViewBase extends Vue {
const openIndexViewTab = (data: any) => { const openIndexViewTab = (data: any) => {
const _data: any = { w: (new Date().getTime()) }; const _data: any = { w: (new Date().getTime()) };
Object.assign(_data, data); Object.assign(_data, data);
const routePath = this.$viewTool.buildUpRoutePath(this.$route, curViewParam, deResParameters, parameters, args, _data); const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
this.$router.push(routePath); this.$router.push(routePath);
} }
openIndexViewTab(data); openIndexViewTab(data);
...@@ -1172,10 +1161,12 @@ export default class WFUserGridViewBase extends Vue { ...@@ -1172,10 +1161,12 @@ export default class WFUserGridViewBase extends Vue {
* @memberof WFUserGridView * @memberof WFUserGridView
*/ */
public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) { public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
let localContext:any = null;
let localViewParam:any =null;
const data: any = {}; const data: any = {};
let curViewParam = JSON.parse(JSON.stringify(this.context)); let tempContext = JSON.parse(JSON.stringify(this.context));
if(args.length >0){ if(args.length >0){
Object.assign(curViewParam,args[0]); Object.assign(tempContext,args[0]);
} }
const deResParameters: any[] = []; const deResParameters: any[] = [];
const parameters: any[] = [ const parameters: any[] = [
...@@ -1184,7 +1175,7 @@ export default class WFUserGridViewBase extends Vue { ...@@ -1184,7 +1175,7 @@ export default class WFUserGridViewBase extends Vue {
]; ];
const _this: any = this; const _this: any = this;
const openIndexViewTab = (data: any) => { const openIndexViewTab = (data: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, curViewParam, deResParameters, parameters, args, data); const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
this.$router.push(routePath); this.$router.push(routePath);
} }
openIndexViewTab(data); openIndexViewTab(data);
......
...@@ -7,24 +7,28 @@ import Vue, { VNode, CreateElement } from "vue"; ...@@ -7,24 +7,28 @@ import Vue, { VNode, CreateElement } from "vue";
* @interface UIActionTool * @interface UIActionTool
*/ */
export declare interface UIActionTool { export declare interface UIActionTool {
/** /**
* 处理应用上下文参数 * 处理应用上下文参数
* *
* @param actionTarget 数据目标 * @param actionTarget 数据目标
* @param args 传入数据对象 * @param args 传入数据对象
* @param parentContext 父上下文
* @param parentParams 父参数
* @param param 传入应用上下数据参数 * @param param 传入应用上下数据参数
*/ */
handleContextParam(actionTarget:any,args:any,context:any):any; handleContextParam(actionTarget: any, args: any,parentContext:any,parentParams:any, context: any):any;
/** /**
* 处理界面行为参数 * 处理界面行为参数
* *
* @param actionTarget 数据目标 * @param actionTarget 数据目标
* @param args 传入数据对象 * @param args 传入数据对象
* @param parentContext 父上下文
* @param parentParams 父参数
* @param param 传入界面行为附加参数 * @param param 传入界面行为附加参数
*/ */
handleActionParam(actionTarget:any,args:any,params:any):any; handleActionParam(actionTarget: any, args: any,parentContext:any,parentParams:any, params: any):any;
} }
declare module "vue/types/vue" { declare module "vue/types/vue" {
......
...@@ -8,10 +8,12 @@ export class UIActionTool { ...@@ -8,10 +8,12 @@ export class UIActionTool {
* *
* @param actionTarget 数据目标 * @param actionTarget 数据目标
* @param args 传入数据对象 * @param args 传入数据对象
* @param parentContext 父上下文
* @param parentParams 父参数
* @param param 传入应用上下数据参数 * @param param 传入应用上下数据参数
*/ */
public static handleContextParam(actionTarget: any, args: any, context: any) { public static handleContextParam(actionTarget: any, args: any,parentContext:any,parentParams:any, context: any) {
return this.formatData(actionTarget, args, context); return this.formatData(actionTarget, args,parentContext,parentParams,context);
} }
/** /**
...@@ -19,10 +21,12 @@ export class UIActionTool { ...@@ -19,10 +21,12 @@ export class UIActionTool {
* *
* @param actionTarget 数据目标 * @param actionTarget 数据目标
* @param args 传入数据对象 * @param args 传入数据对象
* @param parentContext 父上下文
* @param parentParams 父参数
* @param param 传入界面行为附加参数 * @param param 传入界面行为附加参数
*/ */
public static handleActionParam(actionTarget: any, args: any, params: any) { public static handleActionParam(actionTarget: any, args: any,parentContext:any,parentParams:any, params: any) {
return this.formatData(actionTarget, args, params); return this.formatData(actionTarget, args,parentContext,parentParams,params);
} }
/** /**
...@@ -32,11 +36,13 @@ export class UIActionTool { ...@@ -32,11 +36,13 @@ export class UIActionTool {
* @static * @static
* @param {*} actionTarget * @param {*} actionTarget
* @param {*} args * @param {*} args
* @param parentContext
* @param parentParams
* @param {*} _params * @param {*} _params
* @returns {*} * @returns {*}
* @memberof UIActionTool * @memberof UIActionTool
*/ */
private static formatData(actionTarget: any, args: any, _params: any): any { private static formatData(actionTarget: any, args: any,parentContext:any,parentParams:any, _params: any): any {
let _data: any = {}; let _data: any = {};
if (Object.is(actionTarget, 'SINGLEKEY')) { if (Object.is(actionTarget, 'SINGLEKEY')) {
let [arg] = args; let [arg] = args;
...@@ -50,12 +56,16 @@ export class UIActionTool { ...@@ -50,12 +56,16 @@ export class UIActionTool {
const key = value.substring(1, value.length - 1); const key = value.substring(1, value.length - 1);
if (arg && arg.hasOwnProperty(key)) { if (arg && arg.hasOwnProperty(key)) {
value = (arg[key] !== null && arg[key] !== undefined) ? arg[key] : null; value = (arg[key] !== null && arg[key] !== undefined) ? arg[key] : null;
} else { } else if(parentContext && parentContext.hasOwnProperty(key)){
value = (parentContext[key] !== null && parentContext[key] !== undefined) ? parentContext[key] : null;
}else if(parentParams && parentParams.hasOwnProperty(key)){
value = (parentParams[key] !== null && parentParams[key] !== undefined) ? parentParams[key] : null;
}else {
hasProperty = false; hasProperty = false;
} }
} }
if(hasProperty){ if(hasProperty){
Object.assign(_data, { [name]: value }); Object.assign(_data, { [name.toLowerCase()]: value });
} }
}); });
} else if (Object.is(actionTarget, 'MULTIKEY')) { } else if (Object.is(actionTarget, 'MULTIKEY')) {
...@@ -71,7 +81,11 @@ export class UIActionTool { ...@@ -71,7 +81,11 @@ export class UIActionTool {
args.forEach((arg: any) => { args.forEach((arg: any) => {
if (arg && arg.hasOwnProperty(key)) { if (arg && arg.hasOwnProperty(key)) {
value = (arg[key] !== null && arg[key] !== undefined) ? arg[key] : null; value = (arg[key] !== null && arg[key] !== undefined) ? arg[key] : null;
} else { }else if(parentContext && parentContext.hasOwnProperty(key)){
value = (parentContext[key] !== null && parentContext[key] !== undefined) ? parentContext[key] : null;
}else if(parentParams && parentParams.hasOwnProperty(key)){
value = (parentParams[key] !== null && parentParams[key] !== undefined) ? parentParams[key] : null;
}else {
value = null; value = null;
noPropertyNum++; noPropertyNum++;
} }
...@@ -79,7 +93,7 @@ export class UIActionTool { ...@@ -79,7 +93,7 @@ export class UIActionTool {
}); });
} }
if(values.length !== noPropertyNum){ if(values.length !== noPropertyNum){
Object.assign(_data, { [name]: values.length > 0 ? values.join(',') : value }); Object.assign(_data, { [name.toLowerCase()]: values.length > 0 ? values.join(',') : value });
} }
}); });
} }
......
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
]" ]"
:context="context" :context="context"
:viewparams="viewparams" :viewparams="viewparams"
:localContext ='{}'
:localParam ='{}'
parameterName='wfgroup' parameterName='wfgroup'
parentName="WFGroup" parentName="WFGroup"
refviewtype='DEGRIDVIEW' refviewtype='DEGRIDVIEW'
......
...@@ -1408,6 +1408,14 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1408,6 +1408,14 @@ export default class MainBase extends Vue implements ControlInterface {
}); });
return isSelected ? "grid-selected-row" : ""; return isSelected ? "grid-selected-row" : "";
} }
/**
* 新建默认值
* @param {*} row 行数据
* @memberof Main
*/
public createDefault(row: any){
}
} }
</script> </script>
......
...@@ -1389,6 +1389,14 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1389,6 +1389,14 @@ export default class MainBase extends Vue implements ControlInterface {
}); });
return isSelected ? "grid-selected-row" : ""; return isSelected ? "grid-selected-row" : "";
} }
/**
* 新建默认值
* @param {*} row 行数据
* @memberof Main
*/
public createDefault(row: any){
}
} }
</script> </script>
......
...@@ -1456,6 +1456,14 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1456,6 +1456,14 @@ export default class MainBase extends Vue implements ControlInterface {
}); });
return isSelected ? "grid-selected-row" : ""; return isSelected ? "grid-selected-row" : "";
} }
/**
* 新建默认值
* @param {*} row 行数据
* @memberof Main
*/
public createDefault(row: any){
}
} }
</script> </script>
......
...@@ -1408,6 +1408,14 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1408,6 +1408,14 @@ export default class MainBase extends Vue implements ControlInterface {
}); });
return isSelected ? "grid-selected-row" : ""; return isSelected ? "grid-selected-row" : "";
} }
/**
* 新建默认值
* @param {*} row 行数据
* @memberof Main
*/
public createDefault(row: any){
}
} }
</script> </script>
......
...@@ -37,11 +37,6 @@ ...@@ -37,11 +37,6 @@
git clone -b master $para2 ibzwf/ git clone -b master $para2 ibzwf/
export NODE_OPTIONS=--max-old-space-size=4096 export NODE_OPTIONS=--max-old-space-size=4096
cd ibzwf/ cd ibzwf/
mvn clean package -Papi
cd ibzwf-provider/ibzwf-provider-api
mvn -Papi docker:build
mvn -Papi docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzwf-provider-api.yaml ibzlab-rt --with-registry-auth
</command> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>
......
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \ sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzwf-provider-api.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzwf-provider-api.jar
EXPOSE 40003 EXPOSE 8081
ADD ibzwf-provider-api.jar /ibzwf-provider-api.jar ADD ibzwf-provider-api.jar /ibzwf-provider-api.jar
...@@ -3,21 +3,9 @@ services: ...@@ -3,21 +3,9 @@ services:
ibzwf-provider-api: ibzwf-provider-api:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzwf-provider-api:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzwf-provider-api:latest
ports: ports:
- "40003:40003" - "8081:8081"
networks: networks:
- agent_network - agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
- SERVER_PORT=40003
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
- SPRING_DATASOURCE_PASSWORD=@6dEfb3@
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
deploy: deploy:
resources: resources:
limits: limits:
......
...@@ -12,10 +12,7 @@ import org.springframework.http.ResponseEntity; ...@@ -12,10 +12,7 @@ import org.springframework.http.ResponseEntity;
import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.GrantedAuthority;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.Collection; import java.util.*;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
@RestController @RestController
@RequestMapping(value = "") @RequestMapping(value = "")
...@@ -38,8 +35,9 @@ public class AppController { ...@@ -38,8 +35,9 @@ public class AppController {
Set<String> appMenu = new HashSet(); Set<String> appMenu = new HashSet();
Set<String> uniRes = new HashSet(); Set<String> uniRes = new HashSet();
AuthenticationUser curUser = AuthenticationUser.getAuthenticationUser();
if(enablePermissionValid){ if(enablePermissionValid){
Collection<GrantedAuthority> authorities=AuthenticationUser.getAuthenticationUser().getAuthorities(); Collection<GrantedAuthority> authorities=curUser.getAuthorities();
Iterator it = authorities.iterator(); Iterator it = authorities.iterator();
while(it.hasNext()) { while(it.hasNext()) {
GrantedAuthority authority = (GrantedAuthority)it.next(); GrantedAuthority authority = (GrantedAuthority)it.next();
...@@ -50,6 +48,10 @@ public class AppController { ...@@ -50,6 +48,10 @@ public class AppController {
appMenu.add(strAuthority.substring(systemId.length()+9)); appMenu.add(strAuthority.substring(systemId.length()+9));
} }
} }
Map<String,Object> context = new HashMap<>();
context.putAll(curUser.getSessionParams());
context.put("srfusername",curUser.getPersonname());
appData.put("context",context);
appData.put("unires",uniRes); appData.put("unires",uniRes);
appData.put("appmenu",appMenu); appData.put("appmenu",appMenu);
appData.put("enablepermissionvalid",enablePermissionValid); appData.put("enablepermissionvalid",enablePermissionValid);
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册