From b56e150bf38535799b5d468483e76d801dc92f99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Sat, 23 Apr 2022 21:56:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Pagination/index.vue |   1 -
 src/components/TreeSelect/index.vue | 117 ++++++++++++++++------------
 src/views/index_v1.vue              |   2 +-
 src/views/tool/gen/editTable.vue    |   1 -
 src/views/tool/gen/genInfoForm.vue  |   2 -
 vite/plugins/auto-import.js         |  20 ++---
 6 files changed, 77 insertions(+), 66 deletions(-)

diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue
index 1377b19..d62f055 100644
--- a/src/components/Pagination/index.vue
+++ b/src/components/Pagination/index.vue
@@ -78,7 +78,6 @@ export default {
       }
     }
     function handleCurrentChange(val) {
-			console.log(val)
       emit("pagination", { page: val, limit: pageSize.value });
       if (props.autoScroll) {
         // scrollTo(0, 800);
diff --git a/src/components/TreeSelect/index.vue b/src/components/TreeSelect/index.vue
index 3baed21..d00b46a 100644
--- a/src/components/TreeSelect/index.vue
+++ b/src/components/TreeSelect/index.vue
@@ -1,10 +1,28 @@
 <template>
   <div class="el-tree-select">
-    <el-select style="width: 100%" v-model="valueId" ref="treeSelect" :filterable="true" :clearable="true" @clear="clearHandle"
-      :filter-method="selectFilterData" :placeholder="placeholder">
+    <el-select
+      style="width: 100%"
+      v-model="valueId"
+      ref="treeSelect"
+      :filterable="true"
+      :clearable="true"
+      @clear="clearHandle"
+      :filter-method="selectFilterData"
+      :placeholder="placeholder"
+    >
       <el-option :value="valueId" :label="valueTitle">
-        <el-tree id="tree-option" ref="selectTree" :accordion="accordion" :data="options" :props="objMap" :node-key="objMap.value"
-          :expand-on-click-node="false" :default-expanded-keys="defaultExpandedKey" :filter-node-method="filterNode" @node-click="handleNodeClick">
+        <el-tree
+          id="tree-option"
+          ref="selectTree"
+          :accordion="accordion"
+          :data="options"
+          :props="objMap"
+          :node-key="objMap.value"
+          :expand-on-click-node="false"
+          :default-expanded-keys="defaultExpandedKey"
+          :filter-node-method="filterNode"
+          @node-click="handleNodeClick"
+        >
         </el-tree>
       </el-option>
     </el-select>
@@ -12,7 +30,7 @@
 </template>
 
 <script setup>
-const { proxy } = getCurrentInstance();
+const { proxy } = getCurrentInstance()
 
 const props = defineProps({
   /* 配置项 */
@@ -20,23 +38,23 @@ const props = defineProps({
     type: Object,
     default: () => {
       return {
-        value: "id", // ID字段名
-        label: "label", // 显示名称
-        children: "children", // 子级字段名
-      };
+        value: 'id', // ID字段名
+        label: 'label', // 显示名称
+        children: 'children', // 子级字段名
+      }
     },
   },
   /* 自动收起 */
   accordion: {
     type: Boolean,
     default: () => {
-      return false;
+      return false
     },
   },
   /**当前双向数据绑定的值 */
   value: {
     type: [String, Number],
-    default: "",
+    default: '',
   },
   /**当前的数据 */
   options: {
@@ -46,76 +64,73 @@ const props = defineProps({
   /**输入框内部的文字 */
   placeholder: {
     type: String,
-    default: "",
+    default: '',
   },
-});
+})
 
-const emit = defineEmits(["update:value"]);
+const emit = defineEmits(['update:value'])
 
 const valueId = computed({
   get: () => props.value,
   set: (val) => {
-    emit("update:value", val);
+    emit('update:value', val)
   },
-});
-const valueTitle = ref("");
-const defaultExpandedKey = ref([]);
+})
+const valueTitle = ref('')
+const defaultExpandedKey = ref([])
 
 function initHandle() {
   nextTick(() => {
-    const selectedValue = valueId.value;
-    if (
-      selectedValue &&
-      selectedValue !== null &&
-      typeof selectedValue !== "undefined"
-    ) {
-      const node = proxy.$refs.selectTree.getNode(selectedValue);
+    const selectedValue = valueId.value
+		console.log('selectedValue=' + selectedValue)
+    if (selectedValue && selectedValue !== null && typeof selectedValue !== 'undefined') {
+      const node = proxy.$refs.selectTree.getNode(selectedValue)
       if (node) {
-        valueTitle.value = node.data[props.objMap.label];
-        proxy.$refs.selectTree.setCurrentKey(selectedValue); // 设置默认选中
-        defaultExpandedKey.value = [selectedValue]; // 设置默认展开
+        valueTitle.value = node.data[props.objMap.label]
+        proxy.$refs.selectTree.setCurrentKey(selectedValue) // 设置默认选中
+        defaultExpandedKey.value = [selectedValue] // 设置默认展开
       }
     } else {
-      clearHandle();
+      // clearHandle()
     }
-  });
+  })
 }
 function handleNodeClick(node) {
-  valueTitle.value = node[props.objMap.label];
-  valueId.value = node[props.objMap.value];
-  defaultExpandedKey.value = [];
-  proxy.$refs.treeSelect.blur();
-  selectFilterData("");
+  valueTitle.value = node[props.objMap.label]
+  valueId.value = node[props.objMap.value]
+  defaultExpandedKey.value = []
+  proxy.$refs.treeSelect.blur()
+  selectFilterData('')
 }
 function selectFilterData(val) {
-  proxy.$refs.selectTree.filter(val);
+  proxy.$refs.selectTree.filter(val)
 }
 function filterNode(value, data) {
-  if (!value) return true;
-  return data[props.objMap["label"]].indexOf(value) !== -1;
+  if (!value) return true
+  return data[props.objMap['label']].indexOf(value) !== -1
 }
 function clearHandle() {
-  valueTitle.value = "";
-  valueId.value = "";
-  defaultExpandedKey.value = [];
-  clearSelected();
+  valueTitle.value = ''
+  valueId.value = ''
+  defaultExpandedKey.value = []
+  clearSelected()
 }
 function clearSelected() {
-  const allNode = document.querySelectorAll("#tree-option .el-tree-node");
-  allNode.forEach((element) => element.classList.remove("is-current"));
+  const allNode = document.querySelectorAll('#tree-option .el-tree-node')
+  allNode.forEach((element) => element.classList.remove('is-current'))
 }
 
 onMounted(() => {
-  initHandle();
-});
+  initHandle()
+})
 
 watch(valueId, () => {
-  initHandle();
-});
+  initHandle()
+})
 </script>
 
