From 64f9039dd677da4e36d80aa11234c2224b12a8b1 Mon Sep 17 00:00:00 2001
From: ktianc <ktianc2000@163.com>
Date: Sat, 22 Apr 2023 19:25:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0=EF=BC=9A?=
 =?UTF-8?q?=201.=20=E4=BF=AE=E5=A4=8D=EF=BC=9Amongo=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=AE=B5=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=202.=20=E6=9B=B4=E6=96=B0=EF=BC=9Avue-elemen?=
 =?UTF-8?q?t-plus-admin=20=E6=A1=86=E6=9E=B6=E6=9B=B4=E6=96=B0=E5=88=B0?=
 =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=AC1.9.9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kinit-admin/package.json                      | 70 +++++++++----------
 .../components/Breadcrumb/src/Breadcrumb.vue  |  4 +-
 .../Descriptions/src/Descriptions.vue         |  2 +-
 .../src/components/Editor/src/Editor.vue      |  2 +-
 kinit-admin/src/hooks/web/useCrudSchemas.ts   |  4 +-
 kinit-admin/src/layout/components/AppView.vue |  7 +-
 .../src/layout/components/useRenderLayout.tsx |  4 +-
 kinit-admin/src/utils/routerHelper.ts         |  2 +-
 kinit-api/application/settings.py             |  2 +-
 kinit-api/core/mongo/mongo_manage.py          |  2 +-
 10 files changed, 52 insertions(+), 47 deletions(-)

diff --git a/kinit-admin/package.json b/kinit-admin/package.json
index e1c5c25..e09d537 100644
--- a/kinit-admin/package.json
+++ b/kinit-admin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-element-plus-admin",
-  "version": "1.9.4",
+  "version": "1.9.9",
   "description": "一套基于vue3、element-plus、typesScript、vite4的后台集成方案。",
   "author": "Archer <502431556@qq.com>",
   "private": false,
@@ -32,19 +32,19 @@
     "@wangeditor/editor-for-vue": "^5.1.10",
     "@zxcvbn-ts/core": "^2.2.1",
     "animate.css": "^4.1.1",
-    "axios": "^1.3.4",
-    "echarts": "^5.4.1",
+    "axios": "^1.3.5",
+    "echarts": "^5.4.2",
     "echarts-wordcloud": "^2.1.0",
-    "element-plus": "2.2.32",
-    "intro.js": "^6.0.0",
+    "element-plus": "2.3.3",
+    "intro.js": "^7.0.1",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.0",
     "mockjs": "^1.1.0",
     "moment": "^2.29.4",
     "nprogress": "^0.2.0",
-    "pinia": "^2.0.32",
+    "pinia": "^2.0.34",
     "qrcode": "^1.5.1",
-    "qs": "^6.11.0",
+    "qs": "^6.11.1",
     "url": "^0.11.0",
     "vue": "3.2.47",
     "vue-i18n": "9.2.2",
@@ -55,52 +55,52 @@
     "web-storage-cache": "^1.1.1"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.4.4",
+    "@commitlint/cli": "^17.5.1",
     "@commitlint/config-conventional": "^17.4.4",
-    "@iconify/json": "^2.2.29",
-    "@intlify/unplugin-vue-i18n": "^0.8.2",
+    "@iconify/json": "^2.2.48",
+    "@intlify/unplugin-vue-i18n": "^0.10.0",
     "@purge-icons/generated": "^0.9.0",
     "@types/intro.js": "^5.1.1",
-    "@types/lodash-es": "^4.17.6",
-    "@types/node": "^18.14.2",
+    "@types/lodash-es": "^4.17.7",
+    "@types/node": "^18.15.11",
     "@types/nprogress": "^0.2.0",
     "@types/qrcode": "^1.5.0",
     "@types/qs": "^6.9.7",
-    "@typescript-eslint/eslint-plugin": "^5.54.0",
-    "@typescript-eslint/parser": "^5.54.0",
-    "@vitejs/plugin-legacy": "^4.0.1",
-    "@vitejs/plugin-vue": "^4.0.0",
-    "@vitejs/plugin-vue-jsx": "^3.0.0",
-    "autoprefixer": "^10.4.13",
-    "consola": "^2.15.3",
-    "eslint": "^8.35.0",
-    "eslint-config-prettier": "^8.6.0",
-    "eslint-define-config": "^1.15.0",
+    "@typescript-eslint/eslint-plugin": "^5.58.0",
+    "@typescript-eslint/parser": "^5.58.0",
+    "@vitejs/plugin-legacy": "^4.0.2",
+    "@vitejs/plugin-vue": "^4.1.0",
+    "@vitejs/plugin-vue-jsx": "^3.0.1",
+    "autoprefixer": "^10.4.14",
+    "consola": "^3.0.1",
+    "eslint": "^8.38.0",
+    "eslint-config-prettier": "^8.8.0",
+    "eslint-define-config": "^1.17.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-vue": "^9.9.0",
+    "eslint-plugin-vue": "^9.10.0",
     "husky": "^8.0.3",
     "less": "^4.1.3",
