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/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: '', 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')" /> 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