From b43a6e656527512975b93f3ee4eeaaf2be4d55a2 Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Thu, 6 Jun 2024 18:41:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?refactor(=E5=9B=BE=E8=A1=A8):=20=E6=8C=87?= =?UTF-8?q?=E6=A0=87=E5=8D=A1=E9=BB=98=E8=AE=A4=E9=80=8F=E6=98=8E=E8=83=8C?= =?UTF-8?q?=E6=99=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/chart/components/editor/util/chart.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/core-frontend/src/views/chart/components/editor/util/chart.ts b/core/core-frontend/src/views/chart/components/editor/util/chart.ts index 0d20515662..b3e756dda5 100644 --- a/core/core-frontend/src/views/chart/components/editor/util/chart.ts +++ b/core/core-frontend/src/views/chart/components/editor/util/chart.ts @@ -389,7 +389,7 @@ export const DEFAULT_INDICATOR_STYLE: ChartIndicatorStyle = { fontFamily: 'Microsoft YaHei', letterSpace: 0, fontShadow: false, - backgroundColor: '#fff', + backgroundColor: '', suffixEnable: true, suffix: '', From 0d0ddf6c70f479006d4c65bf151b56123cfbb9f8 Mon Sep 17 00:00:00 2001 From: dataeaseShu Date: Wed, 12 Jun 2024 10:48:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8DSQL=E5=8F=82=E6=95=B0=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/style/index.less | 1 - .../src/views/visualized/data/dataset/form/AddSql.vue | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/core-frontend/src/style/index.less b/core/core-frontend/src/style/index.less index 9e585eb051..4e79048f4c 100644 --- a/core/core-frontend/src/style/index.less +++ b/core/core-frontend/src/style/index.less @@ -7,7 +7,6 @@ color-scheme: light dark; - font-synthesis: none; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; -webkit-text-size-adjust: 100%; diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue b/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue index 998c319bc6..41c1b6b64e 100644 --- a/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue +++ b/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue @@ -785,6 +785,8 @@ const mousedownDrag = () => { v-if="scope.row.type[0] === 'DATETIME-YEAR'" v-model="scope.row.defaultValue" type="year" + format="YYYY" + value-format="YYYY" :placeholder="t('dataset.select_year')" /> From 2a351815b68dd69a87877a37c72071d159f583fa Mon Sep 17 00:00:00 2001 From: xuwei-fit2cloud Date: Tue, 11 Jun 2024 14:45:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E6=97=B6=E5=AE=89=E8=A3=85=E8=B7=AF=E5=BE=84=E8=A2=AB=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E9=BB=98=E8=AE=A4=20/opt=20=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- installer/install.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/installer/install.sh b/installer/install.sh index 5b1c199f38..5cd3712750 100644 --- a/installer/install.sh +++ b/installer/install.sh @@ -33,6 +33,7 @@ function check_and_prepare_env_params() { if [ -f /usr/bin/dectl ]; then # 获取已安装的 DataEase 的运行目录 DE_BASE=$(grep "^DE_BASE=" /usr/bin/dectl | cut -d'=' -f2) + DE_BASE_OLD=$DE_BASE sed -i -e "s#DE_BASE=.*#DE_BASE=${DE_BASE}#g" dectl \cp dectl /usr/local/bin && chmod +x /usr/local/bin/dectl @@ -54,6 +55,10 @@ function check_and_prepare_env_params() { set -a source ${CURRENT_DIR}/install.conf + if [[ $DE_BASE_OLD ]];then + DE_BASE=$DE_BASE_OLD + export DE_BASE=$DE_BASE_OLD + fi if [[ -d $DE_BASE ]] && [[ -f $DE_BASE/dataease2.0/.env ]]; then source $DE_BASE/dataease2.0/.env INSTALL_TYPE='upgrade' @@ -61,7 +66,7 @@ function check_and_prepare_env_params() { conf_install_mode=$(prop $CURRENT_DIR/install.conf DE_INSTALL_MODE) if [[ $DE_INSTALL_MODE == 'community' ]] && [[ $conf_install_mode == 'enterprise' ]];then DE_INSTALL_MODE=$conf_install_mode - export DE_INSTALL_MODE + export DE_INSTALL_MODE=$conf_install_mode fi log_content "升级安装" else