update

star7th · Jun 27, 2023 · 5db2b0a · 5db2b0a
1 parent f6e9f16
commit 5db2b0a
Show file tree

Hide file tree

Showing 21 changed files with 1,535 additions and 583 deletions.
diff --git a/favicon.ico b/favicon.ico
diff --git a/server/Application/Api/Model/UpdateModel.class.php b/server/Application/Api/Model/UpdateModel.class.php
@@ -16,7 +16,7 @@ class UpdateModel
     //检测数据库并更新
     public function checkDb()
     {
-        $version_num = 17;
+        $version_num = 18;
         $db_version_num = D("Options")->get("db_version_num");
         if (!$db_version_num || $db_version_num < $version_num) {
             $r = $this->updateSqlite();
@@ -528,6 +528,14 @@ public function updateSqlite()
             D("page")->execute($sql);
         }
 
+        // 设置自增id从 10000000 开始
+        $randomNumber1 = mt_rand(100000000, 299999999);
+        $randomNumber2 = mt_rand(400000000, 499999999);
+        $randomNumber3 = mt_rand(600000000, 699999999);
+        D("page")->execute("INSERT INTO sqlite_sequence (name, seq) VALUES ('page', {$randomNumber1})");
+        D("page")->execute("INSERT INTO sqlite_sequence (name, seq) VALUES ('catalog', {$randomNumber2})");
+        D("page")->execute("INSERT INTO sqlite_sequence (name, seq) VALUES ('item', {$randomNumber3})");
+
         //留个注释提醒自己，如果更新数据库结构，务必更改checkDb()里面的$version_num
         //留个注释提醒自己，如果更新数据库结构，务必更改checkDb()里面的$version_num
         //留个注释提醒自己，如果更新数据库结构，务必更改checkDb()里面的$version_num

diff --git a/web_src/src/assets/lang/en.js b/web_src/src/assets/lang/en.js
@@ -597,5 +597,13 @@ exports.default = {
 
   ai_assistant: 'Ai assistant',
 
-  create: 'Create'
+  create: 'Create',
+
+  search_keyword: 'Please enter search keywords',
+
+  add_sub_page: 'Add Page',
+  add_sub_cat: 'Add Sub Folder',
+  add_si_bling_cat: 'Add Peer Folder',
+  edt_cat: 'Edit Folder',
+  clone_move: 'Clone/Move'
 }
diff --git a/web_src/src/assets/lang/zh-CN.js b/web_src/src/assets/lang/zh-CN.js
@@ -567,5 +567,13 @@ exports.default = {
 
   ai_assistant: 'AI助手生成',
 
-  create: '创建'
+  create: '创建',
+
+  search_keyword: '请输入搜索关键词',
+
+  add_sub_page: '添加页面',
+  add_sub_cat: '添加子文件夹',
+  add_si_bling_cat: '添加同级文件夹',
+  edt_cat: '编辑文件夹',
+  clone_move: '克隆/移动'
 }
diff --git a/web_src/src/components/catalog/Index.vue b/web_src/src/components/catalog/Index.vue
@@ -27,42 +27,64 @@
           draggable
         >
           <span class="custom-tree-node" slot-scope="{ node, data }">
-            <span>{{ node.label }}</span>
+            <i class="mr-2 fas fa-folder"></i><span>{{ node.label }}</span>
             <span class="right-bar">
-              <el-button
-                type="text"
-                size="mini"
-                :title="$t('edit')"
-                class="el-icon-edit-outline"
-                @click.stop="edit(node, data)"
-              ></el-button>
-              <el-button
-                type="text"
-                size="mini"
-                class="el-icon-plus"
-                :title="$t('add_cat')"
-                @click.stop="addCat(node, data)"
-              ></el-button>
-              <el-button
-                type="text"
-                size="mini"
-                class="el-icon-document"
-                :title="$t('sort_pages')"
-                @click.stop="showSortPage(node, data)"
-              ></el-button>
-              <el-button
-                type="text"
-                size="mini"
-                class="el-icon-copy-document"
-                :title="$t('copy_or_mv_cat')"
-                @click.stop="copyCat(node, data)"
-              ></el-button>
-              <el-button
-                type="text"
-                size="mini"
-                class="el-icon-delete"
-                @click.stop="deleteCat(node, data)"
-              ></el-button>
+              <el-tooltip effect="dark" :content="$t('edit')" placement="top">
+                <el-button
+                  type="text"
+                  size="mini"
+                  :title="$t('edit')"
+                  class="el-icon-edit-outline"
+                  @click.stop="edit(node, data)"
+                ></el-button>
+              </el-tooltip>
+              <el-tooltip
+                effect="dark"
+                :content="$t('add_cat')"
+                placement="top"
+              >
+                <el-button
+                  type="text"
+                  size="mini"
+                  class="el-icon-plus"
+                  :title="$t('add_cat')"
+                  @click.stop="addCat(node, data)"
+                ></el-button>
+              </el-tooltip>
+              <el-tooltip
+                effect="dark"
+                :content="$t('sort_pages')"
+                placement="top"
+              >
+                <el-button
+                  type="text"
+                  size="mini"
+                  class="el-icon-document"
+                  :title="$t('sort_pages')"
+                  @click.stop="showSortPage(node, data)"
+                ></el-button>
+              </el-tooltip>
+              <el-tooltip
+                effect="dark"
+                :content="$t('copy_or_mv_cat')"
+                placement="top"
+              >
+                <el-button
+                  type="text"
+                  size="mini"
+                  class="el-icon-copy-document"
+                  :title="$t('copy_or_mv_cat')"
+                  @click.stop="copyCat(node, data)"
+                ></el-button>
+              </el-tooltip>
+              <el-tooltip effect="dark" :content="$t('delete')" placement="top">
+                <el-button
+                  type="text"
+                  size="mini"
+                  class="el-icon-delete"
+                  @click.stop="deleteCat(node, data)"
+                ></el-button>
+              </el-tooltip>
             </span>
           </span>
         </el-tree>

diff --git a/web_src/src/components/common/ContextmenuModal/index.js b/web_src/src/components/common/ContextmenuModal/index.js
@@ -0,0 +1,31 @@
+import ContextmenuModal from './index.vue'
+import Vue from 'vue'
+
+export default function({ x = 0, y = 0, list = [] }) {
+  const mountNode = document.createElement('div')
+  const randomString = Math.random()
+    .toString(36)
+    .substring(2)
+  mountNode.id = randomString
+  document.body.appendChild(mountNode)
+  const mountNode2 = document.createElement('div')
+  mountNode.appendChild(mountNode2)
+  const el = new Vue({
+    render: h =>
+      h(ContextmenuModal, {
+        props: {
+          x,
+          y,
+          list,
+          onCancel: () => {
+            el.$destroy()
+            var element = document.getElementById(randomString) // Get the element by its ID
+            if (element) {
+              element.parentNode.removeChild(element) // Remove the element from its parent node
+            }
+          }
+        }
+      })
+  })
+  el.$mount(mountNode2)
+}