-    "lint-staged": "^13.1.2",
+    "lint-staged": "^13.2.1",
     "plop": "^3.1.2",
     "postcss": "^8.4.21",
     "postcss-html": "^1.5.0",
     "postcss-less": "^6.0.0",
-    "prettier": "^2.8.4",
-    "rimraf": "^4.1.2",
-    "rollup": "^3.17.3",
-    "stylelint": "^15.2.0",
+    "prettier": "^2.8.7",
+    "rimraf": "^5.0.0",
+    "rollup": "^3.20.2",
+    "stylelint": "^15.4.0",
     "stylelint-config-html": "^1.1.0",
     "stylelint-config-prettier": "^9.0.5",
-    "stylelint-config-recommended": "^10.0.1",
-    "stylelint-config-standard": "^30.0.1",
-    "stylelint-order": "^6.0.2",
-    "terser": "^5.16.5",
-    "typescript": "4.9.5",
-    "vite": "4.1.4",
+    "stylelint-config-recommended": "^11.0.0",
+    "stylelint-config-standard": "^32.0.0",
+    "stylelint-order": "^6.0.3",
+    "terser": "^5.16.9",
+    "typescript": "5.0.4",
+    "vite": "4.2.1",
     "vite-plugin-ejs": "^1.6.4",
     "vite-plugin-eslint": "^1.8.1",
     "vite-plugin-mock": "^2.9.6",
-    "vite-plugin-progress": "^0.0.6",
+    "vite-plugin-progress": "^0.0.7",
     "vite-plugin-purge-icons": "^0.9.2",
     "vite-plugin-style-import": "2.0.0",
     "vite-plugin-svg-icons": "^2.0.1",
