Merge branch 'sqy_dev' into 'main'

refactor:调整组织树公共组件

See merge request huang/yun-teng-iot-front!211

@@ -8,51 +8,31 @@
       :clickRowToExpand="false"
       :treeData="treeData"
       :replaceFields="{ key: 'id', title: 'name' }"
-      v-model:expandedKeys="expandedKeys"
-      v-model:selectedKeys="selectedKeys"
+      :selectedKeys="selectedKeys"
       @select="handleSelect"
-      :defaultExpandAll="true"
     />
   </div>
 </template>
-<script lang="ts">
-  import { defineComponent, onMounted, ref } from 'vue';
-
+<script lang="ts" setup name="OrganizationIdTree">
+  import { onMounted, ref } from 'vue';
   import { BasicTree, TreeItem } from '/@/components/Tree';
   import { getOrganizationList } from '/@/api/system/system';
+  const emit = defineEmits(['select']);
+  const treeData = ref<TreeItem[]>([]);
+  const selectedKeys = ref<string[]>();
+  
+  function handleSelect(keys) {
+    emit('select', keys[0]);
+  }
 
-  export default defineComponent({
-    name: 'OrganizationIdTree',
-    components: { BasicTree },
-
-    emits: ['select'],
-    setup(_, { emit }) {
-      const getTreeRef: any = ref(null);
-      const treeData = ref<TreeItem[]>([]);
-      const selectedKeys = ref<string[]>();
-      const expandedKeys = ref<string[]>();
-      async function fetch() {
-        treeData.value = (await getOrganizationList()) as unknown as TreeItem[];
-      }
+  function resetOrganization() {
+    selectedKeys.value = [];
+  }
 
-      function handleSelect(keys) {
-        emit('select', keys[0]);
-      }
-      function resetOrganization() {
-        selectedKeys.value = [];
-      }
-
-      onMounted(() => {
-        fetch();
-      });
-      return {
-        treeData,
-        handleSelect,
-        resetOrganization,
-        selectedKeys,
-        expandedKeys,
-        getTreeRef,
-      };
-    },
+  onMounted(async () => {
+    treeData.value = (await getOrganizationList()) as unknown as TreeItem[];
+  });
+  defineExpose({
+    resetOrganization,
   });
 </script>

@@ -68,7 +68,7 @@
 </template>
 
 <script lang="ts">
-  import { defineComponent, reactive, ref, nextTick } from 'vue';
+  import { defineComponent, reactive, nextTick } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { PageWrapper } from '/@/components/Page';
   import { useDrawer } from '/@/components/Drawer';
@@ -95,11 +95,6 @@
     },
     setup() {
       const { VITE_GLOB_CONFIGURATION } = getAppEnvConfig();
-      let selectedRowIds = ref<string[]>([]);
-      // 复选框事件
-      const onSelectRowChange = (selectedRowKeys: string[]) => {
-        selectedRowIds.value = selectedRowKeys;
-      };
       const searchInfo = reactive<Recordable>({});
       const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
       // 表格hooks