From 107edc1584cd8e89a0f85b8fdc120194d1858934 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 25 四月 2024 15:32:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/components/actions/AddEditDialog.vue | 75 +++++++++++++++++++++++++++----------
1 files changed, 55 insertions(+), 20 deletions(-)
diff --git a/Source/ProjectWeb/src/components/actions/AddEditDialog.vue b/Source/ProjectWeb/src/components/actions/AddEditDialog.vue
index cebbd0c..0ee7d33 100644
--- a/Source/ProjectWeb/src/components/actions/AddEditDialog.vue
+++ b/Source/ProjectWeb/src/components/actions/AddEditDialog.vue
@@ -3,17 +3,26 @@
:title="paramVOS.title"
:visible.sync="visible"
:width="width"
- :style="'height:'+height || 'auto'"
+ :fullscreen="paramVOS.content || paramVOS.context"
:append-to-body="true"
class="avue-dialog avue-dialog--top"
+ :destroy-on-close="true"
@close="dialogClose">
- dialog
- <basic-form ref="formRef" v-if="paramVOS.form"></basic-form>
- <ui-view ref="uiViewRef" v-else-if="paramVOS.content || paramVOS.context"></ui-view>
- <div v-if="paramVOS.form" class="avue-dialog__footer">
- <el-button type="primary" @click="saveHandler">淇� 瀛�</el-button>
- <el-button @click="escHandler">鍙� 娑�</el-button>
- <el-button @click="resetValue">閲� 缃�</el-button>
+ <basic-form ref="formRef" v-if="paramVOS.form">
+ </basic-form>
+ <ui-view ref="uiViewRef" v-else-if="paramVOS.content || paramVOS.context"
+ :btmType="paramVOS.type"
+ :context="paramVOS.context"
+ :inDialog="true"
+ :key="'AddEditDialog-'+type"
+ :sourceData="sourceData"
+ :dataStore="dataStore"
+ :paramVOS="paramVOS"
+ ></ui-view>
+ <div slot="footer" class="dialog-footer avue-dialog__footer">
+ <el-button type="primary" plain size="small" @click="saveHandler">淇� 瀛�</el-button>
+ <el-button size="small" @click="dialogClose">鍙� 娑�</el-button>
+ <el-button size="small" @click="resetValue">閲� 缃�</el-button>
</div>
</el-dialog>
</template>
@@ -21,6 +30,7 @@
<script>
import uiView from "@/views/base/UIContentViewerInDialog"
import {dataForm} from "@/api/base/ui";
+import {addSave} from "@/api/base/actions"
export default {
name: "AddEditDialog",
@@ -42,22 +52,32 @@
},
width: {
type: String,
- default:'70%'
- },
- height: {
- type: String,
- default:'500px'
- },
+ default:'60%'
+ }
},
data(){
return {
+ type:"add",
visible:false
}
},
computed:{
+ title(){
+ return this.paramVOS.title || (this.type=='add'?'娣诲姞':'淇敼')
+ }
},
created() {
-
+ },
+ watch: {
+ sourceData: {
+ handler(val) {
+ if (this.paramVOS.form) {
+ this.onLoad();
+ }
+ },
+ deep: true,
+ immediate: true
+ },
},
methods: {
dialogClose() {
@@ -76,13 +96,28 @@
}
},
saveHandler() {
- this.dialogClose();
- },
- escHandler() {
- this.dialogClose();
+ this.$refs.formRef.validate((valid, done) => {
+ if (valid) {
+ addSave(this.paramVOS.url,this.paramVOS.method,this.form).then(() => {
+ this.$message({
+ type: "success",
+ message: "鍒涘缓鎴愬姛!"
+ });
+ if(this.saveCallback){
+ this.saveCallback();
+ }
+ this.dialogClose();
+ }).error((e) => {
+ this.$message.error(e||"鍒涘缓澶辫触")
+ });
+
+ } else {
+
+ }
+ });
},
resetValue() {
- this.$refs.formRef.resetValue();
+ this.$refs.formRef.resetFields();
}
}
}
--
Gitblit v1.9.3