diff --git a/src/pages/pc/word/EditWordDict.vue b/src/pages/pc/word/EditWordDict.vue
index e6380e50..08a4f6e6 100644
--- a/src/pages/pc/word/EditWordDict.vue
+++ b/src/pages/pc/word/EditWordDict.vue
@@ -1,375 +1,37 @@
 <script setup lang="ts">
 
-import BasePage from "@/pages/pc/components/BasePage.vue";
-import {nextTick, onMounted, reactive} from "vue";
+import {onMounted} from "vue";
 import {useRoute} from "vue-router";
 import {useRuntimeStore} from "@/stores/runtime.ts";
-import {useBaseStore} from "@/stores/base.ts";
-import {assign, cloneDeep, reverse, shuffle} from "lodash-es";
-import {Sort, Word} from "@/types.ts";
-import {nanoid} from "nanoid";
-import BaseIcon from "@/components/BaseIcon.vue";
-import {useNav} from "@/utils";
-import {FormInstance, FormRules} from "element-plus";
-import MiniDialog from "@/pages/pc/components/dialog/MiniDialog.vue";
-import BaseButton from "@/components/BaseButton.vue";
+import {cloneDeep} from "lodash-es";
+import {_checkDictWords} from "@/utils";
 import WordList from "@/pages/pc/components/list/WordList.vue";
-import Empty from "@/components/Empty.vue";
-import {useWindowClick} from "@/hooks/event.ts";
+import {getDefaultDict} from "@/types.ts";
 
 const runtimeStore = useRuntimeStore()
-const store = useBaseStore()
 const route = useRoute()
