Merge branch 'dev-v2' into pr@dev-v2_dzz

core/core-backend/src/main/java/io/dataease/engine/utils/SQLUtils.java

@@ -1,11 +1,13 @@
 package io.dataease.engine.utils;
 
+import java.util.Optional;
+
 /**
  * @Author Junjun
  */
 public class SQLUtils {
     public static String transKeyword(String value) {
-        return value.replaceAll("'", "\\\\'");
+        return Optional.ofNullable(value).orElse("").replaceAll("'", "\\\\'");
     }
 
     public static String buildOriginPreviewSql(String sql, int limit, int offset) {

core/core-frontend/flushbonading/index.js

@@ -129,10 +129,8 @@ htmlStream.pipe(parserStream).on('finish', () => {
   document.documentElement.insertBefore(head, document.querySelector('head'))`
 
   fs.writeFile('../dist/demo.html', template, err => {
-    console.log('写入成功')
   })
 
   fs.writeFile(`../dist/js/div_import_${suffix}.js`, templateJs, err => {
-    console.log('写入成功templateJs')
   })
 })

core/core-frontend/src/custom-component/rich-text/DeRichTextView.vue

@@ -58,7 +58,6 @@ import ChartError from '@/views/chart/components/views/components/ChartError.vue
 import { useEmitt } from '@/hooks/web/useEmitt'
 const snapshotStore = snapshotStoreWithOut()
 const errMsg = ref('')
-const curFields = ref([])
 const dvMainStore = dvMainStoreWithOut()
 const { canvasViewInfo } = storeToRefs(dvMainStore)
 const isError = ref(false)
@@ -371,7 +370,6 @@ const initCurFields = chartDetails => {
         yDataeaseNames.push(yItem.dataeaseName)
         yDataeaseNamesCfg[yItem.dataeaseName] = yItem.formatterCfg
       })
-      rowDataFormat(rowData, yDataeaseNames, yDataeaseNamesCfg)
     }
     for (const key in rowData) {
       dataRowSelect.value[nameIdMap[key]] = rowData[key]
@@ -388,15 +386,6 @@ const initCurFields = chartDetails => {
   }
 }
 
-const rowDataFormat = (rowData, yDataeaseNames, yDataeaseNamesCfg) => {
-  console.log(
-    'rowData, yDataeaseNames, yDataeaseNamesCfg',
-    rowData,
-    yDataeaseNames,
-    yDataeaseNamesCfg
-  )
-}
-
 const renderChart = () => {
   //do nothing
 }

core/core-frontend/src/layout/components/HeaderSystem.vue

@@ -48,6 +48,7 @@ const backToMain = () => {
   }
 
   .work-bar {
+    margin-right: 20px;
     color: rgba(255, 255, 255, 0.8);
     font-size: 14px;
     font-style: normal;

core/core-frontend/src/locales/zh-CN.ts

@@ -2124,7 +2124,7 @@ export default {
     empty_desc: '请在左侧输入信息然后保存'
   },
   setting_basic: {
-    autoCreateUser: '禁止第三方自动创建用户',
+    autoCreateUser: '第三方自动创建用户',
     dsIntervalTime: '数据源检测时间间隔',
     dsExecuteTime: '数据源检测频率'
   }

core/core-frontend/src/utils/DeShortcutKey.ts

@@ -101,7 +101,6 @@ let isShiftDown = false
 // 全局监听按键操作并执行相应命令
 export function listenGlobalKeyDown() {
   window.onkeydown = e => {
-    console.log('e.keyCode-down=' + e.keyCode)
     if (!isInEditor || checkDialog()) return
     const { keyCode } = e
     if (positionMoveKey[keyCode] && curComponent.value) {
@@ -129,7 +128,6 @@ export function listenGlobalKeyDown() {
   }
 
   window.onkeyup = e => {
-    console.log('e.keyCode=' + e.keyCode)
     if (e.keyCode === ctrlKey || e.keyCode === commandKey) {
       isCtrlOrCommandDown = false
       composeStore.setIsCtrlOrCmdDownStatus(false)

core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue

@@ -42,7 +42,7 @@ const buildSettingList = () => {
 const emits = defineEmits(['saved'])
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) return
-  await formEl.validate((valid, fields) => {
+  await formEl.validate(valid => {
     if (valid) {
       const param = buildSettingList()
       if (param.length < 2) {
@@ -62,8 +62,6 @@ const submitForm = async (formEl: FormInstance | undefined) => {
         .catch(() => {
           closeLoading()
         })
-    } else {
-      console.log('error submit!', fields)
     }
   })
 }
@@ -95,7 +93,6 @@ const edit = list => {
     state.form[item['pkey']] = pval || state.form[item['pkey']]
     return item
   })
-  console.log(state.settingList)
   dialogVisible.value = true
 }
 defineExpose({

core/core-frontend/src/views/system/parameter/email/EmailEdit.vue

@@ -38,7 +38,7 @@ const edit = () => {
 const emits = defineEmits(['saved'])
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) return
-  await formEl.validate((valid, fields) => {
+  await formEl.validate(valid => {
     if (valid) {
       const param = { ...state.form }
       const method = null
@@ -56,8 +56,6 @@ const submitForm = async (formEl: FormInstance | undefined) => {
         .catch(() => {
           closeLoading()
         })
-    } else {
-      console.log('error submit!', fields)
     }
   })
 }

core/core-frontend/src/views/system/parameter/index.vue

@@ -1,6 +1,6 @@
 <template>
   <p class="router-title">{{ t('commons.system_parameter_setting') }}</p>
-  <el-tabs v-model="activeName" @tab-click="handleClick">
+  <el-tabs v-model="activeName">
     <el-tab-pane v-for="item in tabArray" :key="item.name" :label="item.label" :name="item.name" />
   </el-tabs>
   <div class="sys-setting-p" :class="{ 'setting-auto-h': activeName !== 'map' }">
@@ -27,9 +27,6 @@ const tabArray = [
   /* {label: '引擎设置', name: 'engine'}, */
 ]
 const activeName = ref('basic')
-const handleClick = (tab, event: Event) => {
-  console.log(tab, event)
-}
 </script>
 <style lang="less">
 .router-title {

core/core-frontend/src/views/system/parameter/map/GeometryEdit.vue

@@ -89,8 +89,6 @@ const submitForm = async (formEl: FormInstance | undefined) => {
         .catch(() => {
           closeLoading()
         })
-    } else {
-      console.log('error submit!', fields)
     }
   })
 }

core/core-frontend/src/views/system/template-setting/index.vue

@@ -3,14 +3,5 @@
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue'
-import { useI18n } from '@/hooks/web/useI18n'
 import TemplateManage from '@/views/template/index.vue'
-
-const { t } = useI18n()
-
-const activeName = ref('basic')
-const handleClick = (tab, event: Event) => {
-  console.log(tab, event)
-}
 </script>

de-xpack

@@ -1 +1 @@
-Subproject commit e31c9212056eae3656aa534e3cc778d00001fe98
+Subproject commit 6d3d203321dce09f2fee101af80345bd30536ced