diff --git a/kinit-admin/src/components/Breadcrumb/src/Breadcrumb.vue b/kinit-admin/src/components/Breadcrumb/src/Breadcrumb.vue
index bbbbc19..831fc6e 100644
--- a/kinit-admin/src/components/Breadcrumb/src/Breadcrumb.vue
+++ b/kinit-admin/src/components/Breadcrumb/src/Breadcrumb.vue
@@ -37,7 +37,7 @@ export default defineComponent({
     })
 
     const getBreadcrumb = () => {
-      const currentPath = currentRoute.value.path
+      const currentPath = currentRoute.value.matched.slice(-1)[0].path
 
       levelList.value = filter<AppRouteRecordRaw>(unref(menuRouters), (node: AppRouteRecordRaw) => {
         return node.path === currentPath
@@ -47,7 +47,7 @@ export default defineComponent({
     const renderBreadcrumb = () => {
       const breadcrumbList = treeToList<AppRouteRecordRaw[]>(unref(levelList))
       return breadcrumbList.map((v) => {
-        const disabled = v.redirect === 'noredirect'
+        const disabled = !v.redirect || v.redirect === 'noredirect'
         const meta = v.meta as RouteMeta
         return (
           <ElBreadcrumbItem to={{ path: disabled ? '' : v.path }} key={v.name}>
diff --git a/kinit-admin/src/components/Descriptions/src/Descriptions.vue b/kinit-admin/src/components/Descriptions/src/Descriptions.vue
index 4b70992..8b0455e 100644
--- a/kinit-admin/src/components/Descriptions/src/Descriptions.vue
+++ b/kinit-admin/src/components/Descriptions/src/Descriptions.vue
@@ -75,7 +75,7 @@ const toggleClick = () => {
       v-if="title"
       :class="[
         `${prefixCls}-header`,
-        'h-50px flex justify-between items-center mb-10px border-bottom-1 border-solid border-[var(--tags-view-border-color)] px-10px cursor-pointer dark:border-[var(--el-border-color)]'
+        'h-50px flex justify-between items-center border-bottom-1 border-solid border-[var(--tags-view-border-color)] px-10px cursor-pointer dark:border-[var(--el-border-color)]'
       ]"
       @click="toggleClick"
     >
diff --git a/kinit-admin/src/components/Editor/src/Editor.vue b/kinit-admin/src/components/Editor/src/Editor.vue
index f45b096..5f73164 100644
--- a/kinit-admin/src/components/Editor/src/Editor.vue
+++ b/kinit-admin/src/components/Editor/src/Editor.vue
@@ -116,7 +116,7 @@ defineExpose({
 </script>
 
 <template>
-  <div class="border-1 border-solid border-[var(--tags-view-border-color)] z-3000">
+  <div class="border-1 border-solid border-[var(--tags-view-border-color)] z-99">
     <!-- 工具栏 -->
     <Toolbar
       :editor="editorRef"
diff --git a/kinit-admin/src/hooks/web/useCrudSchemas.ts b/kinit-admin/src/hooks/web/useCrudSchemas.ts
index 5acf078..e5ca399 100644
--- a/kinit-admin/src/hooks/web/useCrudSchemas.ts
+++ b/kinit-admin/src/hooks/web/useCrudSchemas.ts
@@ -23,6 +23,8 @@ type CrudSearchParams = {
   dictName?: string
   // 接口
   api?: () => Promise<any>
+  // 搜索字段
+  field?: string
 } & Omit<FormSchema, 'field'>
 
 type CrudTableParams = {
@@ -101,7 +103,7 @@ const filterSearchSchema = (crudSchema: CrudSchema[], allSchemas: AllSchemas): F
         component: schemaItem.search.component || 'Input',
         componentProps: {},
         ...schemaItem.search,
-        field: schemaItem.field,
+        field: schemaItem?.search?.field || schemaItem.field,
         label: schemaItem.search?.label || schemaItem.label
       }
 
diff --git a/kinit-admin/src/layout/components/AppView.vue b/kinit-admin/src/layout/components/AppView.vue
index ace76b6..a189234 100644
--- a/kinit-admin/src/layout/components/AppView.vue
+++ b/kinit-admin/src/layout/components/AppView.vue
@@ -25,10 +25,11 @@ const getCaches = computed((): string[] => {
       'p-[var(--app-content-padding)] w-[100%] bg-[var(--app-content-bg-color)] dark:bg-[var(--el-bg-color)]',
       {
         '!min-h-[calc(100%-var(--app-footer-height))]':
-          fixedHeader && (layout === 'classic' || layout === 'topLeft') && footer,
+          ((fixedHeader && (layout === 'classic' || layout === 'topLeft')) || layout === 'top') &&
+          footer,
 
         '!min-h-[calc(100%-var(--tags-view-height)-var(--top-tool-height)-var(--app-footer-height))]':
-          ((!fixedHeader && layout === 'classic') || layout === 'top') && footer,
+          !fixedHeader && layout === 'classic' && footer,
 
         '!min-h-[calc(100%-var(--tags-view-height)-var(--app-footer-height))]':
           !fixedHeader && layout === 'topLeft' && footer,
@@ -36,7 +37,7 @@ const getCaches = computed((): string[] => {
         '!min-h-[calc(100%-var(--top-tool-height))]': fixedHeader && layout === 'cutMenu' && footer,
 
         '!min-h-[calc(100%-var(--top-tool-height)-var(--tags-view-height))]':
-          !fixedHeader && layout === 'cutMenu' && footer
+          !fixedHeader && (layout === 'topLeft' || layout === 'top') && footer
       }
     ]"
   >
diff --git a/kinit-admin/src/layout/components/useRenderLayout.tsx b/kinit-admin/src/layout/components/useRenderLayout.tsx
index d388d5f..e3e4676 100644
--- a/kinit-admin/src/layout/components/useRenderLayout.tsx
+++ b/kinit-admin/src/layout/components/useRenderLayout.tsx
@@ -177,7 +177,9 @@ export const useRenderLayout = () => {
             class={[
               `${prefixCls}-content-scrollbar`,
               {
-                'mt-[var(--tags-view-height)]': fixedHeader.value
+                'mt-[var(--tags-view-height)] !pb-[calc(var(--tags-view-height)+var(--app-footer-height))]':
+                  fixedHeader.value,
+                'pb-[var(--app-footer-height)]': !fixedHeader.value
               }
             ]}
           >
diff --git a/kinit-admin/src/utils/routerHelper.ts b/kinit-admin/src/utils/routerHelper.ts
index bc80677..b49377d 100644
--- a/kinit-admin/src/utils/routerHelper.ts
+++ b/kinit-admin/src/utils/routerHelper.ts
@@ -70,7 +70,7 @@ export const generateRoutesFn1 = (
       if (isUrl(item) && (onlyOneChild === item || route.path === item)) {
         data = Object.assign({}, route)
       } else {
-        const routePath = pathResolve(basePath, onlyOneChild || route.path)
+        const routePath = onlyOneChild ?? pathResolve(basePath, route.path)
         if (routePath === item || meta.followRoute === item) {
           data = Object.assign({}, route)
         }
diff --git a/kinit-api/application/settings.py b/kinit-api/application/settings.py
index a6f8c2b..61e0a7a 100644
--- a/kinit-api/application/settings.py
+++ b/kinit-api/application/settings.py
@@ -11,7 +11,7 @@ from fastapi.security import OAuth2PasswordBearer
 """
 系统版本
 """
-VERSION = "1.7.4"
+VERSION = "1.7.6"
 
 """安全警告: 不要在生产中打开调试运行!"""
 DEBUG = True
diff --git a/kinit-api/core/mongo/mongo_manage.py b/kinit-api/core/mongo/mongo_manage.py
index 1201ee0..38bbc13 100644
--- a/kinit-api/core/mongo/mongo_manage.py
+++ b/kinit-api/core/mongo/mongo_manage.py
@@ -76,7 +76,7 @@ class MongoManage(DatabaseManage):
                 if v[0] == "like" and v[1]:
                     params[k] = {'$regex': v[1]}
                 elif v[0] == "between" and len(v[1]) == 2:
-                    params[k] = {'$gte': v[1][0], '$lt': v[1][0]}
+                    params[k] = {'$gte': f"{v[1][0]} 00:00:00", '$lt': f"{v[1][1]} 23:59:59"}
             else:
                 params[k] = v
         return params