From 088f72db62c7093bca900cc000710027178d8252 Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Tue, 1 Nov 2022 19:33:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E6=8E=A7=E4=BB=B6=EF=BC=8C=E9=81=BF=E5=85=8D=E6=8A=A5=E8=AD=A6?=
 =?UTF-8?q?=E5=91=8A=EF=BC=88=E4=B8=8D=E5=BD=B1=E5=93=8D=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Form/src/jeecg/components/JAreaSelect.vue | 53 +++++++++++--------
 .../src/jeecg/components/JCategorySelect.vue  | 12 ++++-
 .../src/jeecg/components/JUpload/JUpload.vue  |  2 +-
 3 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/src/components/Form/src/jeecg/components/JAreaSelect.vue b/src/components/Form/src/jeecg/components/JAreaSelect.vue
index 8a6d1d3..91cda9f 100644
--- a/src/components/Form/src/jeecg/components/JAreaSelect.vue
+++ b/src/components/Form/src/jeecg/components/JAreaSelect.vue
@@ -1,24 +1,26 @@
 <template>
-  <div class="area-select">
-    <!--省份-->
-    <a-select v-model:value="province" @change="proChange" allowClear :disabled="disabled">
-      <template v-for="item in provinceOptions" :key="`${item.value}`">
-        <a-select-option :value="item.value">{{ item.label }}</a-select-option>
-      </template>
-    </a-select>
-    <!--城市-->
-    <a-select v-if="level >= 2" v-model:value="city" @change="cityChange" :disabled="disabled">
-      <template v-for="item in cityOptions" :key="`${item.value}`">
-        <a-select-option :value="item.value">{{ item.label }}</a-select-option>
-      </template>
-    </a-select>
-    <!--地区-->
-    <a-select v-if="level >= 3" v-model:value="area" @change="areaChange" :disabled="disabled">
-      <template v-for="item in areaOptions" :key="`${item.value}`">
-        <a-select-option :value="item.value">{{ item.label }}</a-select-option>
-      </template>
-    </a-select>
-  </div>
+  <a-form-item-rest>
+    <div class="area-select">
+      <!--省份-->
+      <a-select v-model:value="province" @change="proChange" allowClear :disabled="disabled">
+        <template v-for="item in provinceOptions" :key="`${item.value}`">
+          <a-select-option :value="item.value">{{ item.label }}</a-select-option>
+        </template>
+      </a-select>
+      <!--城市-->
+      <a-select v-if="level >= 2" v-model:value="city" @change="cityChange" :disabled="disabled">
+        <template v-for="item in cityOptions" :key="`${item.value}`">
+          <a-select-option :value="item.value">{{ item.label }}</a-select-option>
+        </template>
+      </a-select>
+      <!--地区-->
+      <a-select v-if="level >= 3" v-model:value="area" @change="areaChange" :disabled="disabled">
+        <template v-for="item in areaOptions" :key="`${item.value}`">
+          <a-select-option :value="item.value">{{ item.label }}</a-select-option>
+        </template>
+      </a-select>
+    </div>
+  </a-form-item-rest>
 </template>
 <script lang="ts">
   import { defineComponent, PropType, ref, reactive, watchEffect, computed, unref, watch, onMounted, onUnmounted, toRefs } from 'vue';
@@ -35,8 +37,17 @@
       area: [String],
       level: propTypes.number.def(3),
       disabled: propTypes.bool.def(false),
+      codeField: propTypes.string,
+      size: propTypes.string,
+      placeholder: propTypes.string,
+      formValues: propTypes.any,
+      allowClear: propTypes.bool.def(false),
+      getPopupContainer: {
+        type: Function,
+        default: (node) => node.parentNode,
+      },
     },
-    emits: ['change', 'update:value'],
+    emits: ['change', 'update:value','update:area','update:city','update:province'],
     setup(props, { emit, refs }) {
       const emitData = ref<any[]>([]);
       //下拉框的选择值
diff --git a/src/components/Form/src/jeecg/components/JCategorySelect.vue b/src/components/Form/src/jeecg/components/JCategorySelect.vue
index b302389..0155acc 100644
--- a/src/components/Form/src/jeecg/components/JCategorySelect.vue
+++ b/src/components/Form/src/jeecg/components/JCategorySelect.vue
@@ -76,7 +76,8 @@
       console.info(props);
       const emitData = ref<any[]>([]);
       const treeData = ref<any[]>([]);
-      const treeValue = ref('');
+      const treeValue = ref();
+      treeValue.value = '';
       const attrs = useAttrs();
       const [state] = useRuleFormItem(props, 'value', 'change', emitData);
       watch(
@@ -118,7 +119,11 @@
 
       function loadItemByCode() {
         if (!props.value || props.value == '0') {
-          treeValue.value = [];
+          if(props.multiple){
+            treeValue.value = [];
+          }else{
+            treeValue.value = '';
+          }
         } else {
           loadDictItem({ ids: props.value }).then((res) => {
             let values = props.value.split(',');
@@ -127,6 +132,9 @@
               value: values[index],
               label: item,
             }));
+            if(!props.multiple){
+              treeValue.value = treeValue.value[0];
+            }
             onLoadTriggleChange(res[0]);
           });
         }
diff --git a/src/components/Form/src/jeecg/components/JUpload/JUpload.vue b/src/components/Form/src/jeecg/components/JUpload/JUpload.vue
index fd92601..5bfc815 100644
--- a/src/components/Form/src/jeecg/components/JUpload/JUpload.vue
+++ b/src/components/Form/src/jeecg/components/JUpload/JUpload.vue
@@ -6,8 +6,8 @@
       :action="uploadUrl"
       :fileList="fileList"
       :disabled="disabled"
-      :remove="onRemove"
       v-bind="bindProps"
+      @remove="onRemove"
       @change="onFileChange"
       @preview="onFilePreview"
     >