From 27ac90b931a6b3a484fe45f9ddce1d0320aa8d36 Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Thu, 7 Sep 2023 11:04:04 +0800 Subject: [PATCH 01/21] =?UTF-8?q?fix:=20=E6=A8=AA=E8=BD=B4=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E6=97=8B=E8=BD=AC=E8=A7=92=E5=BA=A6=E8=BE=83=E5=A4=A7?= =?UTF-8?q?=E6=97=B6=E5=92=8C=E5=9B=BE=E8=A1=A8=E9=87=8D=E5=8F=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/frontend/src/views/chart/chart/common/common_antv.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/frontend/src/views/chart/chart/common/common_antv.js b/core/frontend/src/views/chart/chart/common/common_antv.js index 3e27c4a66e..5db67a2105 100644 --- a/core/frontend/src/views/chart/chart/common/common_antv.js +++ b/core/frontend/src/views/chart/chart/common/common_antv.js @@ -593,9 +593,11 @@ export function getXAxis(chart) { stroke: axisCfg.lineStyle.color } } : null + const rotate = parseInt(a.axisLabel.rotate) const label = a.axisLabel.show ? { - rotate: parseInt(a.axisLabel.rotate) * Math.PI / 180, + rotate: rotate * Math.PI / 180, style: { + textAlign: rotate > 20 ? 'start' : rotate < -20 ? 'end' : 'center', fill: a.axisLabel.color, fontSize: parseInt(a.axisLabel.fontSize) }, From 6d25a53725bbc4aec996934e2cebbe5e9457c45c Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Thu, 7 Sep 2023 19:42:02 +0800 Subject: [PATCH 02/21] =?UTF-8?q?feat:=20=E8=A1=A8=E6=A0=BC=E8=A1=8C/?= =?UTF-8?q?=E5=88=97=E5=A4=B4=E6=82=AC=E5=81=9C=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/frontend/src/lang/en.js | 2 + core/frontend/src/lang/tw.js | 2 + core/frontend/src/lang/zh.js | 2 + core/frontend/src/main.js | 1 + core/frontend/src/views/chart/chart/chart.js | 6 + .../src/views/chart/chart/table/table-info.js | 190 ++++++++---------- core/frontend/src/views/chart/chart/util.js | 10 +- .../chart/components/ChartComponentS2.vue | 5 + .../components/shapeAttr/SizeSelectorAntV.vue | 24 +++ 9 files changed, 132 insertions(+), 110 deletions(-) diff --git a/core/frontend/src/lang/en.js b/core/frontend/src/lang/en.js index 60fbf8b68c..d9107a87b7 100644 --- a/core/frontend/src/lang/en.js +++ b/core/frontend/src/lang/en.js @@ -1488,6 +1488,8 @@ export default { label_content: 'Label Content', percent: 'Percent', table_index_desc: 'Index Header Name', + table_row_tooltip: 'Row Tooltip', + table_col_tooltip: 'Column Tooltip', total_sort: 'Total Sort', total_sort_none: 'None', total_sort_asc: 'ASC', diff --git a/core/frontend/src/lang/tw.js b/core/frontend/src/lang/tw.js index d09ad5b60b..46f81309e5 100644 --- a/core/frontend/src/lang/tw.js +++ b/core/frontend/src/lang/tw.js @@ -1487,6 +1487,8 @@ export default { label_content: '標籤展示', percent: '占比', table_index_desc: '表頭名稱', + table_row_tooltip: '行頭提示', + table_col_tooltip: '列頭提示', total_sort: '總計排序', total_sort_none: '無', total_sort_asc: '升序', diff --git a/core/frontend/src/lang/zh.js b/core/frontend/src/lang/zh.js index ec9e6a5618..9caef8aa21 100644 --- a/core/frontend/src/lang/zh.js +++ b/core/frontend/src/lang/zh.js @@ -1486,6 +1486,8 @@ export default { label_content: '标签展示', percent: '占比', table_index_desc: '表头名称', + table_row_tooltip: '行头提示', + table_col_tooltip: '列头提示', total_sort: '总计排序', total_sort_none: '无', total_sort_asc: '升序', diff --git a/core/frontend/src/main.js b/core/frontend/src/main.js index 8081fd0d2b..dc12881242 100644 --- a/core/frontend/src/main.js +++ b/core/frontend/src/main.js @@ -40,6 +40,7 @@ import VueFriendlyIframe from 'vue-friendly-iframe' import vueToPdf from 'vue-to-pdf' import VueVideoPlayer from 'vue-video-player' import 'video.js/dist/video-js.css' +import '@antv/s2/dist/style.min.css' // 控制标签宽高成比例的指令 import proportion from 'vue-proportion-directive' diff --git a/core/frontend/src/views/chart/chart/chart.js b/core/frontend/src/views/chart/chart/chart.js index 1af8b92939..9028a31522 100644 --- a/core/frontend/src/views/chart/chart/chart.js +++ b/core/frontend/src/views/chart/chart/chart.js @@ -86,6 +86,12 @@ export const DEFAULT_SIZE = { tableHeaderAlign: 'left', tableItemAlign: 'right', tableAutoBreakLine: false, + tableRowTooltip: { + show: false + }, + tableColTooltip: { + show: false + }, gaugeMinType: 'fix', // fix or dynamic gaugeMinField: { id: '', diff --git a/core/frontend/src/views/chart/chart/table/table-info.js b/core/frontend/src/views/chart/chart/table/table-info.js index 4f262bf81e..37f026b1b6 100644 --- a/core/frontend/src/views/chart/chart/table/table-info.js +++ b/core/frontend/src/views/chart/chart/table/table-info.js @@ -1,4 +1,4 @@ -import { TableSheet, S2Event, PivotSheet, DataCell, EXTRA_FIELD, TOTAL_VALUE } from '@antv/s2' +import { TableSheet, S2Event, PivotSheet, DataCell, EXTRA_FIELD, TOTAL_VALUE, BaseEvent } from '@antv/s2' import { getCustomTheme, getSize } from '@/views/chart/chart/common/common_table' import { DEFAULT_COLOR_CASE, DEFAULT_TOTAL } from '@/views/chart/chart/chart' import { formatterItem, valueFormatter } from '@/views/chart/chart/formatter' @@ -7,7 +7,7 @@ export function baseTableInfo(s2, container, chart, action, tableData, pageInfo) const containerDom = document.getElementById(container) // fields - const fields = chart.data.fields + let fields = chart.data.fields if (!fields || fields.length === 0) { if (s2) { s2.destroy() @@ -17,8 +17,17 @@ export function baseTableInfo(s2, container, chart, action, tableData, pageInfo) const columns = [] const meta = [] - - // add drill list + // 记录下钻起始字段的index + let xAxis = [] + try { + xAxis = JSON.parse(chart.xaxis) + } catch (err) { + xAxis = JSON.parse(JSON.stringify(chart.xaxis)) + } + const nameMap = xAxis.reduce((pre, next) => { + pre[next.dataeaseName] = next + return pre + }, {}) if (chart.drill) { let drillFields = [] try { @@ -26,107 +35,44 @@ export function baseTableInfo(s2, container, chart, action, tableData, pageInfo) } catch (err) { drillFields = JSON.parse(JSON.stringify(chart.drillFields)) } - - const drillField = drillFields[chart.drillFilters.length] - - const drillFilters = JSON.parse(JSON.stringify(chart.drillFilters)) - const drillExp = drillFilters[drillFilters.length - 1].datasetTableField - - // 记录下钻起始字段的index - let xAxis = [] - try { - xAxis = JSON.parse(chart.xaxis) - } catch (err) { - xAxis = JSON.parse(JSON.stringify(chart.xaxis)) - } - let index = 0 - for (let i = 0; i < xAxis.length; i++) { - if (xAxis[i].id === drillFilters[0].fieldId) { - index = i - break - } - } - - // 移除所有下钻字段 - const removeField = [] - for (let i = 0; i < chart.drillFilters.length; i++) { - const ele = chart.drillFilters[i].datasetTableField - removeField.push(ele.dataeaseName) - } - - // build field - fields.forEach(ele => { - if (removeField.indexOf(ele.dataeaseName) < 0) { - // 用下钻字段替换当前字段 - if (drillExp.dataeaseName === ele.dataeaseName) { - columns.push(drillField.dataeaseName) - meta.push({ - field: drillField.dataeaseName, - name: drillField.name - }) - } else { - const f = getCurrentField(chart.xaxis, ele) - columns.push(ele.dataeaseName) - meta.push({ - field: ele.dataeaseName, - name: ele.name, - formatter: function(value) { - if (!f) { - return value - } - if (value === null || value === undefined) { - return value - } - if (f.groupType === 'd') { - return value - } else { - if (f.formatterCfg) { - const v = valueFormatter(value, f.formatterCfg) - return v.includes('NaN') ? value : v - } else { - const v = valueFormatter(value, formatterItem) - return v.includes('NaN') ? value : v - } - } - } - }) - } - } - }) - - // 修正下钻字段的index，获取下钻位置元素添加到index位置，并删除 - const ele = columns[columns.length - 1] - columns.splice(index, 0, ele) - columns.splice(columns.length - 1, 1) - } else { - fields.forEach(ele => { - const f = getCurrentField(chart.xaxis, ele) - columns.push(ele.dataeaseName) - meta.push({ - field: ele.dataeaseName, - name: ele.name, - formatter: function(value) { - if (!f) { - return value - } - if (value === null || value === undefined) { - return value - } - if (f.groupType === 'd') { - return value - } else { - if (f.formatterCfg) { - const v = valueFormatter(value, f.formatterCfg) - return v.includes('NaN') ? value : v - } else { - const v = valueFormatter(value, formatterItem) - return v.includes('NaN') ? value : v - } - } - } - }) - }) + // 总下钻过滤字段 + const drillFilters = JSON.parse(JSON.stringify(chart.drillFilters)).map(i => i.fieldId) + // 当前下钻字段 + const curDrillField = drillFields[chart.drillFilters.length] + drillFilters.push(curDrillField.id) + // 下钻入口字段的下标 + const drillEnterFieldIndex = xAxis.findIndex(item => item.id === drillFilters[0]) + // 移除所有下钻字段，调整当前下钻字段到下钻入口位置 + fields = fields.filter(item => !drillFilters.includes(item.id)) + fields.splice(drillEnterFieldIndex, 0, curDrillField) } + fields.forEach(ele => { + const f = nameMap[ele.dataeaseName] + columns.push(ele.dataeaseName) + meta.push({ + field: ele.dataeaseName, + name: ele.name, + formatter: function(value) { + if (!f) { + return value + } + if (value === null || value === undefined) { + return value + } + if (f.groupType === 'd') { + return value + } else { + if (f.formatterCfg) { + const v = valueFormatter(value, f.formatterCfg) + return v.includes('NaN') ? value : v + } else { + const v = valueFormatter(value, formatterItem) + return v.includes('NaN') ? value : v + } + } + } + }) + }) // 空值处理 const newData = handleTableEmptyStrategy(tableData, chart) // data config @@ -174,6 +120,11 @@ export function baseTableInfo(s2, container, chart, action, tableData, pageInfo) // click s2.on(S2Event.DATA_CELL_CLICK, action) + // hover + const size = customAttr.size + if (size.tableColTooltip?.show) { + s2.on(S2Event.COL_CELL_HOVER, event => showTooltip(s2, event)) + } // theme const customTheme = getCustomTheme(chart) @@ -342,7 +293,11 @@ export function baseTableNormal(s2, container, chart, action, tableData) { // click s2.on(S2Event.DATA_CELL_CLICK, action) - + // hover + const size = customAttr.size + if (size.tableColTooltip?.show) { + s2.on(S2Event.COL_CELL_HOVER, event => showTooltip(s2, event)) + } // theme const customTheme = getCustomTheme(chart) s2.setThemeCfg({ theme: customTheme }) @@ -455,8 +410,8 @@ export function baseTablePivot(s2, container, chart, action, headerAction, table // total config let totalCfg = {} const chartObj = JSON.parse(JSON.stringify(chart)) + let customAttr if (chartObj.customAttr) { - let customAttr = null if (Object.prototype.toString.call(chartObj.customAttr) === '[object Object]') { customAttr = JSON.parse(JSON.stringify(chartObj.customAttr)) } else { @@ -528,7 +483,14 @@ export function baseTablePivot(s2, container, chart, action, headerAction, table s2.on(S2Event.DATA_CELL_CLICK, action) s2.on(S2Event.ROW_CELL_CLICK, headerAction) s2.on(S2Event.COL_CELL_CLICK, headerAction) - + // hover + const size = customAttr?.size + if (size?.tableRowTooltip?.show) { + s2.on(S2Event.ROW_CELL_HOVER, event => showTooltip(s2, event)) + } + if (size?.tableColTooltip?.show) { + s2.on(S2Event.COL_CELL_HOVER, event => showTooltip(s2, event)) + } // theme const customTheme = getCustomTheme(chart) s2.setThemeCfg({ theme: customTheme }) @@ -740,3 +702,17 @@ function mappingColor(value, defaultColor, field, type) { } return color } + +function showTooltip(s2Instance, event) { + const cell = s2Instance.getCell(event.target) + const meta = cell.getMeta() + const content = meta.value + + s2Instance.showTooltip({ + position: { + x: event.clientX, + y: event.clientY + }, + content + }) +} diff --git a/core/frontend/src/views/chart/chart/util.js b/core/frontend/src/views/chart/chart/util.js index fdacc429a7..cbde5bcffd 100644 --- a/core/frontend/src/views/chart/chart/util.js +++ b/core/frontend/src/views/chart/chart/util.js @@ -62,7 +62,8 @@ export const TYPE_CONFIGS = [ 'tableItemHeight', 'tableColumnMode', 'showIndex', - 'indexLabel' + 'indexLabel', + 'tableColTooltip' ], 'title-selector-ant-v': [ 'show', @@ -111,7 +112,8 @@ export const TYPE_CONFIGS = [ 'tableItemHeight', 'tableColumnMode', 'showIndex', - 'indexLabel' + 'indexLabel', + 'tableColTooltip' ], 'title-selector-ant-v': [ 'show', @@ -157,7 +159,9 @@ export const TYPE_CONFIGS = [ 'tableItemAlign', 'tableTitleHeight', 'tableItemHeight', - 'tableColumnMode' + 'tableColumnMode', + 'tableRowTooltip', + 'tableColTooltip' ], 'total-cfg': [ 'row', diff --git a/core/frontend/src/views/chart/components/ChartComponentS2.vue b/core/frontend/src/views/chart/components/ChartComponentS2.vue index 31d5e3ca22..66597743cd 100644 --- a/core/frontend/src/views/chart/components/ChartComponentS2.vue +++ b/core/frontend/src/views/chart/components/ChartComponentS2.vue @@ -613,3 +613,8 @@ export default { background: transparent !important; } + diff --git a/core/frontend/src/views/chart/components/shapeAttr/SizeSelectorAntV.vue b/core/frontend/src/views/chart/components/shapeAttr/SizeSelectorAntV.vue index bbb8916efa..92b4155b21 100644 --- a/core/frontend/src/views/chart/components/shapeAttr/SizeSelectorAntV.vue +++ b/core/frontend/src/views/chart/components/shapeAttr/SizeSelectorAntV.vue @@ -384,6 +384,28 @@ @blur="changeBarSizeCase('indexLabel')" /> + + + + + + @@ -1565,6 +1587,8 @@ export default { this.sizeForm.tableHeaderAlign = this.sizeForm.tableHeaderAlign ? this.sizeForm.tableHeaderAlign : DEFAULT_SIZE.tableHeaderAlign this.sizeForm.tableItemAlign = this.sizeForm.tableItemAlign ? this.sizeForm.tableItemAlign : DEFAULT_SIZE.tableItemAlign + this.sizeForm.tableRowTooltip = this.sizeForm.tableRowTooltip ?? DEFAULT_SIZE.tableRowTooltip + this.sizeForm.tableColTooltip = this.sizeForm.tableColTooltip ?? DEFAULT_SIZE.tableColTooltip this.sizeForm.showIndex = this.sizeForm.showIndex ? this.sizeForm.showIndex : DEFAULT_SIZE.showIndex if (this.sizeForm.indexLabel === null || this.sizeForm.indexLabel === undefined) { From 08a173c8c1714b539d022044d57f5609912028da Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Thu, 7 Sep 2023 20:00:14 +0800 Subject: [PATCH 03/21] =?UTF-8?q?fix:=20=E6=B0=94=E6=B3=A1=E5=9B=BE?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=AD=97=E6=AE=B5=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/frontend/src/views/chart/view/ChartEdit.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/core/frontend/src/views/chart/view/ChartEdit.vue b/core/frontend/src/views/chart/view/ChartEdit.vue index de2445b799..f5e8c44e44 100644 --- a/core/frontend/src/views/chart/view/ChartEdit.vue +++ b/core/frontend/src/views/chart/view/ChartEdit.vue @@ -924,6 +924,7 @@ :param="param" :index="index" :item="item" + :chart="chart" :dimension-data="dimension" :quota-data="quota" @onItemChange="bubbleItemChange" From 9d94b0bf16c7eef0e221a50ac9085f2603404755 Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Thu, 7 Sep 2023 20:16:11 +0800 Subject: [PATCH 04/21] =?UTF-8?q?refactor:=20=E6=96=87=E6=9C=AC/=E6=8C=87?= =?UTF-8?q?=E6=A0=87=E5=8D=A1=E4=BD=8D=E7=BD=AE=E5=B1=9E=E6=80=A7=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E8=B0=83=E6=95=B4#5978?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/shapeAttr/SizeSelectorAntV.vue | 97 +++++++++---------- 1 file changed, 48 insertions(+), 49 deletions(-) diff --git a/core/frontend/src/views/chart/components/shapeAttr/SizeSelectorAntV.vue b/core/frontend/src/views/chart/components/shapeAttr/SizeSelectorAntV.vue index 92b4155b21..126f14b884 100644 --- a/core/frontend/src/views/chart/components/shapeAttr/SizeSelectorAntV.vue +++ b/core/frontend/src/views/chart/components/shapeAttr/SizeSelectorAntV.vue @@ -915,6 +915,54 @@ @change="changeBarSizeCase('quotaFontShadow')" >{{ $t('chart.font_shadow') }} + + + {{ $t('chart.p_left') }} + {{ $t('chart.p_center') }} + {{ $t('chart.p_right') }} + + + + + {{ $t('chart.p_top') }} + {{ $t('chart.p_center') }} + {{ $t('chart.p_bottom') }} + + {{ $t('chart.font_shadow') }} - - - - {{ $t('chart.p_left') }} - {{ $t('chart.p_center') }} - {{ $t('chart.p_right') }} - - - - - {{ $t('chart.p_top') }} - {{ $t('chart.p_center') }} - {{ $t('chart.p_bottom') }} - - From 61b5beb9ea22d7b4539edb80d13426838ec846cf Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Thu, 7 Sep 2023 20:23:59 +0800 Subject: [PATCH 05/21] chore: typo config --- .typos.toml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.typos.toml b/.typos.toml index d9416da7b8..d20ddb8931 100644 --- a/.typos.toml +++ b/.typos.toml @@ -9,5 +9,21 @@ keynode = "keynode" SCHEM = "SCHEM" [files] -extend-exclude = ["public/", "amap-wx/", "m-icon/", "uni-card/", "uni-col/", "uni-link/", "uni-list/", "uni-list-item/", "uni-row/", "migration/", "mapFiles/", "frontend/src/views/chart/components/table/TableNormal.vue"] +extend-exclude = [ + "public/", + "amap-wx/", + "m-icon/", + "uni-card/", + "uni-col/", + "uni-link/", + "uni-list/", + "uni-list-item/", + "uni-row/", + "migration/", + "mapFiles/", + "core/frontend/src/views/chart/components/table/TableNormal.vue", + "core/backend/src/main/java/io/dataease/ext/ExtSysUserMapper.xml", + "core/backend/src/main/java/io/dataease/ext/AuthMapper.xml", + "installer/dataease/templates/be.conf" +] From 933d78d68b9151ebde1b0f2fcb2b093caa978100 Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Thu, 7 Sep 2023 20:59:42 +0800 Subject: [PATCH 06/21] =?UTF-8?q?feat:=20AntV=20=E6=9F=B1=E7=8A=B6?= =?UTF-8?q?=E5=9B=BE/=E6=9D=A1=E5=BD=A2=E5=9B=BE=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=88=B7=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 4362e265-5fbd-49d7-9e63-d88d82efe3fe.xml | 1545 -------------- 476409e8-9887-438e-a6ce-e4e29ddd64bc.xml | 1871 ----------------- .../src/views/chart/chart/bar/bar_antv.js | 20 + 3 files changed, 20 insertions(+), 3416 deletions(-) delete mode 100644 4362e265-5fbd-49d7-9e63-d88d82efe3fe.xml delete mode 100644 476409e8-9887-438e-a6ce-e4e29ddd64bc.xml diff --git a/4362e265-5fbd-49d7-9e63-d88d82efe3fe.xml b/4362e265-5fbd-49d7-9e63-d88d82efe3fe.xml deleted file mode 100644 index 4cbef9c152..0000000000 --- a/4362e265-5fbd-49d7-9e63-d88d82efe3fe.xml +++ /dev/null @@ -1,1545 +0,0 @@ - - - - - dataease - dataease - - 80020202 - MongoDB - - jdbc:mongodb://123.56.8.132:27017/dataease?rebuildschema=true&authSource=admin&schema=4362e265-5fbd-49d7-9e63-d88d82efe3fe.xml - mongodb.jdbc.MongoDriver - mongodb.jdbc.MongoDriver - " - - - - - - no1:thingdata:02:0 - "NO1:thingdata:02:0" - dataease - - true - - 3 - - _id - "_id" - 12 - varchar - 24 - 0 - 24 - - - 24 - 1 - - 0 - - - - 测试1 - "测试1" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 2 - - 0 - - - - 测试2 - "测试2" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 3 - - 0 - - - - 测试3 - "测试3" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 4 - - 0 - - - - pk_NO1:thingdata:02:0 - 1 - - "_id" - - - -
- - - books - "books" - dataease - - true - - 1000 - - _id - "_id" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 1 - - 0 - - - - author - "author" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 2 - - 0 - - - - category - "category" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 3 - - 0 - - - - createddate - "createdDate" - 93 - timestamp - 25 - 0 - 25 - - - 25 - 4 - - 0 - - - - onsale - "onSale" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 5 - - 0 - - - - price - "price" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 6 - - 0 - - - - title - "title" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 7 - - 0 - - - - pk_books - 1 - - "_id" - - - -
- - - create-test - "create-test" - dataease - - true - - 0 -
- - - jinlong - "jinlong" - dataease - - true - - 2 - - _id - "_id" - 12 - varchar - 24 - 0 - 24 - - - 24 - 1 - - 0 - - - - cnecustuuid - "cneCustUUID" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 4 - - 0 - - - - groupid - "groupID" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 5 - - 0 - - - - num_1 - "num_1" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 7 - - 0 - - - - parentcnecustuuid - "parentCneCustUUID" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 8 - - 0 - - - - parentname - "parentName" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 2 - - 0 - - - - text_1 - "text_1" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 3 - - 0 - - - - text_2 - "text_2" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 6 - - 0 - - - - pk_jinlong - 1 - - "_id" - - - -
- - - jinlong2 - "jinlong2" - dataease - - true - - 0 -
- - - mjq - "mjq" - dataease - - true - - 1 - - _id - "_id" - 12 - varchar - 24 - 0 - 24 - - - 24 - 1 - - 0 - - - - age - "age" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 3 - - 0 - - - - name - "name" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 2 - - 0 - - - - pk_mjq - 1 - - "_id" - - - -
- - - mjq-test - "mjq-test" - dataease - - true - - 2 - - *attrs - "*Attrs" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 18 - - 0 - - - - *应用程序 - "*应用程序" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 7 - - 0 - - - - *用户名 - "*用户名" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 3 - - 0 - - - - *系统用户 - "*系统用户" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 5 - - 0 - - - - id - "Id" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 2 - - 0 - - - - ssh公钥 - "SSH公钥" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 11 - - 0 - - - - ssh密钥 - "SSH密钥" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 10 - - 0 - - - - _id - "_id" - 12 - varchar - 24 - 0 - 24 - - - 24 - 1 - - 0 - - - - 创建日期 - "创建日期" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 12 - - 0 - - - - 密码 - "密码" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 9 - - 0 - - - - 应用名称 - "应用名称" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 8 - - 0 - - - - 更新日期 - "更新日期" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 13 - - 0 - - - - 版本 - "版本" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 4 - - 0 - - - - 类别 - "类别" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 16 - - 0 - - - - 类别名称 - "类别名称" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 17 - - 0 - - - - 类型 - "类型" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 14 - - 0 - - - - 类型名称 - "类型名称" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 15 - - 0 - - - - 系统用户 - "系统用户" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 6 - - 0 - - - - 组织名称 - "组织名称" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 19 - - 0 - - - - pk_mjq-test - 1 - - "_id" - - - -
- - - mjqznb - "mjqznb" - dataease - - true - - 1 - - _id - "_id" - 12 - varchar - 24 - 0 - 24 - - - 24 - 1 - - 0 - - - - cnecustuuid - "cneCustUUID" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 4 - - 0 - - - - groupid - "groupID" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 5 - - 0 - - - - num_1 - "num_1" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 7 - - 0 - - - - parentcnecustuuid - "parentCneCustUUID" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 8 - - 0 - - - - parentname - "parentName" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 2 - - 0 - - - - text_1 - "text_1" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 3 - - 0 - - - - text_2 - "text_2" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 6 - - 0 - - - - pk_mjqznb - 1 - - "_id" - - - -
- - - report - "report" - dataease - - true - - 50 - - _id - "_id" - 12 - varchar - 24 - 0 - 24 - - - 24 - 1 - - 0 - - - - count - "count" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 7 - - 0 - - - - id - "id" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 2 - - 0 - - - - latitude - "latitude" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 5 - - 0 - - - - longitude - "longitude" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 4 - - 0 - - - - name - "name" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 3 - - 0 - - - - unit_price - "unit_price" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 6 - - 0 - - - - pk_report - 1 - - "_id" - - - -
- - - time - "time" - dataease - - true - - 1 - - 1 - "1" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 2 - - 0 - - - - 10 - "10" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 11 - - 0 - - - - 11 - "11" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 12 - - 0 - - - - 12 - "12" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 13 - - 0 - - - - 13 - "13" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 14 - - 0 - - - - 2 - "2" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 3 - - 0 - - - - 3 - "3" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 4 - - 0 - - - - 4 - "4" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 5 - - 0 - - - - 5 - "5" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 6 - - 0 - - - - 6 - "6" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 7 - - 0 - - - - 7 - "7" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 8 - - 0 - - - - 8 - "8" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 9 - - 0 - - - - 9 - "9" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 10 - - 0 - - - - _id - "_id" - 12 - varchar - 24 - 0 - 24 - - - 24 - 1 - - 0 - - - - pk_time - 1 - - "_id" - - - -
- - - timeallmore - "timeallmore" - dataease - - true - - 15 - - _id - "_id" - 12 - varchar - 24 - 0 - 24 - - - 24 - 1 - - 0 - - - - 数值 - "数值" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 14 - - 0 - - - - 时间带时分秒（-） - "时间带时分秒（-）" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 5 - - 0 - - - - 时间带时分秒（/） - "时间带时分秒（/）" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 6 - - 0 - - - - 时间没有分隔符带时分秒（时分秒以：） - "时间没有分隔符带时分秒（时分秒以：）" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 7 - - 0 - - - - 时间（-） - "时间（-）" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 2 - - 0 - - - - 时间（/） - "时间（/）" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 3 - - 0 - - - - 时间（） - "时间（）" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 4 - - 0 - - - - 自定义1 - "自定义1" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 8 - - 0 - - - - 自定义2 - "自定义2" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 9 - - 0 - - - - 自定义3 - "自定义3" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 10 - - 0 - - - - 自定义4 - "自定义4" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 11 - - 0 - - - - 自定义5 - "自定义5" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 12 - - 0 - - - - 自定义6 - "自定义6" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 13 - - 0 - - - - pk_timeallmore - 1 - - "_id" - - - -
- - diff --git a/476409e8-9887-438e-a6ce-e4e29ddd64bc.xml b/476409e8-9887-438e-a6ce-e4e29ddd64bc.xml deleted file mode 100644 index ddd8c60378..0000000000 --- a/476409e8-9887-438e-a6ce-e4e29ddd64bc.xml +++ /dev/null @@ -1,1871 +0,0 @@ - - - - - dataease - dataease - - 80020202 - MongoDB - - jdbc:mongodb://123.56.8.132:27018/dataease?rebuildschema=true&authSource=admin&schema=476409e8-9887-438e-a6ce-e4e29ddd64bc.xml - mongodb.jdbc.MongoDriver - mongodb.jdbc.MongoDriver - " - - - - - - no1:thingdata:02:0 - "NO1:thingdata:02:0" - dataease - - true - - 3 - - _id - "_id" - 12 - varchar - 24 - 0 - 24 - - - 24 - 1 - - 0 - - - - 测试1 - "测试1" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 2 - - 0 - - - - 测试2 - "测试2" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 3 - - 0 - - - - 测试3 - "测试3" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 4 - - 0 - - - - pk_NO1:thingdata:02:0 - 1 - - "_id" - - - -
- - - sheet1 - "Sheet1" - dataease - - true - - 31 - - _id - "_id" - 12 - varchar - 24 - 0 - 24 - - - 24 - 1 - - 0 - - - - age - "age" - 4 - integer - 10 - 0 - 10 - - - 10 - 3 - - 0 - - - - bit - "bit" - 8 - double - 20 - 0 - 21 - - - 20 - 6 - - 0 - - - - bool - "bool" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 5 - - 0 - - - - data - "data" - 93 - timestamp - 25 - 0 - 25 - - - 25 - 4 - - 0 - - - - float - "float" - 8 - double - 20 - 0 - 21 - - - 20 - 7 - - 0 - - - - name - "name" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 2 - - 0 - - - - pk_Sheet1 - 1 - - "_id" - - - -
- - - books - "books" - dataease - - true - - 1000 - - _id - "_id" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 1 - - 0 - - - - author - "author" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 2 - - 0 - - - - category - "category" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 3 - - 0 - - - - createddate - "createdDate" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 4 - - 0 - - - - onsale - "onSale" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 5 - - 0 - - - - price - "price" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 6 - - 0 - - - - title - "title" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 7 - - 0 - - - - pk_books - 1 - - "_id" - - - -
- - - booksale - "booksale" - dataease - - true - - 20 - - _id - "_id" - 12 - varchar - 24 - 0 - 24 - - - 24 - 1 - - 0 - - - - b_date - "b_date" - 93 - timestamp - 25 - 0 - 25 - - - 25 - 6 - - 0 - - - - b_id - "b_id" - 4 - integer - 10 - 0 - 10 - - - 10 - 2 - - 0 - - - - b_name - "b_name" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 3 - - 0 - - - - b_price - "b_price" - 8 - double - 20 - 0 - 21 - - - 20 - 4 - - 0 - - - - b_sale - "b_sale" - -5 - bigint - 20 - 0 - 20 - - - 20 - 5 - - 0 - - - - pk_booksale - 1 - - "_id" - - - -
- - - jinlong - "jinlong" - dataease - - true - - 16 - - _id - "_id" - 12 - varchar - 24 - 0 - 24 - - - 24 - 1 - - 0 - - - - cnecustuuid - "cneCustUUID" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 3 - - 0 - - - - groupid - "groupID" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 4 - - 0 - - - - parentcnecustuuid - "parentCneCustUUID" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 5 - - 0 - - - - parentname - "parentName" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 2 - - 0 - - - - pk_jinlong - 1 - - "_id" - - - -
- - - mjq-test - "mjq-test" - dataease - - true - - 1 - - *用户名 - "*用户名" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 3 - - 0 - - - - *系统用户 - "*系统用户" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 18 - - 0 - - - - *资产 - "*资产" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 17 - - 0 - - - - ip - "IP" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 4 - - 0 - - - - id - "Id" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 2 - - 0 - - - - ssh公钥 - "SSH公钥" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 11 - - 0 - - - - ssh密钥 - "SSH密钥" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 10 - - 0 - - - - _id - "_id" - 12 - varchar - 24 - 0 - 24 - - - 24 - 1 - - 0 - - - - 主机名 - "主机名" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 5 - - 0 - - - - 创建日期 - "创建日期" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 12 - - 0 - - - - 协议组 - "协议组" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 7 - - 0 - - - - 可连接性 - "可连接性" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 14 - - 0 - - - - 备注 - "备注" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 16 - - 0 - - - - 密码 - "密码" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 9 - - 0 - - - - 更新日期 - "更新日期" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 13 - - 0 - - - - 校验日期 - "校验日期" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 15 - - 0 - - - - 版本 - "版本" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 8 - - 0 - - - - 系统平台 - "系统平台" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 6 - - 0 - - - - 系统用户名称 - "系统用户名称" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 19 - - 0 - - - - 组织名称 - "组织名称" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 20 - - 0 - - - - pk_mjq-test - 1 - - "_id" - - - -
- - - number - "number" - dataease - - true - - 9 - - _id - "_id" - 12 - varchar - 24 - 0 - 24 - - - 24 - 1 - - 0 - - - - age - "age" - -5 - bigint - 20 - 0 - 20 - - - 20 - 3 - - 0 - - - - float - "float" - 8 - double - 20 - 0 - 21 - - - 20 - 4 - - 0 - - - - name - "name" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 2 - - 0 - - - - pk_number - 1 - - "_id" - - - -
- - - runoob - "runoob" - dataease - - true - - 1 - - _id - "_id" - 12 - varchar - 24 - 0 - 24 - - - 24 - 1 - - 0 - - - - createdat - "createdAt" - 93 - timestamp - 25 - 0 - 25 - - - 25 - 4 - - 0 - - - - name - "name" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 2 - - 0 - - - - userid - "userId" - 8 - double - 20 - 0 - 21 - - - 20 - 3 - - 0 - - - - pk_runoob - 1 - - "_id" - - - -
- - - test - "test" - dataease - - true - - 14 - - _id - "_id" - 12 - varchar - 24 - 0 - 24 - - - 24 - 1 - - 0 - - - - _index - "_index" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 3 - - 0 - - - - inputtype - "inputType" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 6 - - 0 - - - - label - "label" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 8 - - 0 - - - - name - "name" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 4 - - 0 - - - - optionlist - "optionList" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 5 - - 0 - - - - required - "required" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 11 - - 0 - - - - resourcepooltag - "resourcePoolTag" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 7 - - 0 - - - - role - "role" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 2 - - 0 - - - - textfield - "textField" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 12 - - 0 - - - - value - "value" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 10 - - 0 - - - - valuefield - "valueField" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 9 - - 0 - - - - pk_test - 1 - - "_id" - - - -
- - - testdatetime - "testdatetime" - dataease - - true - - 33 - - _id - "_id" - 12 - varchar - 24 - 0 - 24 - - - 24 - 1 - - 0 - - - - datetime - "datetime" - 93 - timestamp - 25 - 0 - 25 - - - 25 - 2 - - 0 - - - - name - "name" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 6 - - 0 - - - - number - "number" - -5 - bigint - 20 - 0 - 20 - - - 20 - 3 - - 0 - - - - sing - "sing" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 5 - - 0 - - - - zhi - "zhi" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 4 - - 0 - - - - pk_testdatetime - 1 - - "_id" - - - -
- - - testtable - "testtable" - dataease - - true - - 10 - - _id - "_id" - 12 - varchar - 24 - 0 - 24 - - - 24 - 1 - - 0 - - - - strint - "strint" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 2 - - 0 - - - - x - "x" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 3 - - 0 - - - - pk_testtable - 1 - - "_id" - - - -
- - - testtable2 - "testtable2" - dataease - - true - - 10 - - _id - "_id" - 12 - varchar - 24 - 0 - 24 - - - 24 - 1 - - 0 - - - - strint - "strint" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 2 - - 0 - - - - y - "y" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 3 - - 0 - - - - pk_testtable2 - 1 - - "_id" - - - -
- - - timeallmore - "timeallmore" - dataease - - true - - 15 - - _id - "_id" - 12 - varchar - 24 - 0 - 24 - - - 24 - 1 - - 0 - - - - 数值 - "数值" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 14 - - 0 - - - - 时间带时分秒（-） - "时间带时分秒（-）" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 5 - - 0 - - - - 时间带时分秒（/） - "时间带时分秒（/）" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 6 - - 0 - - - - 时间没有分隔符带时分秒（时分秒以：） - "时间没有分隔符带时分秒（时分秒以：）" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 7 - - 0 - - - - 时间（-） - "时间（-）" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 2 - - 0 - - - - 时间（/） - "时间（/）" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 3 - - 0 - - - - 时间（） - "时间（）" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 4 - - 0 - - - - 自定义1 - "自定义1" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 8 - - 0 - - - - 自定义2 - "自定义2" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 9 - - 0 - - - - 自定义3 - "自定义3" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 10 - - 0 - - - - 自定义4 - "自定义4" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 11 - - 0 - - - - 自定义5 - "自定义5" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 12 - - 0 - - - - 自定义6 - "自定义6" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 13 - - 0 - - - - pk_timeallmore - 1 - - "_id" - - - -
- - - 测试 - "测试" - dataease - - true - - 33 - - _id - "_id" - 12 - varchar - 24 - 0 - 24 - - - 24 - 1 - - 0 - - - - 地区 - "地区" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 2 - - 0 - - - - 女 - "女" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 4 - - 0 - - - - 比例 - "比例" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 5 - - 0 - - - - 男 - "男" - 12 - varchar - 16793600 - 0 - 16793600 - - - 16793600 - 3 - - 0 - - - - pk_测试 - 1 - - "_id" - - - -
- - diff --git a/core/frontend/src/views/chart/chart/bar/bar_antv.js b/core/frontend/src/views/chart/chart/bar/bar_antv.js index 3305a64e0e..97b30a42d1 100644 --- a/core/frontend/src/views/chart/chart/bar/bar_antv.js +++ b/core/frontend/src/views/chart/chart/bar/bar_antv.js @@ -45,6 +45,16 @@ export function baseBarOptionAntV(plot, container, chart, action, isGroup, isSta yAxis: yAxis, slider: slider, annotations: analyse, + brush: { + enabled: true, + isStartEnable: (context) => { + // 按住 shift 键，才能开启交互 + if (context.event.gEvent.originalEvent?.shiftKey) { + return true + } + return false + } + }, interactions: [ { type: 'legend-active', cfg: { @@ -162,6 +172,16 @@ export function hBaseBarOptionAntV(plot, container, chart, action, isGroup, isSt yAxis: yAxis, slider: slider, annotations: analyse, + brush: { + enabled: true, + isStartEnable: (context) => { + // 按住 shift 键，才能开启交互 + if (context.event.gEvent.originalEvent?.shiftKey) { + return true + } + return false + } + }, interactions: [ { type: 'legend-active', cfg: { From e234fac81300de4cc8bb081a3a5a52a50269fdcf Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Fri, 8 Sep 2023 09:48:37 +0800 Subject: [PATCH 07/21] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=A8=E5=B1=8F=E6=A8=A1=E5=BC=8F=E4=B8=8B?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=8E=92=E5=BA=8F=E6=B2=A1=E6=9C=89=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/canvas/customComponent/UserView.vue | 1 + .../view-racebar-frontend/src/views/antv/racebar/index.vue | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/core/frontend/src/components/canvas/customComponent/UserView.vue b/core/frontend/src/components/canvas/customComponent/UserView.vue index 14920df1e4..40be38ef3b 100644 --- a/core/frontend/src/components/canvas/customComponent/UserView.vue +++ b/core/frontend/src/components/canvas/customComponent/UserView.vue @@ -35,6 +35,7 @@ :obj="{active, chart, trackMenu, searchCount, terminalType: scaleCoefficientType}" :chart="chart" :track-menu="trackMenu" + :in-screen="inScreen" :search-count="searchCount" :terminal-type="scaleCoefficientType" :scale="scale" diff --git a/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/views/antv/racebar/index.vue b/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/views/antv/racebar/index.vue index 3d64523083..2f20897e8e 100644 --- a/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/views/antv/racebar/index.vue +++ b/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/views/antv/racebar/index.vue @@ -76,6 +76,11 @@ export default { return ['drill'] } }, + inScreen: { + type: Boolean, + required: false, + default: true + }, searchCount: { type: Number, required: false, @@ -594,7 +599,7 @@ export default { chart_option.legend['pageIconInactiveColor'] = '#8c8c8c' } } - if (chart_option.tooltip) { + if (chart_option.tooltip && this.inScreen) { chart_option.tooltip.appendToBody = true } From 676ad16461cd9cc9cff975f227ed407a2e474720 Mon Sep 17 00:00:00 2001 From: ulleo Date: Fri, 8 Sep 2023 11:07:10 +0800 Subject: [PATCH 08/21] =?UTF-8?q?fix:=20[Echarts=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=9B=BE]=20=E7=A9=BA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E5=9B=BE=E8=A1=A8=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/plugins/view/official/impl/RaceBarService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/extensions/dataease-extensions-view/view-racebar/view-racebar-backend/src/main/java/io/dataease/plugins/view/official/impl/RaceBarService.java b/extensions/dataease-extensions-view/view-racebar/view-racebar-backend/src/main/java/io/dataease/plugins/view/official/impl/RaceBarService.java index a70b680992..82800c721c 100644 --- a/extensions/dataease-extensions-view/view-racebar/view-racebar-backend/src/main/java/io/dataease/plugins/view/official/impl/RaceBarService.java +++ b/extensions/dataease-extensions-view/view-racebar/view-racebar-backend/src/main/java/io/dataease/plugins/view/official/impl/RaceBarService.java @@ -150,7 +150,7 @@ public class RaceBarService extends ViewPluginService { data.forEach(ss -> { xs.add(ss[encode.get("y")]); - String key = ss[(Integer) map.get("extIndex")]; + String key = StringUtils.defaultString(ss[(Integer) map.get("extIndex")], StringUtils.EMPTY); if (!keySet.contains(key)) { keySet.add(key); keyList.add(key); @@ -160,7 +160,7 @@ public class RaceBarService extends ViewPluginService { Map> groupData = data.stream().collect(Collectors.toMap( - k -> k[(Integer) map.get("extIndex")], + k -> StringUtils.defaultString(k[(Integer) map.get("extIndex")], StringUtils.EMPTY), v -> { List list = new ArrayList<>(); list.add(v); @@ -179,6 +179,7 @@ public class RaceBarService extends ViewPluginService { map.put("xs", xs); + return map; } From c9eed4fc0380ad9b3a5753935d47204fc8a39e98 Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Fri, 8 Sep 2023 11:50:05 +0800 Subject: [PATCH 09/21] =?UTF-8?q?fix:=20=E9=80=8F=E8=A7=86=E8=A1=A8?= =?UTF-8?q?=E5=88=97=E6=82=AC=E6=B5=AE=E6=98=BE=E7=A4=BA=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E6=9C=89=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/frontend/src/views/chart/chart/table/table-info.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/frontend/src/views/chart/chart/table/table-info.js b/core/frontend/src/views/chart/chart/table/table-info.js index 37f026b1b6..c860adbaac 100644 --- a/core/frontend/src/views/chart/chart/table/table-info.js +++ b/core/frontend/src/views/chart/chart/table/table-info.js @@ -705,8 +705,7 @@ function mappingColor(value, defaultColor, field, type) { function showTooltip(s2Instance, event) { const cell = s2Instance.getCell(event.target) - const meta = cell.getMeta() - const content = meta.value + const content = cell.actualText s2Instance.showTooltip({ position: { From 163bffbdea6a7ea2bd78cb032f5a3c1796777e5e Mon Sep 17 00:00:00 2001 From: dataeaseShu Date: Fri, 8 Sep 2023 11:56:19 +0800 Subject: [PATCH 10/21] =?UTF-8?q?fix:=20=E6=97=B6=E9=97=B4=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E7=BB=84=E4=BB=B6=E5=BC=B9=E6=A1=86=E9=94=99=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/frontend/src/views/panel/list/PanelViewShow.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/frontend/src/views/panel/list/PanelViewShow.vue b/core/frontend/src/views/panel/list/PanelViewShow.vue index 47123101de..3a68ffd854 100644 --- a/core/frontend/src/views/panel/list/PanelViewShow.vue +++ b/core/frontend/src/views/panel/list/PanelViewShow.vue @@ -937,7 +937,8 @@ export default { top: inherit !important; } - .track-menu { + .track-menu, + .coustom-date-picker { left: inherit !important; } } From ef78e4c7a7a7696254e51fb10b75aa28f4e7efb4 Mon Sep 17 00:00:00 2001 From: ulleo Date: Fri, 8 Sep 2023 12:03:43 +0800 Subject: [PATCH 11/21] =?UTF-8?q?fix:=20[AntV=E7=BB=84=E5=90=88=E5=9B=BE]?= =?UTF-8?q?=20=E6=A0=87=E7=AD=BE=E8=AE=BE=E7=BD=AE=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/antv/chartmix/data.vue | 8 ++--- .../src/views/antv/chartmix/index.vue | 32 +++++++++++-------- .../src/views/antv/chartmix/style.vue | 8 ++--- .../src/views/antv/sankey/data.vue | 6 ++-- .../src/views/antv/sankey/index.vue | 10 +++--- .../src/views/antv/sankey/style.vue | 8 ++--- 6 files changed, 38 insertions(+), 34 deletions(-) diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/data.vue b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/data.vue index aa2edfdbdc..25f736a7d7 100644 --- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/data.vue +++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/data.vue @@ -98,10 +98,10 @@