Merge 277b5c43ac into 676fffa2c8

jeecgboot-vue3/src/components/Form/src/jeecg/components/JPopup.vue

@@ -2,15 +2,10 @@
 <template>
   <div class="JPopup components-input-demo-presuffix" v-if="avalid">
     <!--输入框-->
-    <a-input @click="handleOpen" :value="innerShowText || showText" :placeholder="placeholder" readOnly v-bind="attrs">
+   <a-input @click="handleOpen" v-model:value="showText" :placeholder="placeholder" v-bind="attrs" allow-clear @change="handleEmpty">
       <template #prefix>
         <Icon icon="ant-design:cluster-outlined"></Icon>
       </template>
-      <!-- update-begin-author:taoyan date:2022-5-31 for: VUEN-1157 popup 选中后，有两个清除图标；后边这个清除，只是把输入框中数据清除，实际值并没有清除 -->
-      <!-- <template #suffix>
-                <Icon icon="ant-design:close-circle-outlined" @click="handleEmpty" title="清空" v-if="showText"></Icon>
-            </template>-->
-      <!-- update-begin-author:taoyan date:2022-5-31 for: VUEN-1157 popup 选中后，有两个清除图标；后边这个清除，只是把输入框中数据清除，实际值并没有清除 -->
     </a-input>
     <!-- update-begin--author:liaozhiyang---date:20240515---for：【QQYUN-9260】必填模式下会影响到弹窗内antd组件的样式 -->
     <a-form-item>
@@ -116,8 +111,25 @@
       /**
        * TODO 清空
        */
-      function handleEmpty() {
-        showText.value = '';
+      function handleEmpty(e) {
+        // showText.value = '';
+        // update-begin--author:huoshicang---date:20250716
+        if (!e.target.value) {
+            // 匹配popup设置的回调值
+          let { fieldConfig } = props;
+          // 初始化数据
+          let values = {};
+          for (let item of fieldConfig) {
+            item.target.split(',').forEach((target) => {
+              // 设置默认值为空字符串
+              values[target] = '';
+            });
+          }
+          props.formElRef && props.formElRef.setFieldsValue(values);
+          props.setFieldsValue && props.setFieldsValue(values);
+          emit('popUpChange', values);
+        }
+        // update-end--author:huoshicang---date:20250716
       }
 
       /**