fix(schema-form): move setDefaultValue out of onMouted

buqiyuan · Apr 5, 2024 · 63721b3 · 63721b3
1 parent da782b0
commit 63721b3
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 38 deletions.
diff --git a/src/components/core/schema-form/src/schema-form.vue b/src/components/core/schema-form/src/schema-form.vue
@@ -38,7 +38,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { useAttrs, onMounted } from 'vue';
+  import { useAttrs } from 'vue';
   import { pick } from 'lodash-es';
   import { Form, Row } from 'ant-design-vue';
   import SchemaFormItem from './schema-form-item.vue';
@@ -99,8 +99,6 @@
 
   defineExpose(instance);
 
-  onMounted(() => {
-    // 初始化表单默认值
-    setDefaultValue(formSchemasRef.value);
-  });
+  // 初始化表单默认值
+  setDefaultValue(formSchemasRef.value);
 </script>
diff --git a/src/views/system/dict-type/index.vue b/src/views/system/dict-type/index.vue
@@ -1,34 +1,32 @@
 <template>
-  <div>
-    <DynamicTable
-      row-key="id"
-      header-title="字典管理"
-      :data-request="Api.systemDictType.dictTypeList"
-      :columns="columns"
-      bordered
-      size="small"
-      @expand="handleExpand"
-    >
-      <template #toolbar>
-        <a-button
-          type="primary"
-          :disabled="!$auth('system:dict-type:create')"
-          @click="openMenuModal({})"
-        >
-          新增
-        </a-button>
-      </template>
-      <template v-if="$router.hasRoute(dictItemRouteName)" #expandedRowRender="{ record }">
-        <a-table
-          size="small"
-          :columns="dictItemColumns"
-          :loading="expandedRowLoding[record.id]"
-          :data-source="expandedRowData[record.id]"
-          :pagination="false"
-        />
-      </template>
-    </DynamicTable>
-  </div>
+  <DynamicTable
+    row-key="id"
+    header-title="字典管理"
+    :data-request="Api.systemDictType.dictTypeList"
+    :columns="columns"
+    bordered
+    size="small"
+    @expand="handleExpand"
+  >
+    <template #toolbar>
+      <a-button
+        type="primary"
+        :disabled="!$auth('system:dict-type:create')"
+        @click="openMenuModal({})"
+      >
+        新增
+      </a-button>
+    </template>
+    <template v-if="$router.hasRoute(dictItemRouteName)" #expandedRowRender="{ record }">
+      <a-table
+        size="small"
+        :columns="dictItemColumns"
+        :loading="expandedRowLoading[record.id]"
+        :data-source="expandedRowData[record.id]"
+        :pagination="false"
+      />
+    </template>
+  </DynamicTable>
 </template>
 
 <script lang="ts" setup>
@@ -51,7 +49,7 @@
   });
 
   const expandedRowData = ref<Recordable<any[]>>({});
-  const expandedRowLoding = ref<Recordable<boolean>>({});
+  const expandedRowLoading = ref<Recordable<boolean>>({});
 
   const [DynamicTable, dynamicTableInstance] = useTable({
     formProps: {
@@ -127,10 +125,10 @@
   const handleExpand = async (expanded, record) => {
     const typeId = record.id;
     if (expanded) {
-      expandedRowLoding.value[typeId] = true;
+      expandedRowLoading.value[typeId] = true;
       const { items = [] } = await Api.systemDictItem
         .dictItemList({ typeId })
-        .finally(() => (expandedRowLoding.value[typeId] = false));
+        .finally(() => (expandedRowLoading.value[typeId] = false));
       expandedRowData.value[typeId] = items;
     }
   };