From 7b952b64a2b7273c6d2af68200a6ae790d9b59b1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 10 六月 2021 16:33:00 +0800
Subject: [PATCH] 2021-06-10
---
src/tabviews/custom/components/chart/antv-bar-line/index.jsx | 4 ++--
config/webpack.config.js | 11 +++++++----
src/tabviews/zshare/actionList/normalbutton/index.jsx | 8 +++++++-
3 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 54b9961..a793358 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -173,14 +173,16 @@
pathinfo: isEnvDevelopment,
// There will be one main bundle, and one file per asynchronous chunk.
// In development, it does not produce real files.
+ // contenthash => hash
filename: isEnvProduction
- ? 'static/js/[name].[contenthash:8].js'
+ ? 'static/js/[name].[hash:8].js'
: isEnvDevelopment && 'static/js/bundle.js',
// TODO: remove this when upgrading to webpack 5
futureEmitAssets: true,
// There are also additional JS chunk files if you use code splitting.
+ // contenthash => hash
chunkFilename: isEnvProduction
- ? 'static/js/[name].[contenthash:8].chunk.js'
+ ? 'static/js/[name].[hash:8].chunk.js'
: isEnvDevelopment && 'static/js/[name].chunk.js',
// We inferred the "public path" (such as / or /my-project) from homepage.
// We use "/" in development.
@@ -565,8 +567,9 @@
new MiniCssExtractPlugin({
// Options similar to the same options in webpackOptions.output
// both options are optional
- filename: 'static/css/[name].[contenthash:8].css',
- chunkFilename: 'static/css/[name].[contenthash:8].chunk.css',
+ // contenthash => hash
+ filename: 'static/css/[name].[hash:8].css',
+ chunkFilename: 'static/css/[name].[hash:8].chunk.css',
}),
// Generate a manifest file which contains a mapping of all asset filenames
// to their corresponding output file so that tools can pick it up without
diff --git a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
index 8b34453..2f30000 100644
--- a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
@@ -829,7 +829,7 @@
}
chart.scale(_valfield, {
nice: true,
- range: [0, 0.93]
+ range: [0, 0.9]
})
// 鍧愭爣杞存牸寮忓寲
@@ -1238,7 +1238,7 @@
view2.scale(item.name, {
nice: true,
- range: [0, 0.93]
+ range: [0, 0.9]
})
let _chart = view2
.interval()
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 34b102b..03857a3 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -1613,13 +1613,19 @@
_initval = ''
}
+ let _type = item.type
+
+ if (['date', 'datemonth', 'datetime'].includes(_type) && item.declareType === 'nvarchar(50)') {
+ _type = 'text'
+ }
+
result.push({
key: item.field,
readonly: item.readonly === 'true',
readin: _readin,
fieldlen: _fieldlen,
writein: item.writein !== 'false',
- type: item.type,
+ type: _type,
value: _initval
})
})
--
Gitblit v1.8.0