diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 609f607..4367b1c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,7 +1,7 @@ on: push: branches: - - master + - release name: Release diff --git a/mock/role/index.ts b/mock/role/index.ts index 477806b..e871a80 100644 --- a/mock/role/index.ts +++ b/mock/role/index.ts @@ -147,7 +147,15 @@ const adminList = [ component: 'views/Components/Table/TreeTable', name: 'TreeTable', meta: { - title: 'TreeTable' + title: 'router.TreeTable' + } + }, + { + path: 'table-image-preview', + component: 'views/Components/Table/TableImagePreview', + name: 'TableImagePreview', + meta: { + title: 'router.PicturePreview' } }, { @@ -490,6 +498,7 @@ const testList: string[] = [ '/components/table/default-table', '/components/table/use-table', '/components/table/tree-table', + '/components/table/table-image-preview', '/components/table/ref-table', '/components/editor-demo', '/components/editor-demo/editor', diff --git a/mock/table/index.ts b/mock/table/index.ts index 267b835..04a3d78 100644 --- a/mock/table/index.ts +++ b/mock/table/index.ts @@ -20,6 +20,7 @@ interface ListProps { importance: number display_time: string pageviews: number + image_uri: string } interface TreeListProps { @@ -45,8 +46,8 @@ for (let i = 0; i < count; i++) { content: baseContent, importance: '@integer(1, 3)', display_time: '@datetime', - pageviews: '@integer(300, 5000)' - // image_uri + pageviews: '@integer(300, 5000)', + image_uri: Mock.Random.image('@integer(300, 5000)x@integer(300, 5000)') }) ) } diff --git a/package.json b/package.json index ad26cae..96e1af1 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,7 @@ "pinia-plugin-persist": "^1.0.0", "qrcode": "^1.5.3", "qs": "^6.11.2", + "sortablejs": "^1.15.0", "url": "^0.11.1", "vue": "3.3.4", "vue-i18n": "9.2.2", @@ -66,6 +67,7 @@ "@types/nprogress": "^0.2.0", "@types/qrcode": "^1.5.1", "@types/qs": "^6.9.7", + "@types/sortablejs": "^1.15.1", "@typescript-eslint/eslint-plugin": "^6.1.0", "@typescript-eslint/parser": "^6.1.0", "@unocss/transformer-variant-group": "^0.53.5", diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue index 0c3ca18..bd2c756 100644 --- a/src/components/Form/src/Form.vue +++ b/src/components/Form/src/Form.vue @@ -78,7 +78,7 @@ export default defineComponent({ validateOnRuleChange: propTypes.bool.def(true), size: { type: String as PropType, - default: 'small' + default: undefined }, disabled: propTypes.bool.def(false), scrollToError: propTypes.bool.def(false), diff --git a/src/components/InputPassword/src/InputPassword.vue b/src/components/InputPassword/src/InputPassword.vue index 55a9ba1..87c9944 100644 --- a/src/components/InputPassword/src/InputPassword.vue +++ b/src/components/InputPassword/src/InputPassword.vue @@ -104,7 +104,9 @@ const getPasswordStrength = computed(() => { height: inherit; background-color: transparent; border-radius: inherit; - transition: width 0.5s ease-in-out, background 0.25s; + transition: + width 0.5s ease-in-out, + background 0.25s; &[data-score='0'] { width: 20%; diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue index 30ecf9e..8af37b5 100644 --- a/src/components/Table/src/Table.vue +++ b/src/components/Table/src/Table.vue @@ -1,6 +1,13 @@ + + diff --git a/src/views/Components/Table/TreeTable.vue b/src/views/Components/Table/TreeTable.vue index dfb1293..ea494c5 100644 --- a/src/views/Components/Table/TreeTable.vue +++ b/src/views/Components/Table/TreeTable.vue @@ -92,7 +92,7 @@ const actionFn = (data: TableSlotDefault) => {