-
+
+
-
diff --git a/src/pages/index/views/example-demo/example-dialog/index.vue b/src/pages/index/views/example-demo/example-dialog/index.vue
index ef2a8df..b5303d8 100644
--- a/src/pages/index/views/example-demo/example-dialog/index.vue
+++ b/src/pages/index/views/example-demo/example-dialog/index.vue
@@ -78,31 +78,31 @@ const searchData = [
const columns = [
{
- key: 'title',
+ field: 'title',
label: '标题',
showOverflowTooltip: true
},
{
- key: 'author',
+ field: 'author',
label: '作者'
},
{
- key: 'display_time',
+ field: 'display_time',
label: '创建时间'
},
{
- key: 'importance',
+ field: 'importance',
label: '重要性',
slots: {
default: 'importance'
}
},
{
- key: 'pageviews',
+ field: 'pageviews',
label: '阅读数'
},
{
- key: 'action',
+ field: 'action',
label: '操作',
width: '150px',
slots: {
diff --git a/src/pages/index/views/example-demo/example-page/index.vue b/src/pages/index/views/example-demo/example-page/index.vue
index dfa7b99..bcca963 100644
--- a/src/pages/index/views/example-demo/example-page/index.vue
+++ b/src/pages/index/views/example-demo/example-page/index.vue
@@ -74,31 +74,31 @@ const searchData = [
const columns = [
{
- key: 'title',
+ field: 'title',
label: '标题',
showOverflowTooltip: true
},
{
- key: 'author',
+ field: 'author',
label: '作者'
},
{
- key: 'display_time',
+ field: 'display_time',
label: '创建时间'
},
{
- key: 'importance',
+ field: 'importance',
label: '重要性',
slots: {
default: 'importance'
}
},
{
- key: 'pageviews',
+ field: 'pageviews',
label: '阅读数'
},
{
- key: 'action',
+ field: 'action',
label: '操作',
width: '150px',
slots: {
diff --git a/src/pages/index/views/login/index.vue b/src/pages/index/views/login/index.vue
index 04cdef4..8ae232d 100644
--- a/src/pages/index/views/login/index.vue
+++ b/src/pages/index/views/login/index.vue
@@ -96,11 +96,11 @@ export default defineComponent({
passWord: [{ required: true, message: '请输入密码' }]
})
async function login(): Promise
{
- const form = unref(loginForm) as any
- if (!form) return
+ const formWrap = unref(loginForm) as any
+ if (!formWrap) return
loading.value = true
try {
- form.validate((valid: boolean) => {
+ formWrap.validate((valid: boolean) => {
if (valid) {
permissionStore.GenerateRoutes().then(() => {
permissionStore.addRouters.forEach(async(route: RouteRecordRaw) => {
diff --git a/src/pages/index/views/table-demo/basic-table/index.vue b/src/pages/index/views/table-demo/basic-table/index.vue
index 8fc89af..b40b09e 100644
--- a/src/pages/index/views/table-demo/basic-table/index.vue
+++ b/src/pages/index/views/table-demo/basic-table/index.vue
@@ -16,15 +16,15 @@ import { defineComponent, ref } from 'vue'
const columns = [
{
- key: 'date',
+ field: 'date',
label: '日期'
},
{
- key: 'name',
+ field: 'name',
label: '姓名'
},
{
- key: 'address',
+ field: 'address',
label: '地址'
}
]
diff --git a/src/pages/index/views/table-demo/border-table/index.vue b/src/pages/index/views/table-demo/border-table/index.vue
index 749bd71..345b41a 100644
--- a/src/pages/index/views/table-demo/border-table/index.vue
+++ b/src/pages/index/views/table-demo/border-table/index.vue
@@ -21,15 +21,15 @@ import { defineComponent, ref } from 'vue'
const columns = [
{
- key: 'date',
+ field: 'date',
label: '日期'
},
{
- key: 'name',
+ field: 'name',
label: '姓名'
},
{
- key: 'address',
+ field: 'address',
label: '地址'
}
]
diff --git a/src/pages/index/views/table-demo/custom-header/index.vue b/src/pages/index/views/table-demo/custom-header/index.vue
index bb57ae7..54ce7d4 100644
--- a/src/pages/index/views/table-demo/custom-header/index.vue
+++ b/src/pages/index/views/table-demo/custom-header/index.vue
@@ -39,15 +39,15 @@ import { defineComponent, ref } from 'vue'
const columns = [
{
- key: 'date',
+ field: 'date',
label: '日期'
},
{
- key: 'name',
+ field: 'name',
label: '姓名'
},
{
- key: 'action',
+ field: 'action',
slots: {
header: 'actionHeader',
default: 'action'
diff --git a/src/pages/index/views/table-demo/custom-index/index.vue b/src/pages/index/views/table-demo/custom-index/index.vue
index c67d6c3..7c323cb 100644
--- a/src/pages/index/views/table-demo/custom-index/index.vue
+++ b/src/pages/index/views/table-demo/custom-index/index.vue
@@ -48,22 +48,22 @@ export default defineComponent({
const columns = ref([
{
- key: 'index',
+ field: 'index',
type: 'index',
index: (index: number) => {
return index * 2
}
},
{
- key: 'date',
+ field: 'date',
label: '日期'
},
{
- key: 'name',
+ field: 'name',
label: '姓名'
},
{
- key: 'address',
+ field: 'address',
label: '地址'
}
])
diff --git a/src/pages/index/views/table-demo/expand-row/index.vue b/src/pages/index/views/table-demo/expand-row/index.vue
index 708e322..f31b716 100644
--- a/src/pages/index/views/table-demo/expand-row/index.vue
+++ b/src/pages/index/views/table-demo/expand-row/index.vue
@@ -47,22 +47,22 @@ import { defineComponent, ref } from 'vue'
const columns = [
{
- key: 'id',
+ field: 'id',
type: 'expand',
slots: {
default: 'id'
}
},
{
- key: 'id',
+ field: 'id',
label: '商品ID'
},
{
- key: 'name',
+ field: 'name',
label: '商品名称'
},
{
- key: 'desc',
+ field: 'desc',
label: '描述'
}
]
diff --git a/src/pages/index/views/table-demo/fixed-column-header/index.vue b/src/pages/index/views/table-demo/fixed-column-header/index.vue
index c3a437a..7db336c 100644
--- a/src/pages/index/views/table-demo/fixed-column-header/index.vue
+++ b/src/pages/index/views/table-demo/fixed-column-header/index.vue
@@ -28,38 +28,38 @@ import { defineComponent, ref } from 'vue'
const columns = [
{
- key: 'date',
+ field: 'date',
label: '日期',
fixed: true,
width: '150'
},
{
- key: 'name',
+ field: 'name',
label: '姓名',
width: '120'
},
{
- key: 'province',
+ field: 'province',
label: '省份',
width: '120'
},
{
- key: 'city',
+ field: 'city',
label: '市区',
width: '120'
},
{
- key: 'address',
+ field: 'address',
label: '地址',
width: '300'
},
{
- key: 'zip',
+ field: 'zip',
label: '邮编',
width: '120'
},
{
- key: 'action',
+ field: 'action',
label: '操作',
width: '100',
fixed: 'right',
diff --git a/src/pages/index/views/table-demo/fixed-column/index.vue b/src/pages/index/views/table-demo/fixed-column/index.vue
index 8fc3361..5a8195e 100644
--- a/src/pages/index/views/table-demo/fixed-column/index.vue
+++ b/src/pages/index/views/table-demo/fixed-column/index.vue
@@ -27,38 +27,38 @@ import { defineComponent, ref } from 'vue'
const columns = [
{
- key: 'date',
+ field: 'date',
label: '日期',
fixed: true,
width: '150'
},
{
- key: 'name',
+ field: 'name',
label: '姓名',
width: '120'
},
{
- key: 'province',
+ field: 'province',
label: '省份',
width: '120'
},
{
- key: 'city',
+ field: 'city',
label: '市区',
width: '120'
},
{
- key: 'address',
+ field: 'address',
label: '地址',
width: '300'
},
{
- key: 'zip',
+ field: 'zip',
label: '邮编',
width: '120'
},
{
- key: 'action',
+ field: 'action',
label: '操作',
width: '100',
fixed: 'right',
diff --git a/src/pages/index/views/table-demo/fixed-header/index.vue b/src/pages/index/views/table-demo/fixed-header/index.vue
index fea7ef7..397738d 100644
--- a/src/pages/index/views/table-demo/fixed-header/index.vue
+++ b/src/pages/index/views/table-demo/fixed-header/index.vue
@@ -22,15 +22,15 @@ import { defineComponent, ref } from 'vue'
const columns = [
{
- key: 'date',
+ field: 'date',
label: '日期'
},
{
- key: 'name',
+ field: 'name',
label: '姓名'
},
{
- key: 'address',
+ field: 'address',
label: '地址'
}
]
diff --git a/src/pages/index/views/table-demo/fluid-height/index.vue b/src/pages/index/views/table-demo/fluid-height/index.vue
index d6926ba..087561a 100644
--- a/src/pages/index/views/table-demo/fluid-height/index.vue
+++ b/src/pages/index/views/table-demo/fluid-height/index.vue
@@ -27,38 +27,38 @@ import { defineComponent, ref } from 'vue'
const columns = [
{
- key: 'date',
+ field: 'date',
label: '日期',
fixed: true,
width: '150'
},
{
- key: 'name',
+ field: 'name',
label: '姓名',
width: '120'
},
{
- key: 'province',
+ field: 'province',
label: '省份',
width: '120'
},
{
- key: 'city',
+ field: 'city',
label: '市区',
width: '120'
},
{
- key: 'address',
+ field: 'address',
label: '地址',
width: '300'
},
{
- key: 'zip',
+ field: 'zip',
label: '邮编',
width: '120'
},
{
- key: 'action',
+ field: 'action',
label: '操作',
width: '100',
fixed: 'right',
diff --git a/src/pages/index/views/table-demo/merge-table/index.vue b/src/pages/index/views/table-demo/merge-table/index.vue
index bd29260..1071e9c 100644
--- a/src/pages/index/views/table-demo/merge-table/index.vue
+++ b/src/pages/index/views/table-demo/merge-table/index.vue
@@ -31,25 +31,25 @@ import { defineComponent, ref } from 'vue'
const columns = [
{
- key: 'id',
+ field: 'id',
label: 'ID'
},
{
- key: 'name',
+ field: 'name',
label: '姓名'
},
{
- key: 'amount1',
+ field: 'amount1',
label: '数值1',
sortable: true
},
{
- key: 'amount2',
+ field: 'amount2',
label: '数值2',
sortable: true
},
{
- key: 'amount3',
+ field: 'amount3',
label: '数值4',
sortable: true
}
@@ -57,23 +57,23 @@ const columns = [
const columns1 = [
{
- key: 'id',
+ field: 'id',
label: 'ID'
},
{
- key: 'name',
+ field: 'name',
label: '姓名'
},
{
- key: 'amount1',
+ field: 'amount1',
label: '数值1(元)'
},
{
- key: 'amount2',
+ field: 'amount2',
label: '数值2(元)'
},
{
- key: 'amount3',
+ field: 'amount3',
label: '数值4(元)'
}
]
diff --git a/src/pages/index/views/table-demo/multi-header/index.vue b/src/pages/index/views/table-demo/multi-header/index.vue
index f303f2a..70eb683 100644
--- a/src/pages/index/views/table-demo/multi-header/index.vue
+++ b/src/pages/index/views/table-demo/multi-header/index.vue
@@ -27,7 +27,7 @@ import { defineComponent, ref } from 'vue'
const columns = [
{
- key: 'date',
+ field: 'date',
label: '日期',
fixed: true,
width: '150'
@@ -36,7 +36,7 @@ const columns = [
label: '配送信息',
children: [
{
- key: 'name',
+ field: 'name',
label: '姓名',
width: '120'
},
@@ -44,24 +44,24 @@ const columns = [
label: '地址',
children: [
{
- key: 'province',
+ field: 'province',
label: '省份',
width: '120'
},
{
- key: 'city',
+ field: 'city',
label: '市区',
width: '120'
},
{
- key: 'address',
+ field: 'address',
label: '地址',
slots: {
default: 'address'
}
},
{
- key: 'zip',
+ field: 'zip',
label: '邮编',
width: '120'
}
@@ -70,7 +70,7 @@ const columns = [
]
},
{
- key: 'action',
+ field: 'action',
label: '操作',
width: '100',
slots: {
diff --git a/src/pages/index/views/table-demo/multiple-choice/index.vue b/src/pages/index/views/table-demo/multiple-choice/index.vue
index 4cc0c3f..2f036cf 100644
--- a/src/pages/index/views/table-demo/multiple-choice/index.vue
+++ b/src/pages/index/views/table-demo/multiple-choice/index.vue
@@ -28,15 +28,15 @@ import { defineComponent, ref, unref } from 'vue'
const columns = [
{
- key: 'date',
+ field: 'date',
label: '日期'
},
{
- key: 'name',
+ field: 'name',
label: '姓名'
},
{
- key: 'address',
+ field: 'address',
label: '地址'
}
]
diff --git a/src/pages/index/views/table-demo/page-table/index.vue b/src/pages/index/views/table-demo/page-table/index.vue
index c793576..9a8569f 100644
--- a/src/pages/index/views/table-demo/page-table/index.vue
+++ b/src/pages/index/views/table-demo/page-table/index.vue
@@ -26,15 +26,15 @@ import { defineComponent, ref } from 'vue'
const columns = [
{
- key: 'date',
+ field: 'date',
label: '日期'
},
{
- key: 'name',
+ field: 'name',
label: '姓名'
},
{
- key: 'address',
+ field: 'address',
label: '地址'
}
]
diff --git a/src/pages/index/views/table-demo/screen-table/index.vue b/src/pages/index/views/table-demo/screen-table/index.vue
index 8270d30..4d0cbde 100644
--- a/src/pages/index/views/table-demo/screen-table/index.vue
+++ b/src/pages/index/views/table-demo/screen-table/index.vue
@@ -12,7 +12,7 @@
([
{
- key: 'date',
+ field: 'date',
label: '日期',
sortable: true,
width: '180',
- columnKey: 'date',
+ columnfield: 'date',
filters: [{ text: '2016-05-01', value: '2016-05-01' }, { text: '2016-05-02', value: '2016-05-02' }, { text: '2016-05-03', value: '2016-05-03' }, { text: '2016-05-04', value: '2016-05-04' }],
filterMethod: filterHandler
},
{
- key: 'name',
+ field: 'name',
label: '姓名',
sortable: true
},
{
- key: 'address',
+ field: 'address',
label: '地址'
},
{
- key: 'tag',
+ field: 'tag',
label: '标签',
filters: [{ text: '家', value: '家' }, { text: '公司', value: '公司' }],
filterMethod: filterTag,
diff --git a/src/pages/index/views/table-demo/single-choice/index.vue b/src/pages/index/views/table-demo/single-choice/index.vue
index fa433d5..d5c21ac 100644
--- a/src/pages/index/views/table-demo/single-choice/index.vue
+++ b/src/pages/index/views/table-demo/single-choice/index.vue
@@ -28,15 +28,15 @@ import { defineComponent, ref, unref } from 'vue'
const columns = [
{
- key: 'date',
+ field: 'date',
label: '日期'
},
{
- key: 'name',
+ field: 'name',
label: '姓名'
},
{
- key: 'address',
+ field: 'address',
label: '地址'
}
]
diff --git a/src/pages/index/views/table-demo/sort-table/index.vue b/src/pages/index/views/table-demo/sort-table/index.vue
index 5156dfe..82af451 100644
--- a/src/pages/index/views/table-demo/sort-table/index.vue
+++ b/src/pages/index/views/table-demo/sort-table/index.vue
@@ -22,17 +22,17 @@ import { defineComponent, ref } from 'vue'
const columns = [
{
- key: 'date',
+ field: 'date',
label: '日期',
sortable: true
},
{
- key: 'name',
+ field: 'name',
label: '姓名',
sortable: true
},
{
- key: 'address',
+ field: 'address',
label: '地址'
}
]
diff --git a/src/pages/index/views/table-demo/state-table/index.vue b/src/pages/index/views/table-demo/state-table/index.vue
index d47b459..e735110 100644
--- a/src/pages/index/views/table-demo/state-table/index.vue
+++ b/src/pages/index/views/table-demo/state-table/index.vue
@@ -21,15 +21,15 @@ import { defineComponent, ref } from 'vue'
const columns = [
{
- key: 'date',
+ field: 'date',
label: '日期'
},
{
- key: 'name',
+ field: 'name',
label: '姓名'
},
{
- key: 'address',
+ field: 'address',
label: '地址'
}
]
diff --git a/src/pages/index/views/table-demo/stripe-table/index.vue b/src/pages/index/views/table-demo/stripe-table/index.vue
index 61f880e..07424c4 100644
--- a/src/pages/index/views/table-demo/stripe-table/index.vue
+++ b/src/pages/index/views/table-demo/stripe-table/index.vue
@@ -21,15 +21,15 @@ import { defineComponent, ref } from 'vue'
const columns = [
{
- key: 'date',
+ field: 'date',
label: '日期'
},
{
- key: 'name',
+ field: 'name',
label: '姓名'
},
{
- key: 'address',
+ field: 'address',
label: '地址'
}
]
diff --git a/src/pages/index/views/table-demo/test/table.vue b/src/pages/index/views/table-demo/test/table.vue
index 430d376..4c04ebb 100644
--- a/src/pages/index/views/table-demo/test/table.vue
+++ b/src/pages/index/views/table-demo/test/table.vue
@@ -1,20 +1,20 @@
-
+
setSelectedKeys(e.target.value ? [e.target.value] : [])"
- @pressEnter="handleSearch(selectedKeys, confirm, column.dataIndex)"
+ @change="e => setSelectedfields(e.target.value ? [e.target.value] : [])"
+ @pressEnter="handleSearch(selectedfields, confirm, column.dataIndex)"
/>
Search
@@ -51,25 +51,25 @@
import { SearchOutlined } from '@ant-design/icons-vue';
const data = [
{
- key: '1',
+ field: '1',
name: 'John Brown',
age: 32,
address: 'New York No. 1 Lake Park',
},
{
- key: '2',
+ field: '2',
name: 'Joe Black',
age: 42,
address: 'London No. 1 Lake Park',
},
{
- key: '3',
+ field: '3',
name: 'Jim Green',
age: 32,
address: 'Sidney No. 1 Lake Park',
},
{
- key: '4',
+ field: '4',
name: 'Jim Red',
age: 32,
address: 'London No. 2 Lake Park',
@@ -90,7 +90,7 @@ export default {
{
title: 'Name',
dataIndex: 'name',
- key: 'name',
+ field: 'name',
slots: {
filterDropdown: 'filterDropdown',
filterIcon: 'filterIcon',
@@ -113,7 +113,7 @@ export default {
{
title: 'Age',
dataIndex: 'age',
- key: 'age',
+ field: 'age',
slots: {
filterDropdown: 'filterDropdown',
filterIcon: 'filterIcon',
@@ -135,7 +135,7 @@ export default {
{
title: 'Address',
dataIndex: 'address',
- key: 'address',
+ field: 'address',
slots: {
filterDropdown: 'filterDropdown',
filterIcon: 'filterIcon',
@@ -158,10 +158,10 @@ export default {
};
},
methods: {
- handleSearch(selectedKeys, confirm, dataIndex) {
+ handleSearch(selectedfields, confirm, dataIndex) {
confirm();
- console.log(selectedKeys[0]);
- this.searchText = selectedKeys[0];
+ console.log(selectedfields[0]);
+ this.searchText = selectedfields[0];
this.searchedColumn = dataIndex;
this.$forceUpdate();
},
diff --git a/src/pages/index/views/table-demo/test/table2.tsx b/src/pages/index/views/table-demo/test/table2.tsx
index eb17acb..3fe194e 100644
--- a/src/pages/index/views/table-demo/test/table2.tsx
+++ b/src/pages/index/views/table-demo/test/table2.tsx
@@ -4,38 +4,38 @@ import { defineComponent } from 'vue'
const columns = [
{
dataIndex: 'name',
- key: 'name',
+ field: 'name',
// slots: { title: 'customTitle', customRender: 'name' }
},
{
title: 'Age',
dataIndex: 'age',
- key: 'age'
+ field: 'age'
},
{
title: 'Address',
dataIndex: 'address',
- key: 'address'
+ field: 'address'
}
]
const data = [
{
- key: '1',
+ field: '1',
name: 'John Brown',
age: 32,
address: 'New York No. 1 Lake Park',
tags: ['nice', 'developer']
},
{
- key: '2',
+ field: '2',
name: 'Jim Green',
age: 42,
address: 'London No. 1 Lake Park',
tags: ['loser']
},
{
- key: '3',
+ field: '3',
name: 'Joe Black',
age: 32,
address: 'Sidney No. 1 Lake Park',
diff --git a/src/pages/index/views/table-demo/total-table/index.vue b/src/pages/index/views/table-demo/total-table/index.vue
index 66c6042..fea5442 100644
--- a/src/pages/index/views/table-demo/total-table/index.vue
+++ b/src/pages/index/views/table-demo/total-table/index.vue
@@ -33,25 +33,25 @@ import { defineComponent, ref } from 'vue'
const columns = [
{
- key: 'id',
+ field: 'id',
label: 'ID'
},
{
- key: 'name',
+ field: 'name',
label: '姓名'
},
{
- key: 'amount1',
+ field: 'amount1',
label: '数值1',
sortable: true
},
{
- key: 'amount2',
+ field: 'amount2',
label: '数值2',
sortable: true
},
{
- key: 'amount3',
+ field: 'amount3',
label: '数值4',
sortable: true
}
@@ -59,23 +59,23 @@ const columns = [
const columns1 = [
{
- key: 'id',
+ field: 'id',
label: 'ID'
},
{
- key: 'name',
+ field: 'name',
label: '姓名'
},
{
- key: 'amount1',
+ field: 'amount1',
label: '数值1(元)'
},
{
- key: 'amount2',
+ field: 'amount2',
label: '数值2(元)'
},
{
- key: 'amount3',
+ field: 'amount3',
label: '数值4(元)'
}
]
diff --git a/src/pages/index/views/table-demo/tree-and-load/index.vue b/src/pages/index/views/table-demo/tree-and-load/index.vue
index c598817..cf23550 100644
--- a/src/pages/index/views/table-demo/tree-and-load/index.vue
+++ b/src/pages/index/views/table-demo/tree-and-load/index.vue
@@ -11,7 +11,7 @@
v-loading="loading"
:columns="columns"
:data="tableData"
- row-key="id"
+ row-field="id"
border
default-expand-all
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
@@ -21,7 +21,7 @@
v-loading="loading"
:columns="columns1"
:data="tableData1"
- row-key="id"
+ row-field="id"
border
lazy
:load="load"
@@ -36,32 +36,32 @@ import { defineComponent, ref } from 'vue'
const columns = [
{
- key: 'date',
+ field: 'date',
label: '日期',
sortable: true
},
{
- key: 'name',
+ field: 'name',
label: '姓名',
sortable: true
},
{
- key: 'address',
+ field: 'address',
label: '地址'
}
]
const columns1 = [
{
- key: 'date',
+ field: 'date',
label: '日期'
},
{
- key: 'name',
+ field: 'name',
label: '姓名'
},
{
- key: 'address',
+ field: 'address',
label: '地址'
}
]
diff --git a/src/styles/glob.less b/src/styles/glob.less
index 07e5d44..d2b235c 100644
--- a/src/styles/glob.less
+++ b/src/styles/glob.less
@@ -1,3 +1,4 @@
+// 悬停样式
.hover-effect {
cursor: pointer;
transition: background .3s;
@@ -5,6 +6,16 @@
background: rgba(0, 0, 0, .025);
}
}
+// 悬停样式
+
+// 必填样式
+.is-required-item::before {
+ content: "*";
+ color: #F56C6C;
+ margin-right: 4px;
+}
+// 必填样式
+
// 综合实例样式
.search__example--wrap {