-
-let show = $ref(false)
-let searchKey = $ref('')
-let list = $computed({
-  get() {
-    if (searchKey) {
-      return runtimeStore.editDict.words.filter(v => v.word.includes(searchKey))
-    }
-    return runtimeStore.editDict.words
-  },
-  set(v) {
-    runtimeStore.editDict.words = v
-  }
-})
+let dict = $ref(getDefaultDict())
 
 onMounted(() => {
   switch (Number(route.query.type)) {
-    case 0:
-      runtimeStore.editDict = cloneDeep(store.collectWord)
-      break
-    case 1:
-      runtimeStore.editDict = cloneDeep(store.wrong)
-      break
-    case 2:
-      runtimeStore.editDict = cloneDeep(store.simple)
-      break
-    case 3:
-      runtimeStore.editDict = cloneDeep(store.master)
-      break
-    default:
-      break
-  }
-})
-const {back} = useNav()
-
-
-let wordFormData = $ref({
-  where: '',
-  type: '',
-  id: '',
-  index: 0
-})
-
-enum FormMode {
-  None = '',
-  Add = 'Add',
-  Edit = 'Edit',
-}
-
-const DefaultFormWord = {
-  word: '',
-  phonetic0: '',
-  phonetic1: '',
-  trans: '',
-}
-let wordForm = $ref(cloneDeep(DefaultFormWord))
-const wordFormRef = $ref<FormInstance>()
-const wordRules = reactive<FormRules>({
-  name: [
-    {required: true, message: '请输入单词', trigger: 'blur'},
-    {max: 30, message: '名称不能超过30个字符', trigger: 'blur'},
-  ],
-})
-
-//TODO trans结构变了，
-async function onSubmitWord() {
-  await wordFormRef.validate((valid, fields) => {
-    if (valid) {
-      let data: any = cloneDeep(wordForm)
-      if (data.trans) {
-        data.trans = data.trans.split('\n');
-      } else {
-        data.trans = []
+    case -1:
+      if (runtimeStore.routeData) {
+        dict = cloneDeep(runtimeStore.routeData)
+        _checkDictWords(dict)
       }
-      if (wordFormData.type === FormMode.Add) {
-        data.id = nanoid(6)
-        data.checked = false
-        let r = list.find(v => v.word === wordForm.word)
-        // if (r) return ElMessage.warning('已有相同名称单词！')
-        // else list.push(data)
-        list.push(data)
-        ElMessage.success('添加成功')
-        wordForm = cloneDeep(DefaultFormWord)
-        // setTimeout(wordListRef?.scrollToBottom, 100)
-      } else {
-        let r = list.find(v => v.id === wordFormData.id)
-        if (r) assign(r, data)
-        r = list.find(v => v.id === wordFormData.id)
-        if (r) assign(r, data)
-        ElMessage.success('修改成功')
-      }
-    } else {
-      ElMessage.warning('请填写完整')
-    }
-  })
-}
-
-function delWord(val: {
-  item: Word
-}) {
-  let rIndex2 = list.findIndex(v => v.id === val.item.id)
-  if (rIndex2 > -1) {
-    list.splice(rIndex2, 1)
+      break
   }
-  if (wordFormData.type === FormMode.Edit && wordForm.word === val.item.word) {
-    closeWordForm()
-  }
-}
-
-function batchDelWord() {
-  console.log('multipleSelection', multipleSelection)
-  multipleSelection.map(v => delWord({item: v}))
-}
-
-function editWord(word: Word,) {
-  wordFormData.type = FormMode.Edit
-  wordFormData.id = word.id
-  wordForm.word = word.word
-  wordForm.phonetic1 = word.phonetic1
-  wordForm.phonetic0 = word.phonetic0
-  wordForm.trans = word.trans.join('\n')
-}
-
-function addWord() {
-  // setTimeout(wordListRef?.scrollToBottom, 100)
-  wordFormData.type = FormMode.Add
-  wordForm = cloneDeep(DefaultFormWord)
-}
-
-function closeWordForm() {
-  wordFormData.type = FormMode.None
-  wordForm = cloneDeep(DefaultFormWord)
-}
-
-
-let multipleSelection = $ref<any[]>([])
-const handleSelectionChange = (val: any[]) => {
-  multipleSelection = val
-}
-
-function sort(type: Sort) {
-  if (type === Sort.reverse) {
-    ElMessage.success('已翻转排序')
-    list = reverse(cloneDeep(list))
-  }
-  if (type === Sort.random) {
-    ElMessage.success('已随机排序')
-    list = shuffle(cloneDeep(list))
-  }
-}
-
-
-let checkedAll = $ref(false)
-let isIndeterminate = $ref(false)
-
-
-function handleCheckedAll() {
-  list.map(v => v.checked = checkedAll)
-}
-
-let checkedTotal = $computed(() => {
-  return list.filter(v => v.checked).length
 })
 
-function handleCheckedChange({item: source}: any) {
-  source.checked = !source.checked
-  checkStatus()
-}
-
-function checkStatus() {
-  checkedAll = list.every(v => v.checked)
-  if (checkedAll) {
-    isIndeterminate = false
-  } else {
-    isIndeterminate = list.some(v => v.checked)
-  }
-}
-
-function del(val: { item: Word, index: number }) {
-  list.splice(val.index, 1)
-}
-
-let listRef: any = $ref()
-
-function scrollToBottom() {
-  listRef.scrollToBottom()
-}
-
-function scrollToItem(index: number) {
-  nextTick(() => listRef.scrollToItem(index))
-}
-
-defineExpose({scrollToBottom, scrollToItem})
-
-useWindowClick(() => show = false)
-
 </script>
 
 <template>
-  <BasePage>
-    <header class="flex gap-4 items-center">
-      <BaseIcon @click="back" icon="octicon:arrow-left-24" width="20"/>
-      <div class="left">
-        <div class="top">
-          <div class="text-xl">
-            {{ runtimeStore.editDict.name }}
-          </div>
-        </div>
-        <div class="desc" v-if="runtimeStore.editDict.description">{{ runtimeStore.editDict.description }}</div>
-      </div>
-    </header>
-    <div class="flex">
-      <div class="w-1/2">
-        <div class="flex justify-end py-5 gap-2 relative">
-          <el-input v-model="searchKey"/>
-          <BaseIcon
-              v-if="multipleSelection.length"
-              @click="batchDelWord"
-              class="del"
-              title="删除"
-              icon="solar:trash-bin-minimalistic-linear"/>
-          <BaseIcon
-              @click="addWord"
-              icon="fluent:add-20-filled"
-              title="添加单词"/>
-          <BaseIcon
-              title="改变顺序"
-              icon="icon-park-outline:sort-two"
-              @click="show = !show"
-          />
-          <MiniDialog
-              v-model="show"
-              style="width: 8rem;"
-          >
-            <div class="mini-row-title">
-              列表循环设置
-            </div>
-            <div class="mini-row">
-              <BaseButton size="small" @click="sort(Sort.reverse)">翻转</BaseButton>
-              <BaseButton size="small" @click="sort(Sort.random)">随机</BaseButton>
-            </div>
-          </MiniDialog>
-        </div>
-        <div class="column">
-          <div class="header">
-            <div class="common-title">
-              <div class="options">
-                <div class="setting"
-                     v-if="list.length"
-                     @click.stop="null">
-                  <BaseIcon
-                      title="改变顺序"
-                      icon="icon-park-outline:sort-two"
-                      @click="show = !show"
-                  />
-                  <MiniDialog
-                      v-model="show"
-                      style="width: 130rem;"
-                  >
-                    <div class="mini-row-title">
-                      列表循环设置
-                    </div>
-                    <div class="mini-row">
-                      <BaseButton size="small" @click="sort(Sort.reverse)">翻转</BaseButton>
-                      <BaseButton size="small" @click="sort(Sort.random)">随机</BaseButton>
-                    </div>
-                  </MiniDialog>
-                </div>
-                <BaseIcon
-                    @click="addWord"
-                    icon="fluent:add-20-filled"
-                    title="添加单词"/>
-              </div>
-            </div>
-            <div class="select"
-                 v-if="list.length "
-            >
-              <div class="left">
-                <el-checkbox
-                    v-model="checkedAll"
-                    :indeterminate="isIndeterminate"
-                    @change="handleCheckedAll"
-                    size="large"/>
-                <span>全选</span>
-              </div>
-              <div class="right">{{ checkedTotal }}/{{ list.length }}</div>
-            </div>
-          </div>
-          <div class="wrapper">
-            <WordList
-                ref="listRef"
-                :list="list"
-                v-if="list.length"
-                @click="handleCheckedChange"
-            >
-              <template v-slot:prefix="{item}">
-                <el-checkbox v-model="item.checked"
-                             @change="handleCheckedChange({item})"
-                             size="large"/>
-              </template>
-              <template v-slot:suffix="{item,index}">
-                <BaseIcon
-                    class="del"
-                    @click="editWord(item)"
-                    title="编辑"
-                    icon="tabler:edit"/>
-                <BaseIcon
-                    class="del"
-                    @click="del({item,index})"
-                    title="删除"
-                    icon="solar:trash-bin-minimalistic-linear"/>
-              </template>
-            </WordList>
-            <Empty v-else/>
-          </div>
-        </div>
-      </div>
-      <div class="add w-1/2" v-if="wordFormData.type">
-        <div class="common-title">
-          {{ wordFormData.type === FormMode.Add ? '添加' : '修改' }}单词
-        </div>
-        <el-form
-            class="form"
-            ref="wordFormRef"
-            :rules="wordRules"
-            :model="wordForm"
-            label-width="6rem">
-          <el-form-item label="单词" prop="word">
-            <el-input v-model="wordForm.word"/>
-          </el-form-item>
-          <el-form-item label="翻译">
-            <el-input v-model="wordForm.trans"
-                      placeholder="多个翻译请换行"
-                      :autosize="{ minRows: 2, maxRows: 6 }"
-                      type="textarea"/>
-          </el-form-item>
-          <el-form-item label="音标/发音①">
-            <el-input v-model="wordForm.phonetic0"/>
-          </el-form-item>
-          <el-form-item label="音标/发音②">
-            <el-input v-model="wordForm.phonetic1"/>
-          </el-form-item>
-          <div class="flex-center">
-            <el-button @click="closeWordForm">关闭</el-button>
-            <el-button type="primary" @click="onSubmitWord">保存</el-button>
-          </div>
-        </el-form>
-      </div>
-    </div>
-  </BasePage>
+  <WordList
+      ref="listRef"
+      :list="dict.words"
+      v-if="dict.words?.length"
+  >
+  </WordList>
 </template>
 
 <style scoped lang="scss">
diff --git a/src/pages/pc/word/EditWordDict_two.vue b/src/pages/pc/word/EditWordDict_two.vue
index e6380e50..e68a6551 100644
--- a/src/pages/pc/word/EditWordDict_two.vue
+++ b/src/pages/pc/word/EditWordDict_two.vue
@@ -9,7 +9,7 @@ import {assign, cloneDeep, reverse, shuffle} from "lodash-es";
 import {Sort, Word} from "@/types.ts";
 import {nanoid} from "nanoid";
 import BaseIcon from "@/components/BaseIcon.vue";
-import {useNav} from "@/utils";
+import {_checkDictWords, useNav} from "@/utils";
 import {FormInstance, FormRules} from "element-plus";
 import MiniDialog from "@/pages/pc/components/dialog/MiniDialog.vue";
 import BaseButton from "@/components/BaseButton.vue";
@@ -37,6 +37,10 @@ let list = $computed({
 
 onMounted(() => {
   switch (Number(route.query.type)) {
+    case -1:
+      runtimeStore.editDict = cloneDeep(runtimeStore.routeData)
+      _checkDictWords(runtimeStore.editDict)
+      break
     case 0:
       runtimeStore.editDict = cloneDeep(store.collectWord)
       break
@@ -263,78 +267,46 @@ useWindowClick(() => show = false)
             </div>
           </MiniDialog>
         </div>
-        <div class="column">
-          <div class="header">
-            <div class="common-title">
-              <div class="options">
-                <div class="setting"
-                     v-if="list.length"
-                     @click.stop="null">
-                  <BaseIcon
-                      title="改变顺序"
-                      icon="icon-park-outline:sort-two"
-                      @click="show = !show"
-                  />
-                  <MiniDialog
-                      v-model="show"
-                      style="width: 130rem;"
-                  >
-                    <div class="mini-row-title">
-                      列表循环设置
-                    </div>
-                    <div class="mini-row">
-                      <BaseButton size="small" @click="sort(Sort.reverse)">翻转</BaseButton>
-                      <BaseButton size="small" @click="sort(Sort.random)">随机</BaseButton>
-                    </div>
-                  </MiniDialog>
-                </div>
-                <BaseIcon
-                    @click="addWord"
-                    icon="fluent:add-20-filled"
-                    title="添加单词"/>
-              </div>
-            </div>
-            <div class="select"
-                 v-if="list.length "
-            >
-              <div class="left">
-                <el-checkbox
-                    v-model="checkedAll"
-                    :indeterminate="isIndeterminate"
-                    @change="handleCheckedAll"
-                    size="large"/>
-                <span>全选</span>
-              </div>
-              <div class="right">{{ checkedTotal }}/{{ list.length }}</div>
-            </div>
-          </div>
-          <div class="wrapper">
-            <WordList
-                ref="listRef"
-                :list="list"
-                v-if="list.length"
-                @click="handleCheckedChange"
-            >
-              <template v-slot:prefix="{item}">
-                <el-checkbox v-model="item.checked"
-                             @change="handleCheckedChange({item})"
-                             size="large"/>
-              </template>
-              <template v-slot:suffix="{item,index}">
-                <BaseIcon
-                    class="del"
-                    @click="editWord(item)"
-                    title="编辑"
-                    icon="tabler:edit"/>
-                <BaseIcon
-                    class="del"
-                    @click="del({item,index})"
-                    title="删除"
-                    icon="solar:trash-bin-minimalistic-linear"/>
-              </template>
-            </WordList>
-            <Empty v-else/>
+        <div class="flex justify-between"
+             v-if="list.length "
+        >
+          <div class="left">
+            <el-checkbox
+                v-model="checkedAll"
+                :indeterminate="isIndeterminate"
+                @change="handleCheckedAll"
+                size="large"/>
+            <span>全选</span>
           </div>
+          <div class="right">{{ checkedTotal }}/{{ list.length }}</div>
+        </div>
+
+        <div class="wrapper h-100 overflow-auto">
+          <WordList
+              ref="listRef"
+              :list="list"
+              v-if="list.length"
+              @click="handleCheckedChange"
+          >
+            <template v-slot:prefix="{item}">
+              <el-checkbox v-model="item.checked"
+                           @change="handleCheckedChange({item})"
+                           size="large"/>
+            </template>
+            <template v-slot:suffix="{item,index}">
+              <BaseIcon
+                  class="del"
+                  @click="editWord(item)"
+                  title="编辑"
+                  icon="tabler:edit"/>
+              <BaseIcon
+                  class="del"
+                  @click="del({item,index})"
+                  title="删除"
+                  icon="solar:trash-bin-minimalistic-linear"/>
+            </template>
+          </WordList>
+          <Empty v-else/>
         </div>
       </div>
       <div class="add w-1/2" v-if="wordFormData.type">
diff --git a/src/types.ts b/src/types.ts
index 8f62a1d9..ed1e3ea3 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -280,11 +280,6 @@ export interface ArticleItem {
   index: number
 }
 
-export interface WordItem {
-  item: Article,
-  index: number
-}
-
 export const SlideType = {
   HORIZONTAL: 0,
   VERTICAL: 1,
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 4a5812df..4f71790f 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -188,6 +188,7 @@ export async function _checkDictWords(dict: Dict) {
           s.id = nanoid(6)
         })
         dict.words = Object.freeze(v)
+        // dict.words = v
       }
     }
   }