From 9cc071edcde0afce694c99872c1e0d2a084f46c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=BF=E8=BE=89?= <a@a.com>
Date: Wed, 27 Nov 2024 16:46:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0onSave=EF=BC=8ConClose?=
 =?UTF-8?q?=E5=92=8ConClosed=E4=BA=8B=E4=BB=B6=EF=BC=8C=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BF=9D=E5=AD=98=E9=80=BB=E8=BE=91=EF=BC=9A?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E4=BC=9A=E5=9C=A8=E9=80=89=E6=8B=A9=E6=97=B6?=
 =?UTF-8?q?=E5=AE=9E=E6=97=B6=E5=8F=98=E5=8C=96=E4=BD=86=E4=B8=8D=E7=82=B9?=
 =?UTF-8?q?=E7=A1=AE=E5=AE=9A=E5=88=99=E4=B8=8D=E4=BC=9A=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E5=AE=9E=E9=99=85=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9=EF=BC=88?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=95=B0=E6=8D=AE=E4=BC=9A=E5=A4=8D=E5=8E=9F?=
 =?UTF-8?q?=EF=BC=89=EF=BC=88=E5=AE=9E=E6=97=B6=E5=8F=98=E5=8C=96=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E4=BF=AE=E6=94=B9=E5=BE=85=E5=AE=9A=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/components/fileSelector/index.vue | 37 +++++++++++++++--------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/web/src/components/fileSelector/index.vue b/web/src/components/fileSelector/index.vue
index d0d79b8..4b91abd 100644
--- a/web/src/components/fileSelector/index.vue
+++ b/web/src/components/fileSelector/index.vue
@@ -23,7 +23,7 @@
         </div>
         <div @click="selectVisiable = true && !props.disabled" class="addControllorHover"
           :style="{ cursor: props.disabled ? 'not-allowed' : 'pointer' }"></div>
-        <el-icon v-show="!!data && !props.disabled" class="closeHover" :size="16" @click="dataClear">
+        <el-icon v-show="!!data && !props.disabled" class="closeHover" :size="16" @click="clear">
           <Close />
         </el-icon>
       </div>
@@ -41,7 +41,7 @@
         </div>
         <div @click="selectVisiable = true && !props.disabled" class="addControllorHover"
           :style="{ cursor: props.disabled ? 'not-allowed' : 'pointer' }"></div>
-        <el-icon v-show="!!data && !props.disabled" class="closeHover" :size="16" @click="dataClear">
+        <el-icon v-show="!!data && !props.disabled" class="closeHover" :size="16" @click="clear">
           <Close />
         </el-icon>
       </div>
@@ -59,13 +59,13 @@
         </div>
         <div @click="selectVisiable = true && !props.disabled" class="addControllorHover"
           :style="{ cursor: props.disabled ? 'not-allowed' : 'pointer' }"></div>
-        <el-icon v-show="!!data && !props.disabled" class="closeHover" :size="16" @click="dataClear">
+        <el-icon v-show="!!data && !props.disabled" class="closeHover" :size="16" @click="clear">
           <Close />
         </el-icon>
       </div>
     </div>
     <el-dialog v-model="selectVisiable" :draggable="false" width="50%" :align-center="false"
-      @open="if (listData.length === 0) listRequest();" @closed="clear" modal-class="_overlay">
+      @open="if (listData.length === 0) listRequest();" @close="onClose" @closed="onClosed" modal-class="_overlay">
       <template #header>
         <span class="el-dialog__title">文件选择</span>
         <el-divider style="margin: 0;" />
@@ -112,8 +112,8 @@
         </div>
       </div>
       <template #footer v-if="props.showInput">
-        <el-button type="default" @click="selectVisiable = false">取消</el-button>
-        <el-button type="primary" @click="selectVisiable = false">确定</el-button>
+        <el-button type="default" @click="onClose">取消</el-button>
+        <el-button type="primary" @click="onSave">确定</el-button>
       </template>
     </el-dialog>
   </div>
@@ -216,7 +216,7 @@ const onItemClick = async (e: MouseEvent) => {
     target.classList.add('active');
     data.value = fileId;
   }
-  onDataChange(data.value);
+  // onDataChange(data.value);
 };
 // 每次列表刷新都得更新一下选择状态，因为所有标签页共享列表
 const selectedInit = async () => {
@@ -230,8 +230,22 @@ const selectedInit = async () => {
   }
 };
 const uploadRef = ref<any>();
+const onSave = () => {
+  onDataChange(data.value);
+  emit('onSave', data.value);
+  selectVisiable.value = false;
+};
+const onClose = () => {
+  data.value = props.modelValue;
+  emit('onClose');
+  selectVisiable.value = false;
+};
+const onClosed = () => {
+  clearState();
+  emit('onClosed');
+};
 // 清空状态
-const clear = () => {
+const clearState = () => {
   filterForm.name = '';
   pageForm.page = 1;
   pageForm.limit = 10;
@@ -240,12 +254,12 @@ const clear = () => {
   // all数据不能清，因为all只会在挂载的时候赋值一次
   // listAllData.value = [];
 };
-const dataClear = () => { data.value = null; onDataChange(null); }
+const clear = () => { data.value = null; onDataChange(null); }
 
 
 // fs-crud部分
 const data = ref<any>(null);
-const emit = defineEmits(['update:modelValue']);
+const emit = defineEmits(['update:modelValue', 'onSave', 'onClose', 'onClosed']);
 watch(() => props.modelValue, (val) => { data.value = val; }, { immediate: true });
 const { ui } = useUi();
 const formValidator = ui.formItem.injectFormItemContext();
@@ -255,8 +269,7 @@ const onDataChange = (value: any) => {
   formValidator.onBlur();
 };
 
-defineExpose({ data, onDataChange, selectVisiable, clear, dataClear });
-
+defineExpose({ data, onDataChange, selectVisiable, clearState, clear });
 
 onMounted(() => {
   if (props.multiple && props.inputType !== 'selector')