mirror of
https://github.com/vbenjs/vue-vben-admin.git
synced 2025-08-26 08:36:19 +08:00
fix(table): fix table type error
This commit is contained in:
56
.vscode/settings.json
vendored
56
.vscode/settings.json
vendored
@@ -136,6 +136,7 @@
|
|||||||
"vetur.format.defaultFormatter.scss": "prettier", // 使用js-beautify-html格式化
|
"vetur.format.defaultFormatter.scss": "prettier", // 使用js-beautify-html格式化
|
||||||
"vetur.format.defaultFormatter.css": "prettier", // 使用js-beautify-html格式化
|
"vetur.format.defaultFormatter.css": "prettier", // 使用js-beautify-html格式化
|
||||||
// "vetur.format.defaultFormatter.html": "prettyhtml",
|
// "vetur.format.defaultFormatter.html": "prettyhtml",
|
||||||
|
"vetur.format.defaultFormatter.ts": "prettier-tslint",
|
||||||
"vetur.format.defaultFormatter.js": "prettier",
|
"vetur.format.defaultFormatter.js": "prettier",
|
||||||
// "vetur.useWorkspaceDependencies": true,
|
// "vetur.useWorkspaceDependencies": true,
|
||||||
"vetur.format.defaultFormatterOptions": {
|
"vetur.format.defaultFormatterOptions": {
|
||||||
@@ -150,22 +151,6 @@
|
|||||||
"singleQuote": true // 使用单引号, 默认false(在jsx中配置无效, 默认都是双引号)
|
"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 =================
|
//============= Code Runner =================
|
||||||
@@ -186,40 +171,7 @@
|
|||||||
"prettier.requireConfig": true,
|
"prettier.requireConfig": true,
|
||||||
"typescript.updateImportsOnFileMove.enabled": "always",
|
"typescript.updateImportsOnFileMove.enabled": "always",
|
||||||
"workbench.sideBar.location": "left",
|
"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]": {
|
"[javascriptreact]": {
|
||||||
"editor.defaultFormatter": "esbenp.prettier-vscode"
|
"editor.defaultFormatter": "esbenp.prettier-vscode"
|
||||||
},
|
},
|
||||||
@@ -250,9 +202,7 @@
|
|||||||
"[markdown]": {
|
"[markdown]": {
|
||||||
"editor.defaultFormatter": "esbenp.prettier-vscode"
|
"editor.defaultFormatter": "esbenp.prettier-vscode"
|
||||||
},
|
},
|
||||||
"cSpell.words": [
|
|
||||||
"yfboilerplate"
|
|
||||||
],
|
|
||||||
"editor.codeActionsOnSave": {
|
"editor.codeActionsOnSave": {
|
||||||
"source.fixAll.eslint": true
|
"source.fixAll.eslint": true
|
||||||
}
|
}
|
||||||
|
@@ -11,6 +11,7 @@
|
|||||||
- 更新`ant-design-vue`版本为`beta13`
|
- 更新`ant-design-vue`版本为`beta13`
|
||||||
- 更新`vite`版本为`rc.9`
|
- 更新`vite`版本为`rc.9`
|
||||||
- 异常页调整
|
- 异常页调整
|
||||||
|
- `BasicTitle` Color blocks are not displayed by default
|
||||||
|
|
||||||
### 🐛 Bug Fixes
|
### 🐛 Bug Fixes
|
||||||
|
|
||||||
|
@@ -21,7 +21,7 @@
|
|||||||
},
|
},
|
||||||
showSpan: {
|
showSpan: {
|
||||||
type: Boolean as PropType<boolean>,
|
type: Boolean as PropType<boolean>,
|
||||||
default: true,
|
default: false,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
setup() {
|
setup() {
|
||||||
|
@@ -6,6 +6,7 @@ import { Input } from 'ant-design-vue';
|
|||||||
|
|
||||||
import zxcvbn from 'zxcvbn';
|
import zxcvbn from 'zxcvbn';
|
||||||
import { extendSlots } from '/@/utils/helper/tsxHelper';
|
import { extendSlots } from '/@/utils/helper/tsxHelper';
|
||||||
|
|
||||||
import './index.less';
|
import './index.less';
|
||||||
const prefixCls = 'strength-meter';
|
const prefixCls = 'strength-meter';
|
||||||
export default defineComponent({
|
export default defineComponent({
|
||||||
|
@@ -219,7 +219,7 @@
|
|||||||
pagination: PaginationProps,
|
pagination: PaginationProps,
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
filters: Partial<Record<string, string[]>>,
|
filters: Partial<Record<string, string[]>>,
|
||||||
sorter: SorterResult<any>
|
sorter: SorterResult
|
||||||
) {
|
) {
|
||||||
const { clearSelectOnPageChange, sortFn } = unref(getMergeProps);
|
const { clearSelectOnPageChange, sortFn } = unref(getMergeProps);
|
||||||
if (clearSelectOnPageChange) {
|
if (clearSelectOnPageChange) {
|
||||||
|
@@ -26,17 +26,12 @@ export function tryOnMounted(fn: () => void, sync = true) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function tryOnUnmounted(fn: () => Promise<void> | void) {
|
export function tryOnUnmounted(fn: () => Promise<void> | void) {
|
||||||
if (getCurrentInstance()) {
|
getCurrentInstance() && onUnmounted(fn);
|
||||||
onUnmounted(fn);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export function tryTsxEmit(fn: (_instance: any) => Promise<void> | void) {
|
export function tryTsxEmit(fn: (_instance: any) => Promise<void> | void) {
|
||||||
const instance = getCurrentInstance();
|
const instance = getCurrentInstance();
|
||||||
|
instance && fn.call(null, instance);
|
||||||
if (instance) {
|
|
||||||
fn.call(null, instance);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export function isInSetup() {
|
export function isInSetup() {
|
||||||
|
Reference in New Issue
Block a user