1.6.0 README.md update

jekip · Dec 24, 2021 · 1ab8b5b · 1ab8b5b
1 parent fc5e138
commit 1ab8b5b
Show file tree

Hide file tree

Showing 25 changed files with 2,858 additions and 2,966 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,4 +1,3 @@
-
 *.sh
 node_modules
 *.md
@@ -14,3 +13,4 @@ dist
 /bin
 Dockerfile
 components.d.ts
+components.d.ts
diff --git a/.gitignore b/.gitignore
@@ -24,3 +24,4 @@ pnpm-debug.log*
 *.sln
 *.sw?
 /components.d.ts
+/components.d.ts
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # CHANGELOG
 
+## 1.6.0 (2021-12-24)
+
+### 🐛 Bug Fixes
+- 修复 `低版本浏览器` 报 globalThis 未定义
+- 修复 `Axios` api地址拼接异常
+- 修复 `createStorage存在prefixKey` 会出bug
+
+- ### ✨ Features
+- 破坏 `Axios` 取消默认导出 `http` 可支持多个请求导出
+- 搜索 `import http from '@/utils/http/axios'` 替换为 `import { http } from '@/utils/http/axios`
+- 新增 `Axios` 多项配置 `urlPrefix`，`joinTime`，`ignoreCancelToken`，`withToken`，`uploadFile方法`
+- 依赖升级
+
 ## 1.5.5 (2021-08-14)
 
 ### 🐛 Bug Fixes

diff --git a/README.md b/README.md
@@ -30,13 +30,22 @@
 
 ## 新品
 
-千呼万唤 `Naive Admin Antd` 也迎来了第一个版本，同时具备 `Naive Ui Admin` 优点，如果您选的技术栈是 `antd` 的话，不妨看看以下版本，他或许能让您眼前一亮O(∩_∩)O哈哈~
+### Antd vue
+
+千呼万唤 `Naive Admin Antd` 也迎来了第一个版本，同时具备 `Naive Ui Admin` 优点，如果您选的技术栈是 `Antd` 的话，不妨看看。
 
 [NaiveAdmin Antd 预览](https://antd.naiveadmin.com)
 
+### Arco vue
+
+新产品，新生态，智能设计体系，连接轻盈体验，一如既往、开箱即用，欢迎前往查看。
+
+[NaiveAdmin Arco 预览](https://arco.naiveadmin.com)
+
+
 ## 文档
 
-[文档地址](https://naive-ui-admin-docs.vercel.app) 
+[v1文档地址](https://naive-ui-admin-docs.vercel.app) 
 
 ## 准备
 

diff --git a/commitlint.config.js b/commitlint.config.js
@@ -14,7 +14,7 @@ module.exports = {
  'fixed',
  'resolve',
  'resolves',
- 'resolved'
+ 'resolved',
  ],
  issuePrefixes: ['#'],
  noteKeywords: ['BREAKING CHANGE'],
@@ -23,8 +23,8 @@ module.exports = {
  revertCorrespondence: ['header', 'hash'],
  warn() {},
  mergePattern: null,
- mergeCorrespondence: null
- }
+ mergeCorrespondence: null,
+ },
  },
  rules: {
  'body-leading-blank': [2, 'always'],
@@ -50,8 +50,8 @@ module.exports = {
  'wip',
  'workflow',
  'types',
- 'release'
- ]
- ]
- }
-}
+ 'release',
+ ],
+ ],
+ },
+};
diff --git a/index.html b/index.html
@@ -1,26 +1,122 @@
 <!DOCTYPE html>
-<html lang="zh-cmn-Hans">
+<html lang="zh-cmn-Hans" id="htmlRoot" data-theme="light">
 <head>
  <meta charset="UTF-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
- <meta name="renderer" content="webkit"/>
+ <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible"/>
+ <meta content="webkit" name="renderer"/>
  <meta
- name="viewport"
  content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=0"
+ name="viewport"
  />
