From c05d734af91289894eac03f2e141c2e31193ea66 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 17 五月 2024 16:42:59 +0800
Subject: [PATCH] 2024-05-17
---
src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx | 8 ++++----
src/templates/zshare/verifycard/index.jsx | 12 ++++++------
src/menu/components/chart/chart-custom/index.jsx | 11 +++++------
3 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/src/menu/components/chart/chart-custom/index.jsx b/src/menu/components/chart/chart-custom/index.jsx
index 5dc3f45..d5ba312 100644
--- a/src/menu/components/chart/chart-custom/index.jsx
+++ b/src/menu/components/chart/chart-custom/index.jsx
@@ -4,7 +4,6 @@
import { Popover, notification } from 'antd'
import { ToolOutlined, DeleteOutlined, FontColorsOutlined, PlusCircleOutlined } from '@ant-design/icons'
import { Chart } from '@antv/g2'
-import DataSet from '@antv/data-set'
import * as echarts from 'echarts'
import MKEmitter from '@/utils/events.js'
@@ -137,8 +136,8 @@
if (card.plot.chartType === 'antv') {
try {
// eslint-disable-next-line
- let func = new Function('Chart', 'DataSet', 'wrap', 'data', 'config', card.plot.script)
- func(Chart, DataSet, this.wrap, [], card)
+ let func = new Function('Chart', 'chartId', 'data', 'config', card.plot.script)
+ func(Chart, card.uuid + 'canvas', [], card)
} catch (e) {
console.warn(e)
@@ -151,8 +150,8 @@
} else if (card.plot.chartType === 'echarts') {
try {
// eslint-disable-next-line
- let func = new Function('echarts', 'DataSet', 'wrap', 'data', 'config', card.plot.script)
- func(echarts, DataSet, this.wrap, [], card)
+ let func = new Function('echarts', 'chartId', 'data', 'config', card.plot.script)
+ func(echarts, card.uuid + 'canvas', [], card)
} catch (e) {
console.warn(e)
@@ -262,7 +261,7 @@
</Popover>
<NormalHeader config={card} updateComponent={this.updateComponent}/>
<div className="canvas-wrap" style={{height: card.plot.height}}>
- <div className="canvas" id={card.uuid + 'canvas'} style={{height: getHeight(card.plot.height)}} ref={ref => this.wrap = ref}></div>
+ <div className="canvas" id={card.uuid + 'canvas'} style={{height: getHeight(card.plot.height)}}></div>
</div>
<div className="component-name">
<div className="center">
diff --git a/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx
index bbad3ad..5e80f9d 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx
@@ -217,10 +217,10 @@
_select.push(`@${_f.field}='1949-10-01'`)
} else if (_f.type === 'number') {
_type = `decimal(18,${_fieldlen})`
- _select.push(`@${_f.field}=0`)
+ _select.push(`@${_f.field}=1`)
} else if (_f.type === 'rate') {
_type = `decimal(18,2)`
- _select.push(`@${_f.field}=0`)
+ _select.push(`@${_f.field}=1`)
} else {
_select.push(`@${_f.field}=''`)
}
@@ -245,8 +245,8 @@
fieldArr.push(_f.field.toLowerCase())
_usefulfields.push(_f.field)
- if (/decimal/ig.test(_f.datatype)) {
- _select.push(`@${_f.field}=0`)
+ if (/decimal|int/ig.test(_f.datatype)) {
+ _select.push(`@${_f.field}=1`)
} else {
_select.push(`@${_f.field}=''`)
}
diff --git a/src/templates/zshare/verifycard/index.jsx b/src/templates/zshare/verifycard/index.jsx
index ee82600..8bc3126 100644
--- a/src/templates/zshare/verifycard/index.jsx
+++ b/src/templates/zshare/verifycard/index.jsx
@@ -775,13 +775,13 @@
_select.push(`@${_f.field}='1949-10-01'`)
} else if (_f.type === 'number') {
_type = `decimal(18,${_fieldlen})`
- _select.push(`@${_f.field}=0`)
+ _select.push(`@${_f.field}=1`)
} else if (_f.declare === 'decimal') {
_type = `decimal(18,${_f.decimal || 0})`
- _select.push(`@${_f.field}=0`)
+ _select.push(`@${_f.field}=1`)
} else if (_f.type === 'rate') {
_type = `decimal(18,2)`
- _select.push(`@${_f.field}=0`)
+ _select.push(`@${_f.field}=1`)
} else {
_select.push(`@${_f.field}=''`)
}
@@ -817,8 +817,8 @@
colfields.push(_f.field)
if (_f.datatype) { // 鑷畾涔夊瓧娈�
- if (/decimal/ig.test(_f.datatype)) {
- _select.push(`@${_f.field}=0`)
+ if (/decimal|int/ig.test(_f.datatype)) {
+ _select.push(`@${_f.field}=1`)
} else {
_select.push(`@${_f.field}=''`)
}
@@ -842,7 +842,7 @@
}
if (_f.type === 'number') {
- _select.push(`@${_f.field}=0`)
+ _select.push(`@${_f.field}=1`)
} else {
_select.push(`@${_f.field}=''`)
}
--
Gitblit v1.8.0