Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
najiu-admin-template
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
najiu-frontend
najiu-admin-template
Commits
d7dc0934
Commit
d7dc0934
authored
Jan 12, 2021
by
vben
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore(deps): update deps
parent
c9600208
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
86 additions
and
54 deletions
+86
-54
CHANGELOG.en_US.md
CHANGELOG.en_US.md
+30
-0
html.ts
build/vite/plugin/html.ts
+2
-1
package.json
package.json
+4
-4
yarn.lock
yarn.lock
+50
-49
No files found.
CHANGELOG.en_US.md
View file @
d7dc0934
## Wip
### ✨ Refactor
-
Independent component configuration to
`/@/settings/componentsSetting`
-
`colorSetting`
and
`designSetting`
are now merged into
`designSetting`
-
`ant-design-vue`
component registration moved to
`components/registerComponent`
-
Remove the
`setup`
folder
-
Upgrade to
`vite2`
-
Image preview is changed to
`Image`
component implementation, temporarily removing functional usage
### ✨ Features
-
Added
`mixSideTrigger`
configuration. Used to configure how to open the mixed mode menu on the left. Optional
`hover`
, default
`click`
-
Added
`mixSideFixed`
configuration. Used to fix the left mixed mode menu
-
Added
`height`
and
`min-height`
properties to the modal component
-
Added
`PageWrapper`
component. And applied to the sample page
-
Added tab folding function
-
Compatible with older browsers
-
tinymce new image upload
### 🐛 Bug Fixes
-
Fix known issues with table column configuration
-
Restore the
`isTreeTable`
property of the table
-
Fix table memory overflow problem
-
Fix the function of
`layout`
shrinking and expanding in split mode
-
Fix modal height calculation error
-
Fix file upload error
## 2.0.0-rc.15 (2020-12-31)
## 2.0.0-rc.15 (2020-12-31)
### ✨ Table destructive update
### ✨ Table destructive update
...
...
build/vite/plugin/html.ts
View file @
d7dc0934
...
@@ -8,6 +8,7 @@ import { GLOB_CONFIG_FILE_NAME } from '../../constant';
...
@@ -8,6 +8,7 @@ import { GLOB_CONFIG_FILE_NAME } from '../../constant';
export
function
configHtmlPlugin
(
env
:
ViteEnv
,
isBuild
:
boolean
)
{
export
function
configHtmlPlugin
(
env
:
ViteEnv
,
isBuild
:
boolean
)
{
const
{
VITE_GLOB_APP_TITLE
,
VITE_PUBLIC_PATH
}
=
env
;
const
{
VITE_GLOB_APP_TITLE
,
VITE_PUBLIC_PATH
}
=
env
;
const
path
=
VITE_PUBLIC_PATH
.
endsWith
(
'
/
'
)
?
VITE_PUBLIC_PATH
:
`
${
VITE_PUBLIC_PATH
}
/`
;
const
htmlPlugin
:
Plugin
[]
=
html
({
const
htmlPlugin
:
Plugin
[]
=
html
({
minify
:
isBuild
,
minify
:
isBuild
,
inject
:
{
inject
:
{
...
@@ -19,7 +20,7 @@ export function configHtmlPlugin(env: ViteEnv, isBuild: boolean) {
...
@@ -19,7 +20,7 @@ export function configHtmlPlugin(env: ViteEnv, isBuild: boolean) {
{
{
tag
:
'
script
'
,
tag
:
'
script
'
,
attrs
:
{
attrs
:
{
src
:
`
${
VITE_PUBLIC_PATH
||
'
.
/
'
}${
GLOB_CONFIG_FILE_NAME
}
?v=
${
src
:
`
${
path
||
'
/
'
}${
GLOB_CONFIG_FILE_NAME
}
?v=
${
pkg
.
version
pkg
.
version
}
-
${
new
Date
().
getTime
()}
`
,
}
-
${
new
Date
().
getTime
()}
`
,
},
},
...
...
package.json
View file @
d7dc0934
...
@@ -60,9 +60,9 @@
...
@@ -60,9 +60,9 @@
"
@types/sortablejs
"
:
"
^1.10.6
"
,
"
@types/sortablejs
"
:
"
^1.10.6
"
,
"
@types/yargs
"
:
"
^15.0.12
"
,
"
@types/yargs
"
:
"
^15.0.12
"
,
"
@types/zxcvbn
"
:
"
^4.4.0
"
,
"
@types/zxcvbn
"
:
"
^4.4.0
"
,
"
@typescript-eslint/eslint-plugin
"
:
"
^4.1
2
.0
"
,
"
@typescript-eslint/eslint-plugin
"
:
"
^4.1
3
.0
"
,
"
@typescript-eslint/parser
"
:
"
^4.1
2
.0
"
,
"
@typescript-eslint/parser
"
:
"
^4.1
3
.0
"
,
"
@vitejs/plugin-legacy
"
:
"
^1.
1.1
"
,
"
@vitejs/plugin-legacy
"
:
"
^1.
2.0
"
,
"
@vitejs/plugin-vue
"
:
"
^1.0.5
"
,
"
@vitejs/plugin-vue
"
:
"
^1.0.5
"
,
"
@vitejs/plugin-vue-jsx
"
:
"
^1.0.1
"
,
"
@vitejs/plugin-vue-jsx
"
:
"
^1.0.1
"
,
"
@vue/compiler-sfc
"
:
"
^3.0.5
"
,
"
@vue/compiler-sfc
"
:
"
^3.0.5
"
,
...
@@ -96,7 +96,7 @@
...
@@ -96,7 +96,7 @@
"
stylelint-order
"
:
"
^4.1.0
"
,
"
stylelint-order
"
:
"
^4.1.0
"
,
"
ts-node
"
:
"
^9.1.0
"
,
"
ts-node
"
:
"
^9.1.0
"
,
"
typescript
"
:
"
^4.1.3
"
,
"
typescript
"
:
"
^4.1.3
"
,
"
vite
"
:
"
^2.0.0-beta.2
1
"
,
"
vite
"
:
"
^2.0.0-beta.2
2
"
,
"
vite-plugin-html
"
:
"
^2.0.0-beta.5
"
,
"
vite-plugin-html
"
:
"
^2.0.0-beta.5
"
,
"
vite-plugin-mock
"
:
"
^2.0.0-beta.3
"
,
"
vite-plugin-mock
"
:
"
^2.0.0-beta.3
"
,
"
vite-plugin-purge-icons
"
:
"
^0.5.0
"
,
"
vite-plugin-purge-icons
"
:
"
^0.5.0
"
,
...
...
yarn.lock
View file @
d7dc0934
...
@@ -1678,61 +1678,62 @@
...
@@ -1678,61 +1678,62 @@
resolved "https://registry.npmjs.org/@types/zxcvbn/-/zxcvbn-4.4.0.tgz#fbc1d941cc6d9d37d18405c513ba6b294f89b609"
resolved "https://registry.npmjs.org/@types/zxcvbn/-/zxcvbn-4.4.0.tgz#fbc1d941cc6d9d37d18405c513ba6b294f89b609"
integrity sha512-GQLOT+SN20a+AI51y3fAimhyTF4Y0RG+YP3gf91OibIZ7CJmPFgoZi+ZR5a+vRbS01LbQosITWum4ATmJ1Z6Pg==
integrity sha512-GQLOT+SN20a+AI51y3fAimhyTF4Y0RG+YP3gf91OibIZ7CJmPFgoZi+ZR5a+vRbS01LbQosITWum4ATmJ1Z6Pg==
"@typescript-eslint/eslint-plugin@^4.1
2
.0":
"@typescript-eslint/eslint-plugin@^4.1
3
.0":
version "4.1
2
.0"
version "4.1
3
.0"
resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.1
2.0.tgz#00d1b23b40b58031e6d7c04a5bc6c1a30a2e834a
"
resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.1
3.0.tgz#5f580ea520fa46442deb82c038460c3dd3524bb6
"
integrity sha512-
wHKj6q8s70sO5i39H2g1gtpCXCvjVszzj6FFygneNFyIAxRvNSVz9GML7XpqrB9t7hNutXw+MHnLN/Ih6uyB8Q
==
integrity sha512-
ygqDUm+BUPvrr0jrXqoteMqmIaZ/bixYOc3A4BRwzEPTZPi6E+n44rzNZWaB0YvtukgP+aoj0i/fyx7FkM2p1w
==
dependencies:
dependencies:
"@typescript-eslint/experimental-utils" "4.1
2
.0"
"@typescript-eslint/experimental-utils" "4.1
3
.0"
"@typescript-eslint/scope-manager" "4.1
2
.0"
"@typescript-eslint/scope-manager" "4.1
3
.0"
debug "^4.1.1"
debug "^4.1.1"
functional-red-black-tree "^1.0.1"
functional-red-black-tree "^1.0.1"
lodash "^4.17.15"
regexpp "^3.0.0"
regexpp "^3.0.0"
semver "^7.3.2"
semver "^7.3.2"
tsutils "^3.17.1"
tsutils "^3.17.1"
"@typescript-eslint/experimental-utils@4.1
2
.0":
"@typescript-eslint/experimental-utils@4.1
3
.0":
version "4.1
2
.0"
version "4.1
3
.0"
resolved "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.1
2.0.tgz#372838e76db76c9a56959217b768a19f7129546b
"
resolved "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.1
3.0.tgz#9dc9ab375d65603b43d938a0786190a0c72be44e
"
integrity sha512-
MpXZXUAvHt99c9ScXijx7i061o5HEjXltO+sbYfZAAHxv3XankQkPaNi5myy0Yh0Tyea3Hdq1pi7Vsh0GJb0fA
==
integrity sha512-
/ZsuWmqagOzNkx30VWYV3MNB/Re/CGv/7EzlqZo5RegBN8tMuPaBgNK6vPBCQA8tcYrbsrTdbx3ixMRRKEEGVw
==
dependencies:
dependencies:
"@types/json-schema" "^7.0.3"
"@types/json-schema" "^7.0.3"
"@typescript-eslint/scope-manager" "4.1
2
.0"
"@typescript-eslint/scope-manager" "4.1
3
.0"
"@typescript-eslint/types" "4.1
2
.0"
"@typescript-eslint/types" "4.1
3
.0"
"@typescript-eslint/typescript-estree" "4.1
2
.0"
"@typescript-eslint/typescript-estree" "4.1
3
.0"
eslint-scope "^5.0.0"
eslint-scope "^5.0.0"
eslint-utils "^2.0.0"
eslint-utils "^2.0.0"
"@typescript-eslint/parser@^4.1
2
.0":
"@typescript-eslint/parser@^4.1
3
.0":
version "4.1
2
.0"
version "4.1
3
.0"
resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.1
2.0.tgz#e1cf30436e4f916c31fcc962158917bd9e9d460a
"
resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.1
3.0.tgz#c413d640ea66120cfcc37f891e8cb3fd1c9d247d
"
integrity sha512-
9XxVADAo9vlfjfoxnjboBTxYOiNY93/QuvcPgsiKvHxW6tOZx1W4TvkIQ2jB3k5M0pbFP5FlXihLK49TjZXhuQ
==
integrity sha512-
KO0J5SRF08pMXzq9+abyHnaGQgUJZ3Z3ax+pmqz9vl81JxmTTOUfQmq7/4awVfq09b6C4owNlOgOwp61pYRBSg
==
dependencies:
dependencies:
"@typescript-eslint/scope-manager" "4.1
2
.0"
"@typescript-eslint/scope-manager" "4.1
3
.0"
"@typescript-eslint/types" "4.1
2
.0"
"@typescript-eslint/types" "4.1
3
.0"
"@typescript-eslint/typescript-estree" "4.1
2
.0"
"@typescript-eslint/typescript-estree" "4.1
3
.0"
debug "^4.1.1"
debug "^4.1.1"
"@typescript-eslint/scope-manager@4.1
2
.0":
"@typescript-eslint/scope-manager@4.1
3
.0":
version "4.1
2
.0"
version "4.1
3
.0"
resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.1
2.0.tgz#beeb8beca895a07b10c593185a5612f1085ef279
"
resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.1
3.0.tgz#5b45912a9aa26b29603d8fa28f5e09088b947141
"
integrity sha512-
QVf9oCSVLte/8jvOsxmgBdOaoe2J0wtEmBr13Yz0rkBNkl5D8bfnf6G4Vhox9qqMIoG7QQoVwd2eG9DM/ge4Qg
==
integrity sha512-
UpK7YLG2JlTp/9G4CHe7GxOwd93RBf3aHO5L+pfjIrhtBvZjHKbMhBXTIQNkbz7HZ9XOe++yKrXutYm5KmjWgQ
==
dependencies:
dependencies:
"@typescript-eslint/types" "4.1
2
.0"
"@typescript-eslint/types" "4.1
3
.0"
"@typescript-eslint/visitor-keys" "4.1
2
.0"
"@typescript-eslint/visitor-keys" "4.1
3
.0"
"@typescript-eslint/types@4.1
2
.0":
"@typescript-eslint/types@4.1
3
.0":
version "4.1
2
.0"
version "4.1
3
.0"
resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.1
2.0.tgz#fb891fe7ccc9ea8b2bbd2780e36da45d0dc055e5
"
resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.1
3.0.tgz#6a7c6015a59a08fbd70daa8c83dfff86250502f8
"
integrity sha512-
N2RhGeheVLGtyy+CxRmxdsniB7sMSCfsnbh8K/+RUIXYYq3Ub5+sukRCjVE80QerrUBvuEvs4fDhz5AW/pcL6g
==
integrity sha512-
/+aPaq163oX+ObOG00M0t9tKkOgdv9lq0IQv/y4SqGkAXmhFmCfgsELV7kOCTb2vVU5VOmVwXBXJTDr353C1rQ
==
"@typescript-eslint/typescript-estree@4.1
2
.0":
"@typescript-eslint/typescript-estree@4.1
3
.0":
version "4.1
2
.0"
version "4.1
3
.0"
resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.1
2.0.tgz#3963418c850f564bdab3882ae23795d115d6d32
e"
resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.1
3.0.tgz#cf6e2207c7d760f5dfd8d18051428fadfc37b45
e"
integrity sha512-
gZkFcmmp/CnzqD2RKMich2/FjBTsYopjiwJCroxqHZIY11IIoN0l5lKqcgoAPKHt33H2mAkSfvzj8i44Jm7F4w
==
integrity sha512-
9A0/DFZZLlGXn5XA349dWQFwPZxcyYyCFX5X88nWs2uachRDwGeyPz46oTsm9ZJE66EALvEns1lvBwa4d9QxMg
==
dependencies:
dependencies:
"@typescript-eslint/types" "4.1
2
.0"
"@typescript-eslint/types" "4.1
3
.0"
"@typescript-eslint/visitor-keys" "4.1
2
.0"
"@typescript-eslint/visitor-keys" "4.1
3
.0"
debug "^4.1.1"
debug "^4.1.1"
globby "^11.0.1"
globby "^11.0.1"
is-glob "^4.0.1"
is-glob "^4.0.1"
...
@@ -1740,18 +1741,18 @@
...
@@ -1740,18 +1741,18 @@
semver "^7.3.2"
semver "^7.3.2"
tsutils "^3.17.1"
tsutils "^3.17.1"
"@typescript-eslint/visitor-keys@4.1
2
.0":
"@typescript-eslint/visitor-keys@4.1
3
.0":
version "4.1
2
.0"
version "4.1
3
.0"
resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.1
2.0.tgz#a470a79be6958075fa91c725371a83baf428a67a
"
resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.1
3.0.tgz#9acb1772d3b3183182b6540d3734143dce9476fe
"
integrity sha512-
hVpsLARbDh4B9TKYz5cLbcdMIOAoBYgFPCSP9FFS/liSF+b33gVNq8JHY3QGhHNVz85hObvL7BEYLlgx553WCw
==
integrity sha512-
6RoxWK05PAibukE7jElqAtNMq+RWZyqJ6Q/GdIxaiUj2Ept8jh8+FUVlbq9WxMYxkmEOPvCE5cRSyupMpwW31g
==
dependencies:
dependencies:
"@typescript-eslint/types" "4.1
2
.0"
"@typescript-eslint/types" "4.1
3
.0"
eslint-visitor-keys "^2.0.0"
eslint-visitor-keys "^2.0.0"
"@vitejs/plugin-legacy@^1.
1.1
":
"@vitejs/plugin-legacy@^1.
2.0
":
version "1.
1.1
"
version "1.
2.0
"
resolved "https://registry.npmjs.org/@vitejs/plugin-legacy/-/plugin-legacy-1.
1.1.tgz#bb53847308d9c7b175d522a35e112f0351601742
"
resolved "https://registry.npmjs.org/@vitejs/plugin-legacy/-/plugin-legacy-1.
2.0.tgz#e6a2f7802f1a81c712f72656300fcdf7541eeab0
"
integrity sha512-
C9WQXawRJhsm8ZiV9HGHMrP4fSMJLvjcjHyP/ruRkXHIqO4Sth7XfGinPLM8Ypeam+Tl+eXlDsAXQS2hF+L7iA
==
integrity sha512-
eoJi1M7Or16bkRjXFtdG39c8ElvbgxUxlXFo8GO2VmgOGO42r6Ku5MJD4ZkweIM7XGunyFvmEwTYgpUVC4PiPg
==
dependencies:
dependencies:
"@babel/standalone" "^7.12.12"
"@babel/standalone" "^7.12.12"
core-js "^3.8.2"
core-js "^3.8.2"
...
@@ -7834,10 +7835,10 @@ vite-plugin-pwa@^0.3.5:
...
@@ -7834,10 +7835,10 @@ vite-plugin-pwa@^0.3.5:
pretty-bytes "^5.5.0"
pretty-bytes "^5.5.0"
workbox-build "^6.0.2"
workbox-build "^6.0.2"
vite@^2.0.0-beta.2
1
:
vite@^2.0.0-beta.2
2
:
version "2.0.0-beta.2
1
"
version "2.0.0-beta.2
2
"
resolved "https://registry.npmjs.org/vite/-/vite-2.0.0-beta.2
1.tgz#9a7233c93ed59c5b5de28c3a74f1e94b815d746e
"
resolved "https://registry.npmjs.org/vite/-/vite-2.0.0-beta.2
2.tgz#c33a4689fe1659bfdc87a36b9e8527baea0e3119
"
integrity sha512-
B6OhGHwh4DTkDBxZXtGhxmDkK75M3o0sKFz/cfZ2bdqxRze870sJgH66kPuYWjgSVDdPz0NTIKBaxrbcA8wwmw
==
integrity sha512-
Mj9qTSYx0625htRTClQV4OLQhjhujgHCV/FStGNu8G9NcHp3MP56gc6+UoRgQzrAsK8HI9MKfcW+NFgljoJKyA
==
dependencies:
dependencies:
esbuild "^0.8.26"
esbuild "^0.8.26"
postcss "^8.2.1"
postcss "^8.2.1"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment