From 2cbad4e40c2938a90172aa24551e82a4817b9640 Mon Sep 17 00:00:00 2001 From: yuxc <yuxc@vci-tech.com> Date: 星期四, 25 四月 2024 15:21:31 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/ProjectWeb/src/actions/base/AddAction.js | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 deletions(-) diff --git a/Source/ProjectWeb/src/actions/base/AddAction.js b/Source/ProjectWeb/src/actions/base/AddAction.js index e4523d6..507921f 100644 --- a/Source/ProjectWeb/src/actions/base/AddAction.js +++ b/Source/ProjectWeb/src/actions/base/AddAction.js @@ -4,7 +4,7 @@ import {paramLow,callPreEvent, callPostEvent} from './BaseAction'; import {validatenull} from "@/util/validate"; import Vue from "vue"; - +import AddEditDialog from "@/components/actions/AddEditDialog" export const doAction = (options) => { options.paramVOS = paramLow(options.paramVOS) @@ -31,15 +31,32 @@ */ export const doAdd = (options,callback)=> { const paramVOS = options.paramVOS; - if (!paramVOS['form'] && !paramVOS['context']) { + if (!paramVOS['form'] && !paramVOS['context']&& !paramVOS['content']) { Vue.prototype.$message.error("鎸夐挳閰嶇疆涓嶆纭�"); return false; } - Vue.prototype.$message.success('鎵ц'+paramVOS.title); - if(callback){ - callback(options); + const dialogConstructor = Vue.extend(AddEditDialog); + let instance = new dialogConstructor(); + instance.props={ + sourceData:options.sourceData, + dataStore:options.dataStore, + paramVOS:paramVOS } + const vm = instance.$mount(); + vm.visible=true; + vm.dialogClose=function (){ + document.body.removeChild(vm.$el); + instance.$destroy(); + instance = null; + }; + vm.prototype.saveCallback=function (){ + if (callback) { + callback(options); + } + } + document.body.appendChild(vm.$el); + } /** * 鍓嶇疆浜嬩欢 -- Gitblit v1.9.3