From a7938fbc431502c0a631f188b6e8d7ae5e67a3d1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 06 一月 2022 18:27:07 +0800
Subject: [PATCH] 2022-01-06
---
src/views/billprint/index.jsx | 28 +++++++++++++++++++++-------
src/tabviews/custom/components/tree/antd-tree/index.jsx | 2 +-
src/utils/option.js | 10 ++++++++++
src/menu/modulesource/option.jsx | 14 +++++++-------
4 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/src/menu/modulesource/option.jsx b/src/menu/modulesource/option.jsx
index 4425e8f..c9a112a 100644
--- a/src/menu/modulesource/option.jsx
+++ b/src/menu/modulesource/option.jsx
@@ -32,16 +32,16 @@
{ type: 'menu', url: Mainsearch, component: 'search', subtype: 'mainsearch', title: '鎼滅储鏉′欢', width: 24, forbid: ['billPrint'] },
{ type: 'menu', url: card1, component: 'card', subtype: 'datacard', title: '鏁版嵁鍗�', width: 24 },
{ type: 'menu', url: card2, component: 'card', subtype: 'propcard', title: '灞炴�у崱', width: 24 },
- { type: 'menu', url: card2, component: 'balcony', subtype: 'balcony', title: '娴姩鍗�', width: 24 },
- { type: 'menu', url: form, component: 'form', subtype: 'stepform', title: '琛ㄥ崟锛堝垎姝ワ級', width: 24 },
- { type: 'menu', url: tabForm, component: 'form', subtype: 'tabform', title: '琛ㄥ崟锛坱ab椤碉級', width: 24 },
+ { type: 'menu', url: card2, component: 'balcony', subtype: 'balcony', title: '娴姩鍗�', width: 24, forbid: ['billPrint'] },
+ { type: 'menu', url: form, component: 'form', subtype: 'stepform', title: '琛ㄥ崟锛堝垎姝ワ級', width: 24, forbid: ['billPrint'] },
+ { type: 'menu', url: tabForm, component: 'form', subtype: 'tabform', title: '琛ㄥ崟锛坱ab椤碉級', width: 24, forbid: ['billPrint'] },
{ type: 'menu', url: Carousel, component: 'carousel', subtype: 'datacard', title: '杞挱-鍔ㄦ�佹暟鎹�', width: 24, forbid: ['billPrint'] },
{ type: 'menu', url: Carousel1, component: 'carousel', subtype: 'propcard', title: '杞挱-闈欐�佹暟鎹�', width: 24, forbid: ['billPrint'] },
{ type: 'menu', url: NormalTable, component: 'table', subtype: 'normaltable', title: '甯哥敤琛�', width: 24 },
- { type: 'menu', url: NormalTable, component: 'table', subtype: 'editable', title: '琛ㄦ牸锛堝彲缂栬緫锛�', width: 24 },
+ { type: 'menu', url: NormalTable, component: 'table', subtype: 'editable', title: '琛ㄦ牸锛堝彲缂栬緫锛�', width: 24, forbid: ['billPrint'] },
{ type: 'menu', url: TableCard, component: 'table', subtype: 'tablecard', title: '琛ㄦ牸锛堝崱鐗囷級', width: 12 },
{ type: 'menu', url: timeline, component: 'timeline', subtype: 'timeline', title: '鏃堕棿杞�', width: 12 },
- { type: 'menu', url: tree, component: 'tree', subtype: 'normaltree', title: '鏍戝舰鍒楄〃', width: 12 },
+ { type: 'menu', url: tree, component: 'tree', subtype: 'normaltree', title: '鏍戝舰鍒楄〃', width: 12, forbid: ['billPrint'] },
{ type: 'menu', url: line, component: 'line', subtype: 'line', title: '鎶樼嚎鍥�', width: 24 },
{ type: 'menu', url: line1, component: 'line', subtype: 'line1', title: '闃舵鎶樼嚎鍥�', width: 24 },
{ type: 'menu', url: bar, component: 'bar', subtype: 'bar', title: '鏌辩姸鍥�', width: 24 },
@@ -53,8 +53,8 @@
{ type: 'menu', url: dashboard, component: 'dashboard', subtype: 'dashboard', title: '浠〃鐩�', width: 12 },
{ type: 'menu', url: ratioboard, component: 'dashboard', subtype: 'ratioboard', title: '鍗犳瘮鍥�', width: 12 },
{ type: 'menu', url: scatter, component: 'scatter', subtype: 'scatter', title: '鏁ｇ偣鍥�', width: 24 },
- { type: 'menu', url: chart, component: 'chart', subtype: 'custom', title: '鑷畾涔夊浘琛�', width: 24 },
- { type: 'menu', url: Editor, component: 'editor', subtype: 'brafteditor', title: '瀵屾枃鏈�', width: 24 },
+ { type: 'menu', url: chart, component: 'chart', subtype: 'custom', title: '鑷畾涔夊浘琛�', width: 24, forbid: ['billPrint'] },
+ { type: 'menu', url: Editor, component: 'editor', subtype: 'brafteditor', title: '瀵屾枃鏈�', width: 24, forbid: ['billPrint'] },
{ type: 'menu', url: SandBox, component: 'code', subtype: 'sandbox', title: '鑷畾涔�', width: 24 },
{ type: 'menu', url: group, component: 'group', subtype: 'normalgroup', title: '鍒嗙粍', width: 24, forbid: ['billPrint'] },
]
diff --git a/src/tabviews/custom/components/tree/antd-tree/index.jsx b/src/tabviews/custom/components/tree/antd-tree/index.jsx
index 9788af1..c711cb6 100644
--- a/src/tabviews/custom/components/tree/antd-tree/index.jsx
+++ b/src/tabviews/custom/components/tree/antd-tree/index.jsx
@@ -291,7 +291,7 @@
})
setTimeout(() => {
- MKEmitter.emit('resetSelectLine', config.uuid, _treeNodes[0].$key, '')
+ MKEmitter.emit('resetSelectLine', config.uuid, _treeNodes[0].$key, _treeNodes[0])
}, 200)
}
}
diff --git a/src/utils/option.js b/src/utils/option.js
index 60f45a3..b8b73e7 100644
--- a/src/utils/option.js
+++ b/src/utils/option.js
@@ -123,6 +123,11 @@
{value: -7, text: '鍚庝竷澶�'},
{value: -30, text: '鍚�30澶�'},
{value: -90, text: '鍚�90澶�'},
+ {value: -180, text: '鍚庡崐骞�'},
+ {value: -365, text: '鍚�1骞�'},
+ {value: -1095, text: '鍚�3骞�'},
+ {value: -1825, text: '鍚�5骞�'},
+ {value: -3650, text: '鍚�10骞�'},
{value: -7300, text: '鍚�20骞�'},
],
dateweek: [
@@ -171,6 +176,11 @@
{value: -7, text: '鍚庝竷澶�'},
{value: -30, text: '鍚�30澶�'},
{value: -90, text: '鍚�90澶�'},
+ {value: -180, text: '鍚庡崐骞�'},
+ {value: -365, text: '鍚�1骞�'},
+ {value: -1095, text: '鍚�3骞�'},
+ {value: -1825, text: '鍚�5骞�'},
+ {value: -3650, text: '鍚�10骞�'},
{value: -7300, text: '鍚�20骞�'},
]
}
diff --git a/src/views/billprint/index.jsx b/src/views/billprint/index.jsx
index 7307a3d..a3764b8 100644
--- a/src/views/billprint/index.jsx
+++ b/src/views/billprint/index.jsx
@@ -17,12 +17,14 @@
// 閫氱敤缁勪欢
const AntvBarAndLine = asyncComponent(() => import('@/tabviews/custom/components/chart/antv-bar-line'))
const AntvPie = asyncComponent(() => import('@/tabviews/custom/components/chart/antv-pie'))
+const AntvDashboard = asyncComponent(() => import('@/tabviews/custom/components/chart/antv-dashboard'))
+const AntvScatter = asyncComponent(() => import('@/tabviews/custom/components/chart/antv-scatter'))
const DataCard = asyncComponent(() => import('@/tabviews/custom/components/card/data-card'))
const PropCard = asyncComponent(() => import('@/tabviews/custom/components/card/prop-card'))
const TableCard = asyncComponent(() => import('@/tabviews/custom/components/card/table-card'))
const NormalTable = asyncComponent(() => import('@/tabviews/custom/components/table/normal-table'))
-const BraftEditor = asyncComponent(() => import('@/tabviews/custom/components/editor/braft-editor'))
const SandBox = asyncComponent(() => import('@/tabviews/custom/components/code/sand-box'))
+const TimeLine = asyncComponent(() => import('@/tabviews/custom/components/timeline/normal-timeline'))
class BillPrint extends Component {
state = {
@@ -591,6 +593,18 @@
<AntvPie config={item} initdata={item.data} mainSearch={[]} menuType="" />
</Col>
)
+ } else if (item.type === 'scatter') {
+ return (
+ <Col span={item.width} key={item.uuid}>
+ <AntvScatter config={item} initdata={item.data} mainSearch={[]} menuType="" />
+ </Col>
+ )
+ } else if (item.type === 'dashboard') {
+ return (
+ <Col span={item.width} key={item.uuid}>
+ <AntvDashboard config={item} initdata={item.data} mainSearch={[]} menuType="" />
+ </Col>
+ )
} else if (item.type === 'card' && item.subtype === 'datacard') {
return (
<Col span={item.width} key={item.uuid}>
@@ -615,18 +629,18 @@
<NormalTable config={item} initdata={item.data} mainSearch={[]} menuType="" />
</Col>
)
- } else if (item.type === 'editor') {
- return (
- <Col span={item.width} key={item.uuid}>
- <BraftEditor config={item} initdata={item.data} mainSearch={[]} menuType="" />
- </Col>
- )
} else if (item.type === 'code') {
return (
<Col span={item.width} key={item.uuid}>
<SandBox config={item} initdata={item.data} mainSearch={[]} menuType="" />
</Col>
)
+ } else if (item.type === 'timeline') {
+ return (
+ <Col span={item.width} key={item.uuid}>
+ <TimeLine config={item} initdata={item.data} menuType="" />
+ </Col>
+ )
} else {
return null
}
--
Gitblit v1.8.0