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 | 48 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 38 insertions(+), 10 deletions(-)
diff --git a/Source/ProjectWeb/src/actions/base/AddAction.js b/Source/ProjectWeb/src/actions/base/AddAction.js
index fc16632..507921f 100644
--- a/Source/ProjectWeb/src/actions/base/AddAction.js
+++ b/Source/ProjectWeb/src/actions/base/AddAction.js
@@ -1,20 +1,25 @@
/**
* 鎸夐挳澶勭悊 涓氬姟绫诲瀷鏂板
*/
-import {callPreEvent,callPostEvent} from './BaseAction';
+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) => {
- let paramVOS = Object.assign({
+ options.paramVOS = paramLow(options.paramVOS)
+ const paramVOS = Object.assign({
url: 'uiDataController/addSave',
method: 'post',
- uploadFileUrl: 'vciFileUploadController/uploadFile'
+ uploadfileurl: 'vciFileUploadController/uploadFile'
}, options.paramVOS)
options.paramVOS = paramVOS;
- callPreEvent(options, doBefore,function (options) {
+ options.sourceData = options.sourceData || {};
+
+ callPreEvent(options, doBefore, function (options) {
doAdd(options, function () {
- callPostEvent(options,doAfter, options.callback);
+ callPostEvent(options, doAfter, options.callback);
});
});
};
@@ -25,10 +30,33 @@
* @param callback 鍥炶皟
*/
export const doAdd = (options,callback)=> {
- this.$message.success('鎵ц澧炲姞');
- if(callback){
- callback(options);
+ const paramVOS = options.paramVOS;
+ if (!paramVOS['form'] && !paramVOS['context']&& !paramVOS['content']) {
+ Vue.prototype.$message.error("鎸夐挳閰嶇疆涓嶆纭�");
+ return false;
}
+
+ 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);
+
}
/**
* 鍓嶇疆浜嬩欢
@@ -36,7 +64,7 @@
* @param callback 鍥炶皟
*/
export const doBefore = (options,callback)=> {
- this.$message.success('鎵ц鍓嶇疆浜嬩欢');
+ Vue.prototype.$message.success('鎵ц澧炲姞鍓嶇疆浜嬩欢');
if(callback){
callback(options);
}
@@ -47,7 +75,7 @@
* @param callback 鍥炶皟
*/
export const doAfter = (options,callback)=> {
- this.$message.success('鎵ц鍚庣疆浜嬩欢');
+ Vue.prototype.$message.success('鎵ц澧炲姞鍚庣疆浜嬩欢');
if(callback){
callback(options);
}
--
Gitblit v1.9.3