From 0109bcbfb976d0454c6f93c970034262f3bbc563 Mon Sep 17 00:00:00 2001 From: wangzhiqiang Date: Sat, 11 Jun 2022 15:05:21 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9gitgnore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index d451ff16..60a4aff1 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ node_modules dist dist-ssr *.local +.vscode From 87bc0aaced65be940cae48f341176d6c0ef6632e Mon Sep 17 00:00:00 2001 From: wangzhiqiang Date: Mon, 13 Jun 2022 11:52:02 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E4=BB=B6-=E6=95=B0?= =?UTF-8?q?=E5=AD=97=E7=BF=BB=E7=89=8C-=E5=A2=9E=E5=8A=A0=E7=B2=BE?= =?UTF-8?q?=E5=BA=A6=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/components/Decorates/Mores/Number/config.ts | 1 + src/packages/components/Decorates/Mores/Number/config.vue | 7 +++++++ src/packages/components/Decorates/Mores/Number/index.vue | 2 ++ 3 files changed, 10 insertions(+) diff --git a/src/packages/components/Decorates/Mores/Number/config.ts b/src/packages/components/Decorates/Mores/Number/config.ts index b9fd8920..c3a8b940 100644 --- a/src/packages/components/Decorates/Mores/Number/config.ts +++ b/src/packages/components/Decorates/Mores/Number/config.ts @@ -7,6 +7,7 @@ export const option = { from: 50000, to: 100000, dur: 3, + precision: 0, showSeparator: true, numberSize: 24, numberColor: '#4a9ef8', diff --git a/src/packages/components/Decorates/Mores/Number/config.vue b/src/packages/components/Decorates/Mores/Number/config.vue index f7114a30..c951ed5e 100644 --- a/src/packages/components/Decorates/Mores/Number/config.vue +++ b/src/packages/components/Decorates/Mores/Number/config.vue @@ -28,6 +28,13 @@ 展示分割符 + + + diff --git a/src/packages/components/Decorates/Mores/Number/index.vue b/src/packages/components/Decorates/Mores/Number/index.vue index b4ddfb13..ccf30bd3 100644 --- a/src/packages/components/Decorates/Mores/Number/index.vue +++ b/src/packages/components/Decorates/Mores/Number/index.vue @@ -11,6 +11,7 @@ :to="to" :duration="dur * 1000" :show-separator="showSeparator" + :precision="precision" > diff --git a/src/packages/components/Tables/Tables/TableScrollBoard/data.json b/src/packages/components/Tables/Tables/TableScrollBoard/data.js similarity index 95% rename from src/packages/components/Tables/Tables/TableScrollBoard/data.json rename to src/packages/components/Tables/Tables/TableScrollBoard/data.js index f9ffeab3..267c2ffc 100644 --- a/src/packages/components/Tables/Tables/TableScrollBoard/data.json +++ b/src/packages/components/Tables/Tables/TableScrollBoard/data.js @@ -1,4 +1,4 @@ -[ +export default [ ['行1列1', '行1列2', '行1列3'], ['行2列1', '行2列2', '行2列3'], ['行3列1', '行3列2', '行3列3'], diff --git a/src/packages/components/Tables/Tables/TableScrollBoard/index.ts b/src/packages/components/Tables/Tables/TableScrollBoard/index.ts index e2070edf..0ceb94bb 100644 --- a/src/packages/components/Tables/Tables/TableScrollBoard/index.ts +++ b/src/packages/components/Tables/Tables/TableScrollBoard/index.ts @@ -1,4 +1,4 @@ -import image from '@/assets/images/chart/tables/tables_list.png' +import image from '@/assets/images/chart/tables/table_scrollboard.png' import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d' import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' diff --git a/src/packages/components/Tables/Tables/TableScrollBoard/index.vue b/src/packages/components/Tables/Tables/TableScrollBoard/index.vue index 93f5e1bb..f029412e 100644 --- a/src/packages/components/Tables/Tables/TableScrollBoard/index.vue +++ b/src/packages/components/Tables/Tables/TableScrollBoard/index.vue @@ -10,7 +10,7 @@
+ :style="`height: ${h - (status.header.length ? status.mergedConfig.headerHeight : 0)}px;`">
${i + 1}` row.unshift(indexTag) return row }) } - data = data.map((ceils, i) => ({ ceils, rowIndex: i })) - const rowLength = data.length + dataset = dataset.map((ceils, i) => ({ ceils, rowIndex: i })) + const rowLength = dataset.length if (rowLength > rowNum && rowLength < 2 * rowNum) { - data = [...data, ...data] + dataset = [...dataset, ...dataset] } - data = data.map((d, i) => ({ ...d, scroll: i })) + dataset = dataset.map((d, i) => ({ ...d, scroll: i })) - status.rowsData = data - status.rows = data + status.rowsData = dataset + status.rows = dataset } const calcWidths = () => { const { mergedConfig, rowsData } = status const { columnWidth, header } = mergedConfig - const usedWidth = columnWidth.reduce((all, w) => all + w, 0) + const usedWidth = columnWidth.reduce((all, ws) => all + ws, 0) let columnNum = 0 if (rowsData[0]) { columnNum = rowsData[0].ceils.length } else if (header.length) { columnNum = header.length } - const avgWidth = (w - usedWidth) / (columnNum - columnWidth.length) + const avgWidth = (w.value - usedWidth) / (columnNum - columnWidth.length) const widths = new Array(columnNum).fill(avgWidth) status.widths = merge(widths, columnWidth) } const calcHeights = (onresize = false) => { const { mergedConfig, header } = status - const { headerHeight, rowNum, data } = mergedConfig - let allHeight = h + const { headerHeight, rowNum, dataset } = mergedConfig + let allHeight = h.value if (header.length) allHeight -= headerHeight const avgHeight = allHeight / rowNum status.avgHeight = avgHeight - if (!onresize) status.heights = new Array(data.length).fill(avgHeight) + if (!onresize) status.heights = new Array(dataset.length).fill(avgHeight) } const calcAligns = () => { @@ -253,13 +244,13 @@ const animation = async (start = false) => { calcHeights() status.needCalc = false } - let { avgHeight, animationIndex, mergedConfig, rowsData, updater } = status const { waitTime, carousel, rowNum } = mergedConfig + const rowLength = rowsData.length if (rowNum >= rowLength) return if (start) { - await new Promise(resolve => setTimeout(resolve, waitTime)) + await new Promise(resolve => setTimeout(resolve, waitTime*1000)) if (updater !== status.updater) return } const animationNum = carousel === 'single' ? 1 : rowNum @@ -274,7 +265,7 @@ const animation = async (start = false) => { const back = animationIndex - rowLength if (back >= 0) animationIndex = back status.animationIndex = animationIndex - status.animationHandler = setTimeout(animation, waitTime - 300) as any + status.animationHandler = setTimeout(animation, waitTime*1000 - 300) as any } const stopAnimation = () => { @@ -303,19 +294,13 @@ watch( } ) -// watch( -// () => rowNum.value, -// () => { -// onRestart() -// } -// ) - // 数据更新 watch( - () => props.chartConfig.option.dataset, + () => props.chartConfig.option, () => { onRestart() - } + }, + {deep:true} ) // 数据更新 (默认更新 dataset，若更新之后有其它操作，可添加回调函数) @@ -348,8 +333,6 @@ onUnmounted(() => { font-size: 15px; .header-item { - .text { - } transition: all 0.3s; } } @@ -361,15 +344,7 @@ onUnmounted(() => { display: flex; font-size: 14px; transition: all 0.3s; - } - - .ceil { - // .text; - } - - .index { - border-radius: 3px; - padding: 0px 10px; + overflow: hidden; } } } From 11d09c4d63fe8977055f8fd8b9f1e2fd557e299f Mon Sep 17 00:00:00 2001 From: wangzhiqiang Date: Tue, 14 Jun 2022 10:58:02 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=8F=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E8=BE=B9=E6=A1=86-04=E4=B8=8B=E8=BE=B9=E6=A1=86?= =?UTF-8?q?=E7=BC=BA=E5=A4=B1bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/components/Decorates/Borders/Border04/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/packages/components/Decorates/Borders/Border04/index.vue b/src/packages/components/Decorates/Borders/Border04/index.vue index dc849811..aa42ef70 100644 --- a/src/packages/components/Decorates/Borders/Border04/index.vue +++ b/src/packages/components/Decorates/Borders/Border04/index.vue @@ -2,7 +2,7 @@
- +