-<style lang='scss' scoped>
-@import "@/assets/styles/variables.module.scss";
+<style lang="scss" scoped>
+@import '@/assets/styles/variables.module.scss';
 .el-scrollbar .el-scrollbar__view .el-select-dropdown__item {
   padding: 0;
   background-color: #fff;
@@ -139,4 +154,4 @@ ul li .el-tree .el-tree-node__content {
   background-color: mix(#fff, $--color-primary, 90%);
   color: $--color-primary;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/index_v1.vue b/src/views/index_v1.vue
index 4df4239..4187a2e 100644
--- a/src/views/index_v1.vue
+++ b/src/views/index_v1.vue
@@ -80,7 +80,7 @@
     </el-row>
     <panel-group @handleSetLineChartData="handleSetLineChartData" />
 
-    <el-row class="mb20" style="background: #fff;">
+    <el-row class="mb20" style="background: #fff">
       <line-chart :chart-data="lineChartData" :key="dataType" />
     </el-row>
 
diff --git a/src/views/tool/gen/editTable.vue b/src/views/tool/gen/editTable.vue
index 1fc8a85..086d852 100644
--- a/src/views/tool/gen/editTable.vue
+++ b/src/views/tool/gen/editTable.vue
@@ -121,7 +121,6 @@ import { updateGenTable, getGenTable } from '@/api/tool/gen'
 import { listType } from '@/api/system/dict/type'
 import basicInfoForm from './basicInfoForm'
 import genInfoForm from './genInfoForm'
-import { getCurrentInstance, reactive } from 'vue-demi'
 import { useRoute } from 'vue-router'
 // import Sortable from 'sortablejs'
 
diff --git a/src/views/tool/gen/genInfoForm.vue b/src/views/tool/gen/genInfoForm.vue
index 7c4a9e7..6053373 100644
--- a/src/views/tool/gen/genInfoForm.vue
+++ b/src/views/tool/gen/genInfoForm.vue
@@ -265,12 +265,10 @@
 <script setup name="genInfoForm">
 import { listMenu } from '@/api/system/menu'
 import { queryColumnInfo } from '@/api/tool/gen'
-import { watch } from 'vue-demi'
 
 const subColumns = ref([])
 const menuOptions = ref([])
 // const checkedBtn = ref([])
-const { proxy } = getCurrentInstance()
 
 const props = defineProps({
   info: {
diff --git a/vite/plugins/auto-import.js b/vite/plugins/auto-import.js
index 62f1c1f..b841322 100644
--- a/vite/plugins/auto-import.js
+++ b/vite/plugins/auto-import.js
@@ -1,14 +1,14 @@
 import autoImport from 'unplugin-auto-import/vite'
 
 export default function createAutoImport() {
-	return autoImport({
-		imports: [
-			'vue',
-			'vue-router',
-			{
-				'vuex': ['useStore']
-			}
-		],
-		dts: false
-	})
+  return autoImport({
+    imports: [
+      'vue',
+      'vue-router',
+      {
+        'vuex': ['useStore']
+      }
+    ],
+    dts: "src/auto-import.d.ts" // 生成 `auto-import.d.ts` 全局声明
+  })
 }
\ No newline at end of file