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
db0bfc88
Commit
db0bfc88
authored
Nov 04, 2020
by
vben
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(table): fix table type error
parent
6d9585b4
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
62 deletions
+9
-62
settings.json
.vscode/settings.json
+3
-53
CHANGELOG.zh_CN.md
CHANGELOG.zh_CN.md
+1
-0
BasicTitle.vue
src/components/Basic/src/BasicTitle.vue
+1
-1
index.tsx
src/components/StrengthMeter/index.tsx
+1
-0
BasicTable.vue
src/components/Table/src/BasicTable.vue
+1
-1
vueHelper.ts
src/utils/helper/vueHelper.ts
+2
-7
No files found.
.vscode/settings.json
View file @
db0bfc88
...
...
@@ -136,6 +136,7 @@
"vetur.format.defaultFormatter.scss"
:
"prettier"
,
//
使用js-beautify-html格式化
"vetur.format.defaultFormatter.css"
:
"prettier"
,
//
使用js-beautify-html格式化
//
"vetur.format.defaultFormatter.html"
:
"prettyhtml"
,
"vetur.format.defaultFormatter.ts"
:
"prettier-tslint"
,
"vetur.format.defaultFormatter.js"
:
"prettier"
,
//
"vetur.useWorkspaceDependencies"
:
true
,
"vetur.format.defaultFormatterOptions"
:
{
...
...
@@ -150,22 +151,6 @@
"singleQuote"
:
true
//
使用单引号
,
默认
false
(在jsx中配置无效
,
默认都是双引号)
}
},
//
===========================================
//
=============
Material
Icon
Theme
=========
//
===========================================
"workbench.iconTheme"
:
"material-icon-theme"
,
//
主题色
//
===========================================
//
=============
stylus
Supremacy
============
//
===========================================
"stylusSupremacy.insertColons"
:
false
,
//
是否插入冒号
"stylusSupremacy.insertSemicolons"
:
false
,
//
是否插入分号
"stylusSupremacy.insertBraces"
:
false
,
//
是否插入大括号
//===========================================
//=============
koroFileHeaders
===============
//===========================================
"fileheader.configObj"
:
{
"autoAdd"
:
false
//
将该选项设置为
true
即可开启
},
//
函数注释
//===========================================
//=============
Code
Runner
=================
...
...
@@ -186,40 +171,7 @@
"prettier.requireConfig"
:
true
,
"typescript.updateImportsOnFileMove.enabled"
:
"always"
,
"workbench.sideBar.location"
:
"left"
,
"cSpell.enabledLanguageIds"
:
[
"asciidoc"
,
"c"
,
"cpp"
,
"csharp"
,
"css"
,
"git-commit"
,
"go"
,
"handlebars"
,
"haskell"
,
"html"
,
"jade"
,
"java"
,
"javascript"
,
"javascriptreact"
,
"json"
,
"jsonc"
,
"latex"
,
"less"
,
"markdown"
,
"php"
,
"plaintext"
,
"pug"
,
"python"
,
"restructuredtext"
,
"rust"
,
"scala"
,
"scss"
,
"text"
,
"typescript"
,
"typescriptreact"
,
"yaml"
,
"yml"
],
"[javascriptreact]"
:
{
"editor.defaultFormatter"
:
"esbenp.prettier-vscode"
},
...
...
@@ -250,9 +202,7 @@
"[markdown]"
:
{
"editor.defaultFormatter"
:
"esbenp.prettier-vscode"
},
"cSpell.words"
:
[
"yfboilerplate"
],
"editor.codeActionsOnSave"
:
{
"source.fixAll.eslint"
:
true
}
...
...
CHANGELOG.zh_CN.md
View file @
db0bfc88
...
...
@@ -11,6 +11,7 @@
-
更新
`ant-design-vue`
版本为
`beta13`
-
更新
`vite`
版本为
`rc.9`
-
异常页调整
-
`BasicTitle`
Color blocks are not displayed by default
### 🐛 Bug Fixes
...
...
src/components/Basic/src/BasicTitle.vue
View file @
db0bfc88
...
...
@@ -21,7 +21,7 @@
},
showSpan
:
{
type
:
Boolean
as
PropType
<
boolean
>
,
default
:
tru
e
,
default
:
fals
e
,
},
},
setup
()
{
...
...
src/components/StrengthMeter/index.tsx
View file @
db0bfc88
...
...
@@ -6,6 +6,7 @@ import { Input } from 'ant-design-vue';
import
zxcvbn
from
'
zxcvbn
'
;
import
{
extendSlots
}
from
'
/@/utils/helper/tsxHelper
'
;
import
'
./index.less
'
;
const
prefixCls
=
'
strength-meter
'
;
export
default
defineComponent
({
...
...
src/components/Table/src/BasicTable.vue
View file @
db0bfc88
...
...
@@ -219,7 +219,7 @@
pagination
:
PaginationProps
,
// @ts-ignore
filters
:
Partial
<
Record
<
string
,
string
[]
>>
,
sorter
:
SorterResult
<
any
>
sorter
:
SorterResult
)
{
const
{
clearSelectOnPageChange
,
sortFn
}
=
unref
(
getMergeProps
);
if
(
clearSelectOnPageChange
)
{
...
...
src/utils/helper/vueHelper.ts
View file @
db0bfc88
...
...
@@ -26,17 +26,12 @@ export function tryOnMounted(fn: () => void, sync = true) {
}
export
function
tryOnUnmounted
(
fn
:
()
=>
Promise
<
void
>
|
void
)
{
if
(
getCurrentInstance
())
{
onUnmounted
(
fn
);
}
getCurrentInstance
()
&&
onUnmounted
(
fn
);
}
export
function
tryTsxEmit
(
fn
:
(
_instance
:
any
)
=>
Promise
<
void
>
|
void
)
{
const
instance
=
getCurrentInstance
();
if
(
instance
)
{
fn
.
call
(
null
,
instance
);
}
instance
&&
fn
.
call
(
null
,
instance
);
}
export
function
isInSetup
()
{
...
...
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