From 2e4d853e1bd5e92931d55ad8a04cf409bf9f796a Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Wed, 11 Jan 2023 18:04:28 +0800
Subject: [PATCH 1/8] =?UTF-8?q?update:=20=E4=BC=98=E5=8C=96config=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tsconfig.json  | 6 +++++-
 vite.config.ts | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tsconfig.json b/tsconfig.json
index 8e66e706..ca353357 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -16,7 +16,11 @@
     "allowJs": true,
     "baseUrl": "./",
     "paths": {
-      "@/*": ["./src/*"]
+      "@/*": ["./src/*"],
+      "components/*": ["./src/components/*"],
+      "layouts/*": ["./src/layouts/*"],
+      "store/*": ["./src/store/*"],
+      "style/*": ["./src/style/*"],
     },
     "types": ["ant-design-vue/typings/global"],
     "suppressImplicitAnyIndexErrors": true
diff --git a/vite.config.ts b/vite.config.ts
index 939b1029..370a0e21 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -20,7 +20,7 @@ export default defineConfig(({ mode}) => {
       resolve: {
           alias: {
               '@': path.resolve(__dirname, 'src'),
-              'styles': path.resolve(__dirname, 'src/style'),
+              'style': path.resolve(__dirname, 'src/style'),
               'layouts': path.resolve(__dirname, 'src/layouts'),
               'components': path.resolve(__dirname, 'src/components'),
               'store': path.resolve(__dirname, 'src/store'),

From ec79fa066983ef73462c65c0584a40cc6648fd55 Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Wed, 11 Jan 2023 18:26:30 +0800
Subject: [PATCH 2/8] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9ESearch=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Form/FormBuilder.vue |   2 +-
 src/components/Search/Item.vue      | 125 ++++++++++++++++++++++++++++
 src/components/Search/Search.vue    |  71 ++++++++++++++++
 src/components/Search/index.ts      |   3 +
 src/components/Search/util.ts       |   4 +
 src/components/index.ts             |   2 +
 src/router/index.ts                 |   8 +-
 src/router/menu.ts                  |   4 +
 src/views/demo/Form.vue             |   2 +-
 src/views/demo/Search.vue           |  15 ++++
 10 files changed, 233 insertions(+), 3 deletions(-)
 create mode 100644 src/components/Search/Item.vue
 create mode 100644 src/components/Search/Search.vue
 create mode 100644 src/components/Search/index.ts
 create mode 100644 src/components/Search/util.ts
 create mode 100644 src/views/demo/Search.vue

diff --git a/src/components/Form/FormBuilder.vue b/src/components/Form/FormBuilder.vue
index cac91d0a..afcbfa2d 100644
--- a/src/components/Form/FormBuilder.vue
+++ b/src/components/Form/FormBuilder.vue
@@ -241,7 +241,7 @@ watch(props.initValue, (newValue: any) => {
 })
 
 defineExpose({
-  resetModel,
+  reset: resetModel,
   formValidate,
   setItemValue,
   setData
diff --git a/src/components/Search/Item.vue b/src/components/Search/Item.vue
new file mode 100644
index 00000000..6f44c425
--- /dev/null
+++ b/src/components/Search/Item.vue
@@ -0,0 +1,125 @@
+<template>
+  <div class='JSearch-item'>
+    <div class='JSearch-item--type'>
+      <a-select
+        v-if='index !== 1 && index !== 4'
+        :options='typeOptions'
+        v-model:value='termsModel.type'
+        style='width: 100%;'
+      />
+      <span v-else>
+        {{
+          index === 1 ? '第一组' : '第二组'
+        }}
+      </span>
+    </div>
+    <a-select
+      class='JSearch-item--column'
+      :options='columnOptions'
+      v-model:value='termsModel.column'
+    />
+    <a-select
+      class='JSearch-item--termType'
+      :options='termTypeOptions'
+      v-model:value='termsModel.termType'
+    />
+    <div class='JSearch-item--value'>
+      <a-input
+        v-if='component === componentType.input'
+        v-model:value='termsModel.value'
+      />
+      <a-select
+        v-else-if='component === componentType.select'
+        v-model:value='termsModel.value'
+        :options='options'
+      />
+      <a-inputnumber
+        v-else-if='component === componentType.inputNumber'
+        v-model:value='termsModel.value'
+      />
+      <a-input-password
+        v-else-if='component === componentType.password'
+        v-model:value='termsModel.value'
+      />
+      <a-switch
+        v-else-if='component === componentType.switch'
+        v-model:checked='termsModel.value'
+      />
+      <a-radio-group
+        v-else-if='component === componentType.radio'
+        v-model:value='termsModel.value'
+      />
+      <a-checkbox-group
+        v-else-if='component === componentType.checkbox'
+        v-model:value='termsModel.value'
+        :options='options'
+      />
+      <a-time-picker
+        v-else-if='component === componentType.time'
+        v-model:value='termsModel.value'
+      />
+      <a-date-picker
+        v-else-if='component === componentType.date'
+        v-model:value='termsModel.value'
+      />
+      <a-tree-select
+        v-else-if='component === componentType.tree'
+        v-model:value='termsModel.value'
+        :tree-data='options'
+      />
+    </div>
+  </div>
+</template>
+
+<script setup lang='ts' name='SearchItem'>
+import { componentType } from 'components/Form'
+import { typeOptions } from './util'
+
+const props = defineProps({
+  component: {
+    type: String,
+    default: componentType.input
+  },
+  index: {
+    type: Number,
+    default: 1
+  }
+})
+
+const termsModel = reactive({})
+
+const options = ref([])
+
+const columnOptions = reactive([])
+
+const termTypeOptions = reactive([])
+
+
+</script>
+
+<style scoped lang='less'>
+.JSearch-item {
+  display: flex;
+  gap: 16px;
+
+  .JSearch-item--type {
+    min-width: 120px;
+    > span {
+      line-height: 34px;
+      font-weight: bold;
+    }
+  }
+
+  .JSearch-item--column {
+    min-width: 120px;
+  }
+
+  .JSearch-item--termType {
+    min-width: 120px;
+  }
+
+  .JSearch-item--value {
+    flex: 1 1 auto;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/Search/Search.vue b/src/components/Search/Search.vue
new file mode 100644
index 00000000..a3908588
--- /dev/null
+++ b/src/components/Search/Search.vue
@@ -0,0 +1,71 @@
+<template>
+  <div class='JSearch-content'>
+    <div class='left'>
+      <SearchItem :index='1' />
+      <SearchItem :index='2' />
+      <SearchItem :index='3' />
+    </div>
+    <div class='center'>
+      <a-select
+        :options='typeOptions'
+      />
+    </div>
+    <div class='right'>
+      <SearchItem :index='4' />
+      <SearchItem :index='5' />
+      <SearchItem :index='6' />
+    </div>
+  </div>
+</template>
+
+<script setup lang='ts' name='Search'>
+import SearchItem from './Item.vue'
+import { typeOptions } from './util'
+
+const props = defineProps({
+  defaultParams: {
+    type: Object,
+    default: () => ({})
+  },
+  columns: {
+    type: Array,
+    default: () => []
+  },
+  type: {
+    type: String,
+    default: 'advanced'
+  },
+  key: {
+    type: String,
+    default: '',
+    required: true
+  }
+})
+
+const searchParams = reactive({
+  data: {}
+})
+
+</script>
+
+<style scoped lang='less'>
+.JSearch-content {
+  display: flex;
+  gap: 16px;
+  .left, & .right {
+    display: flex;
+    gap: 16px;
+    flex-direction: column;
+    width: 0;
+    flex-grow: 1;
+    min-width: 0;
+  }
+
+  .center {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    flex-basis: 120px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/Search/index.ts b/src/components/Search/index.ts
new file mode 100644
index 00000000..4edb3b21
--- /dev/null
+++ b/src/components/Search/index.ts
@@ -0,0 +1,3 @@
+import Search from './Search.vue'
+
+export default Search
\ No newline at end of file
diff --git a/src/components/Search/util.ts b/src/components/Search/util.ts
new file mode 100644
index 00000000..573b0d7d
--- /dev/null
+++ b/src/components/Search/util.ts
@@ -0,0 +1,4 @@
+export const typeOptions = [
+  { label: '或者', value: 'or' },
+  { label: '并且', value: 'and' },
+]
\ No newline at end of file
diff --git a/src/components/index.ts b/src/components/index.ts
index d3daf534..fb44f790 100644
--- a/src/components/index.ts
+++ b/src/components/index.ts
@@ -5,6 +5,7 @@ import JTable from './Table/index.vue'
 import TitleComponent from "./TitleComponent/index.vue";
 import Form from './Form';
 import CardBox from './CardBox/index.vue';
+import Search from './Search'
 
 export default  {
     install(app: App) {
@@ -14,5 +15,6 @@ export default  {
             .component('TitleComponent', TitleComponent)
             .component('Form', Form)
             .component('CardBox', CardBox)
+            .component('Search', Search)
     }
 }
diff --git a/src/router/index.ts b/src/router/index.ts
index 2da56030..389b7053 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -8,9 +8,15 @@ const router = createRouter({
     routes: menus
 })
 
+const filterPath = [
+  '/form',
+  '/search'
+]
+
 router.beforeEach((to, from, next) => {
     const token = LocalStore.get(TOKEN_KEY)
-    if (token) {
+
+    if (token || filterPath.includes(to.path)) {
         next()
     } else {
         if (to.path === LoginPath) {
diff --git a/src/router/menu.ts b/src/router/menu.ts
index 525ac2e8..2fd19758 100644
--- a/src/router/menu.ts
+++ b/src/router/menu.ts
@@ -44,6 +44,10 @@ export default [
         path: '/form',
         component: () => import('@/views/demo/Form.vue')
     },
+    {
+        path: '/search',
+        component: () => import('@/views/demo/Search.vue')
+    },
     // end: 测试用, 可删除
 
     // link 运维管理
diff --git a/src/views/demo/Form.vue b/src/views/demo/Form.vue
index cd585a77..41b6f7e0 100644
--- a/src/views/demo/Form.vue
+++ b/src/views/demo/Form.vue
@@ -21,7 +21,7 @@ const submit = () => {
 }
 
 const reset = () => {
-
+  form.value.reset()
 }
 
 const setValue =() => {
diff --git a/src/views/demo/Search.vue b/src/views/demo/Search.vue
new file mode 100644
index 00000000..e7445026
--- /dev/null
+++ b/src/views/demo/Search.vue
@@ -0,0 +1,15 @@
+<template>
+  <div class='search'>
+    <Search />
+  </div>
+</template>
+
+<script>
+
+</script>
+
+<style scoped>
+.search {
+  width: calc(100% - 330px);
+}
+</style>
\ No newline at end of file

From ce3d168f689499d0d89f4eac7904d0c614f7fca9 Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Thu, 12 Jan 2023 09:13:05 +0800
Subject: [PATCH 3/8] feat: merge components.d.ts

---
 components.d.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/components.d.ts b/components.d.ts
index db063474..d67132e3 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -35,11 +35,14 @@ declare module '@vue/runtime-core' {
     BadgeStatus: typeof import('./src/components/BadgeStatus/index.vue')['default']
     CardBox: typeof import('./src/components/CardBox/index.vue')['default']
     FormFormBuilder: typeof import('./src/components/Form/FormBuilder.vue')['default']
+    FormFormItem: typeof import('./src/components/Form/FormItem.vue')['default']
     GeoComponent: typeof import('./src/components/GeoComponent/index.vue')['default']
     MonacoEditor: typeof import('./src/components/MonacoEditor/index.vue')['default']
     PermissionButton: typeof import('./src/components/PermissionButton/index.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
+    SearchItem: typeof import('./src/components/Search/Item.vue')['default']
+    SearchSearch: typeof import('./src/components/Search/Search.vue')['default']
     Table: typeof import('./src/components/Table/index.vue')['default']
     TitleComponent: typeof import('./src/components/TitleComponent/index.vue')['default']
     ValueItem: typeof import('./src/components/ValueItem/index.vue')['default']

From 3135213a05e8c6ec4ca3b0734810341d72cecb1b Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Thu, 12 Jan 2023 09:54:56 +0800
Subject: [PATCH 4/8] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dcommit=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=97=A0=E6=B3=95=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .commitlintrc.cjs                | 20 +++++++++++++-------
 components.d.ts                  | 31 -------------------------------
 src/components/Search/Search.vue |  1 +
 3 files changed, 14 insertions(+), 38 deletions(-)

diff --git a/.commitlintrc.cjs b/.commitlintrc.cjs
index 34fee141..9ead01b6 100644
--- a/.commitlintrc.cjs
+++ b/.commitlintrc.cjs
@@ -17,12 +17,18 @@ module.exports = {
         'perf', // 性能优化
       ]
     ],
-    'type-case': [0],
-    'type-empty': [0],
-    'scope-empty': [0],
     'scope-case': [0],
-    'subject-full-stop': [0, 'never'],
-    'subject-case': [0, 'never'],
-    'header-max-length': [0, 'always', 72]
-  }
+  },
+  plugins: [
+    {
+      rules: {
+        "commit-rule": ({ raw }) => {
+          return [
+            /^\[(build|feat|fix|update|refactor|docs|chore|style|revert|perf)].+/g.test(raw),
+            `commit备注信息格式错误，格式为 <[type] 修改内容>，type支持${types.join(",")}`
+          ]
+        }
+      }
+    }
+  ]
 }
\ No newline at end of file
diff --git a/components.d.ts b/components.d.ts
index 2aeb1249..40a545e5 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -7,40 +7,9 @@ export {}
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    AAlert: typeof import('ant-design-vue/es')['Alert']
-    ABadge: typeof import('ant-design-vue/es')['Badge']
-    AButton: typeof import('ant-design-vue/es')['Button']
-    ACheckbox: typeof import('ant-design-vue/es')['Checkbox']
-    ACheckboxGroup: typeof import('ant-design-vue/es')['CheckboxGroup']
-    ACol: typeof import('ant-design-vue/es')['Col']
-    ACollapse: typeof import('ant-design-vue/es')['Collapse']
-    ACollapsePanel: typeof import('ant-design-vue/es')['CollapsePanel']
-    ADatePicker: typeof import('ant-design-vue/es')['DatePicker']
-    ADivider: typeof import('ant-design-vue/es')['Divider']
-    AEmpty: typeof import('ant-design-vue/es')['Empty']
-    AForm: typeof import('ant-design-vue/es')['Form']
-    AFormItem: typeof import('ant-design-vue/es')['FormItem']
-    AInput: typeof import('ant-design-vue/es')['Input']
-    AInputNumber: typeof import('ant-design-vue/es')['InputNumber']
-    AInputPassword: typeof import('ant-design-vue/es')['InputPassword']
-    AModal: typeof import('ant-design-vue/es')['Modal']
-    APagination: typeof import('ant-design-vue/es')['Pagination']
-    APopconfirm: typeof import('ant-design-vue/es')['Popconfirm']
-    ARadioGroup: typeof import('ant-design-vue/es')['RadioGroup']
-    ARow: typeof import('ant-design-vue/es')['Row']
-    ASelect: typeof import('ant-design-vue/es')['Select']
-    ASelectOption: typeof import('ant-design-vue/es')['SelectOption']
-    ASpin: typeof import('ant-design-vue/es')['Spin']
-    ASwitch: typeof import('ant-design-vue/es')['Switch']
-    ATable: typeof import('ant-design-vue/es')['Table']
-    ATimePicker: typeof import('ant-design-vue/es')['TimePicker']
-    ATooltip: typeof import('ant-design-vue/es')['Tooltip']
-    ATreeSelect: typeof import('ant-design-vue/es')['TreeSelect']
-    AUpload: typeof import('ant-design-vue/es')['Upload']
     BadgeStatus: typeof import('./src/components/BadgeStatus/index.vue')['default']
     CardBox: typeof import('./src/components/CardBox/index.vue')['default']
     FormFormBuilder: typeof import('./src/components/Form/FormBuilder.vue')['default']
-    FormFormItem: typeof import('./src/components/Form/FormItem.vue')['default']
     GeoComponent: typeof import('./src/components/GeoComponent/index.vue')['default']
     MonacoEditor: typeof import('./src/components/MonacoEditor/index.vue')['default']
     PermissionButton: typeof import('./src/components/PermissionButton/index.vue')['default']
diff --git a/src/components/Search/Search.vue b/src/components/Search/Search.vue
index a3908588..2bcd6615 100644
--- a/src/components/Search/Search.vue
+++ b/src/components/Search/Search.vue
@@ -35,6 +35,7 @@ const props = defineProps({
     type: String,
     default: 'advanced'
   },
+
   key: {
     type: String,
     default: '',

From 48ca21ab3ddea4e9eb0db72161e00c8b07856b61 Mon Sep 17 00:00:00 2001
From: wangshuaiswim <shuai-1991@qq.com>
Date: Thu, 12 Jan 2023 11:33:59 +0800
Subject: [PATCH 5/8] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?api=E7=9B=AE=E5=BD=95=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/{device.ts => device/instance.ts} | 0
 src/api/device/product.ts                 | 3 +++
 src/components/PermissionButton/index.vue | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)
 rename src/api/{device.ts => device/instance.ts} (100%)
 create mode 100644 src/api/device/product.ts

diff --git a/src/api/device.ts b/src/api/device/instance.ts
similarity index 100%
rename from src/api/device.ts
rename to src/api/device/instance.ts
diff --git a/src/api/device/product.ts b/src/api/device/product.ts
new file mode 100644
index 00000000..ac44c574
--- /dev/null
+++ b/src/api/device/product.ts
@@ -0,0 +1,3 @@
+import server from '@/utils/request'
+
+export const queryNoPagingPost = (data: any) => server.post(`/device-product/_query/no-paging?paging=false`, data)
\ No newline at end of file
diff --git a/src/components/PermissionButton/index.vue b/src/components/PermissionButton/index.vue
index cbeb5c37..d211e2ee 100644
--- a/src/components/PermissionButton/index.vue
+++ b/src/components/PermissionButton/index.vue
@@ -25,7 +25,7 @@
     <a-button v-else v-bind="buttonProps" :disabled="_isPermission"></a-button>
   </a-tooltip>
 </template>
-<script setup lang="ts">
+<script setup lang="ts" name="PermissionButton">
 import type { ButtonProps, TooltipProps, PopconfirmProps } from 'ant-design-vue'
 import { usePermissionStore } from '@/store/permission';
 

From 34459132cfbc4440a0cdce8347344d921f08008b Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Thu, 12 Jan 2023 11:45:59 +0800
Subject: [PATCH 6/8] =?UTF-8?q?update:=20=E6=B7=BB=E5=8A=A0axios=20respons?=
 =?UTF-8?q?e=E6=B3=9B=E5=9E=8B=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.ts | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/utils/request.ts b/src/utils/request.ts
index aef2bd54..cc606fea 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -26,23 +26,24 @@ export const request = axios.create({
  * @param {String} responseType 如果接口是需要导出文件流，那么responseType = 'blob'
  * @returns {AxiosInstance}
  */
-export const post = function(url: string, data = {}, params = {}) {
+export const post = function<T>(url: string, data = {}, params = {}) {
     params = typeof params === 'string' ? { responseType: params } : params
-    return request({
+    return request<any, AxiosResponseRewrite<T>>({
         ...params,
         method: 'POST',
         url,
         data
     })
 }
+
 /**
  * put method request
  * @param {String} url
  * @param {Object} [data]
  * @returns {AxiosInstance}
  */
-export const put = function(url: string, data = {},) {
-    return request({
+export const put = function<T>(url: string, data = {},) {
+    return request<any, AxiosResponseRewrite<T>>({
         method: 'PUT',
         url,
         data
@@ -55,8 +56,8 @@ export const put = function(url: string, data = {},) {
  * @param {Object} [data]
  * @returns {AxiosInstance}
  */
-export const patch = function(url: string, data = {}) {
-    return request({
+export const patch = function<T>(url: string, data = {}) {
+    return request<any, AxiosResponseRewrite<T>>({
         method: 'PATCH',
         url,
         data
@@ -69,8 +70,8 @@ export const patch = function(url: string, data = {}) {
  * @param {Object} [ext] 扩展参数
  * @returns {AxiosInstance}
  */
-export const get = function(url: string, params = {},  ext?: any) {
-    return request({
+export const get = function<T>(url: string, params = {},  ext?: any) {
+    return request<any, AxiosResponseRewrite<T>>({
         method: 'GET',
         url,
         params,
@@ -85,8 +86,8 @@ export const get = function(url: string, params = {},  ext?: any) {
  * @param {Object} [ext] 扩展参数
  * @returns {AxiosInstance}
  */
-export const remove = function(url: string, params = {}, ext?: any) {
-    return request({
+export const remove = function<T>(url: string, params = {}, ext?: any) {
+    return request<any, AxiosResponseRewrite<T>>({
         method: 'DELETE',
         url,
         params,
@@ -101,7 +102,7 @@ export const remove = function(url: string, params = {}, ext?: any) {
  * @return {*}
  */
 export const getStream = function(url: string, params = {}) {
-    return get(url, params, {
+    return get<any>(url, params, {
         responseType: 'arraybuffer' // 设置请求数据类型，返回blob可解析类型
     })
 }

From 2ef9df6c048db12048b691d82af0c8001fbcc35d Mon Sep 17 00:00:00 2001
From: blp <2962632571@qq.com>
Date: Thu, 12 Jan 2023 14:41:49 +0800
Subject: [PATCH 7/8] =?UTF-8?q?fix:=20=E7=99=BB=E5=BD=95=E9=A1=B5=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/user/Login/index.vue | 53 ++++++++++------------------------
 1 file changed, 15 insertions(+), 38 deletions(-)

diff --git a/src/views/user/Login/index.vue b/src/views/user/Login/index.vue
index 2f802f1e..1b1d8968 100644
--- a/src/views/user/Login/index.vue
+++ b/src/views/user/Login/index.vue
@@ -9,7 +9,6 @@
                     />
                 </div>
                 <div class="right">
-                    <div class="lang" data-lang=""></div>
                     <div class="content">
                         <div class="top">
                             <div class="header">
@@ -109,17 +108,13 @@
                                         </a-button>
                                     </a-form-item>
                                 </a-form>
-                                <div style="margin-top: 20px">
-                                    <a-divider plain style="height: 12px">
-                                        <div
-                                            style="color: #807676d9, font-size: 12px"
-                                        >
+                                <div class="other">
+                                    <a-divider plain>
+                                        <div class="other-text">
                                             其他方式登录
                                         </div>
                                     </a-divider>
-                                    <div
-                                        style="position: relative, bottom: 10px; text-align: center"
-                                    >
+                                    <div class="other-button">
                                         <a-button
                                             v-for="(item, index) in bindings"
                                             :key="index"
@@ -312,8 +307,6 @@ screenRotation(screenWidth.value, screenHeight.value);
 </script>
 
 <style scoped lang="less">
-@import 'ant-design-vue/es/style/themes/default.less';
-
 .container {
     display: flex;
     height: 100vh;
@@ -336,22 +329,12 @@ screenRotation(screenWidth.value, screenHeight.value);
             background: #fff;
         }
 
-        .lang {
-            width: 100%;
-            height: 40px;
-            line-height: 44px;
-            text-align: right;
-
-            :global(.ant-dropdown-trigger) {
-                margin-right: 24px;
-            }
-        }
-
         .content {
             display: flex;
             flex-direction: row-reverse;
             justify-content: center;
             padding: 0 0 15% 0;
+            margin-top: 20%;
 
             .top {
                 width: 100%;
@@ -404,17 +387,6 @@ screenRotation(screenWidth.value, screenHeight.value);
                         max-width: 328px;
                     }
 
-                    // ::v-deep {
-                    //     .@{ant-prefix}-tabs-nav-list {
-                    //         margin: auto;
-                    //         font-size: 16px;
-                    //     }
-
-                    //     // .ant-formily-item-size-large .ant-formily-item-help {
-                    //     //     text-align: left;
-                    //     // }
-                    // }
-
                     .icon {
                         margin-left: 16px;
                         color: rgba(0, 0, 0, 0.2);
@@ -429,12 +401,17 @@ screenRotation(screenWidth.value, screenHeight.value);
                     }
 
                     .other {
-                        margin-top: 24px;
-                        line-height: 22px;
-                        text-align: left;
+                        margin-top: 20px;
 
-                        .register {
-                            float: right;
+                        .other-text {
+                            color: #807676d9;
+                            font-size: 12px;
+                        }
+
+                        .other-button {
+                            position: relative;
+                            bottom: 10px;
+                            text-align: center;
                         }
                     }
 

From a8b91084623321e27072f0388fd5f091ea49e8b6 Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Thu, 12 Jan 2023 14:52:48 +0800
Subject: [PATCH 8/8] =?UTF-8?q?update:=20=E4=BF=AE=E6=94=B9=E4=B8=BB?=
 =?UTF-8?q?=E9=A2=98=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/config.ts | 2 +-
 vite.config.ts   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/config.ts b/config/config.ts
index 88915884..108726d5 100644
--- a/config/config.ts
+++ b/config/config.ts
@@ -1,6 +1,6 @@
 export default {
   theme: {
-    'primary-color': '#00A4FF',
+    'primary-color': '#1d39c4',
   },
   logo: '/favicon.ico',
   title: 'Jetlinks'
diff --git a/vite.config.ts b/vite.config.ts
index 370a0e21..a6b26baf 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -89,8 +89,8 @@ export default defineConfig(({ mode}) => {
           preprocessorOptions: {
               less: {
                   modifyVars: {
+                      hack: `true; @import (reference) "${path.resolve('src/style/variable.less')}";`,
                       ...Config.theme,
-                      hack: `true; @import (reference) "${path.resolve('src/style/variable.less')}";`
                   },
                   javascriptEnabled: true,
               }