- <link rel="icon" href="/favicon.ico"/>
+ <link href="/favicon.ico" rel="icon"/>
  <title><%= title %></title>
- <style>.first-loading-wrp{display:flex;justify-content:center;align-items:center;flex-direction:column;min-height:420px;height:100%}.first-loading-wrp>h1{font-size:128px}.first-loading-wrp .loading-wrp{padding:98px;display:flex;justify-content:center;align-items:center}.dot{animation:antRotate 1.2s infinite linear;transform:rotate(45deg);position:relative;display:inline-block;font-size:32px;width:32px;height:32px;box-sizing:border-box}.dot i{width:14px;height:14px;position:absolute;display:block;background-color:#1890ff;border-radius:100%;transform:scale(.75);transform-origin:50% 50%;opacity:.3;animation:antSpinMove 1s infinite linear alternate}.dot i:nth-child(1){top:0;left:0}.dot i:nth-child(2){top:0;right:0;-webkit-animation-delay:.4s;animation-delay:.4s}.dot i:nth-child(3){right:0;bottom:0;-webkit-animation-delay:.8s;animation-delay:.8s}.dot i:nth-child(4){bottom:0;left:0;-webkit-animation-delay:1.2s;animation-delay:1.2s}@keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@-webkit-keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@keyframes antSpinMove{to{opacity:1}}@-webkit-keyframes antSpinMove{to{opacity:1}}</style>
 </head>
 <body>
 <div id="appProvider" style="display: none"></div>
 <div id="app">
- <div class="first-loading-wrp">
- <div class="loading-wrp">
- <span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>
+ <style>
+ .first-loading-wrap {
+ display: flex;
+ width: 100%;
+ height: 100vh;
+ justify-content: center;
+ align-items: center;
+ flex-direction: column;
+ }
+
+ .first-loading-wrap > h1 {
+ font-size: 128px
+ }
+
+ .first-loading-wrap .loading-wrap {
+ padding: 98px;
+ display: flex;
+ justify-content: center;
+ align-items: center
+ }
+
+ .dot {
+ animation: antRotate 1.2s infinite linear;
+ transform: rotate(45deg);
+ position: relative;
+ display: inline-block;
+ font-size: 32px;
+ width: 32px;
+ height: 32px;
+ box-sizing: border-box
+ }
+
+ .dot i {
+ width: 14px;
+ height: 14px;
+ position: absolute;
+ display: block;
+ background-color: #1890ff;
+ border-radius: 100%;
+ transform: scale(.75);
+ transform-origin: 50% 50%;
+ opacity: .3;
+ animation: antSpinMove 1s infinite linear alternate
+ }
+
+ .dot i:nth-child(1) {
+ top: 0;
+ left: 0
+ }
+
+ .dot i:nth-child(2) {
+ top: 0;
+ right: 0;
+ -webkit-animation-delay: .4s;
+ animation-delay: .4s
+ }
+
+ .dot i:nth-child(3) {
+ right: 0;
+ bottom: 0;
+ -webkit-animation-delay: .8s;
+ animation-delay: .8s
+ }
+
+ .dot i:nth-child(4) {
+ bottom: 0;
+ left: 0;
+ -webkit-animation-delay: 1.2s;
+ animation-delay: 1.2s
+ }
+
+ @keyframes antRotate {
+ to {
+ -webkit-transform: rotate(405deg);
+ transform: rotate(405deg)
+ }
+ }
+
+ @-webkit-keyframes antRotate {
+ to {
+ -webkit-transform: rotate(405deg);
+ transform: rotate(405deg)
+ }
+ }
+
+ @keyframes antSpinMove {
+ to {
+ opacity: 1
+ }
+ }
+
+ @-webkit-keyframes antSpinMove {
+ to {
+ opacity: 1
+ }
+ }</style>
+ <div class="first-loading-wrap">
+ <div class="loading-wrap">
+ <span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>
  </div>
  </div>
 </div>
-<script type="module" src="/src/main.ts"></script>
+<script>var globalThis = window;</script>
+<script src="/src/main.ts" type="module"></script>
 </body>
 </html>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "naive-ui-admin",
- "version": "1.5.5",
+ "version": "1.6.0",
  "author": {
  "name": "Ahjung",
  "email": "[email protected]",
@@ -39,7 +39,7 @@
  "makeit-captcha": "^1.2.5",
  "mitt": "^2.1.0",
  "mockjs": "^1.1.0",
- "naive-ui": "^2.19.1",
+ "naive-ui": "^2.23.1",
  "pinia": "^2.0.0-rc.4",
  "qs": "^6.10.1",
  "vfonts": "^0.1.0",

diff --git a/postcss.config.js b/postcss.config.js
@@ -3,4 +3,4 @@ module.exports = {
  tailwindcss: {},
  autoprefixer: {},
  },
-}
+};
diff --git a/src/api/dashboard/console.ts b/src/api/dashboard/console.ts
@@ -1,4 +1,4 @@
-import http from '@/utils/http/axios';
+import { http } from '@/utils/http/axios';
 
 //获取主控台信息
 export function getConsoleInfo() {

diff --git a/src/api/system/menu.ts b/src/api/system/menu.ts
@@ -1,4 +1,4 @@
-import http from '@/utils/http/axios';
+import { http } from '@/utils/http/axios';
 
 /**
  * @description: 根据用户id获取用户菜单

diff --git a/src/api/system/role.ts b/src/api/system/role.ts
@@ -1,9 +1,9 @@
-import http from '@/utils/http/axios';
+import { http } from '@/utils/http/axios';
 
 /**
  * @description: 角色列表
  */
-export function getRoleList(params) {
+export function getRoleList() {
  return http.request({
  url: '/role/list',
  method: 'GET',

diff --git a/src/api/system/user.ts b/src/api/system/user.ts
@@ -1,4 +1,4 @@
-import http from '@/utils/http/axios';
+import { http } from '@/utils/http/axios';
 
 export interface BasicResponseModel<T = any> {
  code: number;

diff --git a/src/api/table/list.ts b/src/api/table/list.ts
@@ -1,4 +1,4 @@
-import http from '@/utils/http/axios';
+import { http } from '@/utils/http/axios';
 
 //获取table
 export function getTableList(params) {

diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue
@@ -7,7 +7,7 @@
  {{ title }}
  <n-tooltip trigger="hover" v-if="titleTooltip">
  <template #trigger>
- <n-icon size="18" class="ml-1 cursor-pointer text-gray-400">
+ <n-icon size="18" class="ml-1 text-gray-400 cursor-pointer">
  <QuestionCircleOutlined />
  </n-icon>
  </template>
@@ -156,7 +156,7 @@
 
  const { getPaginationInfo, setPagination } = usePagination(getProps);
 
- const { getDataSourceRef, getRowKey, reload } = useDataSource(
+ const { getDataSourceRef, getDataSource, getRowKey, reload } = useDataSource(
  getProps,
  {
  getPaginationInfo,
@@ -280,6 +280,7 @@
  ...toRefs(state),
  tableElRef,
  getBindValues,
+ getDataSource,
  densityOptions,
  reload,
  densitySelect,

diff --git a/src/components/Table/src/hooks/useDataSource.ts b/src/components/Table/src/hooks/useDataSource.ts
@@ -9,7 +9,7 @@ export function useDataSource(
  { getPaginationInfo, setPagination, setLoading, tableData },
  emit
 ) {
- const dataSourceRef = ref([]);
+ const dataSourceRef = ref<Recordable[]>([]);
 
  watchEffect(() => {
  tableData.value = unref(dataSourceRef);

diff --git a/src/utils/Storage.ts b/src/utils/Storage.ts
@@ -48,7 +48,7 @@ export const createStorage = ({ prefixKey = '', storage = localStorage } = {}) =
  if (expire === null || expire >= Date.now()) {
  return value;
  }
- this.remove(this.getKey(key));
+ this.remove(key);
  } catch (e) {
  return def;
  }