Merge pull request #11963 from dataease/pr@dev-v2_st

fix(系统设置): 字体管理间距不对

core/core-frontend/src/pages/index/main.ts

@@ -17,7 +17,6 @@ const setupAll = async () => {
   const app = createApp(App)
   installDirective(app)
   await setupI18n(app)
-  console.log('I18-loaded')
   setupStore(app)
   setupRouter(app)
   setupElementPlus(app)

core/core-frontend/src/views/system/font/UploadDetail.vue

@@ -118,7 +118,13 @@ const confirm = () => {
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisible" :before-close="cancel" :title="dialogTitle" width="420">
+  <el-dialog
+    class="create-dialog add-form_font_dialog"
+    v-model="dialogVisible"
+    :before-close="cancel"
+    :title="dialogTitle"
+    width="420"
+  >
     <el-form
       @submit.prevent
       ref="ruleFormRef"
@@ -187,3 +193,13 @@ const confirm = () => {
     </template>
   </el-dialog>
 </template>
+
+<style lang="less">
+.add-form_font_dialog {
+  .ed-dialog__footer {
+    border: none;
+    padding-top: 0;
+    margin-top: -2px;
+  }
+}
+</style>

core/core-frontend/src/views/visualized/data/dataset/form/CalcFieldEdit.vue

@@ -309,6 +309,7 @@ initFunction()
           <el-form
             require-asterisk-position="right"
             ref="formField"
+            @keydown.stop.prevent.enter
             :model="fieldForm"
             label-position="top"
           >
@@ -434,7 +435,7 @@ initFunction()
               <span
                 v-for="item in state.dimensionData"
                 :key="item.id"
-                class="item-dimension flex-align-center ellipsis"
+                class="item-dimension flex-align-center"
                 :title="item.name"
                 @click="insertFieldToCodeMirror('[' + item.name + ']')"
               >
@@ -444,7 +445,7 @@ initFunction()
                     :className="`field-icon-${fieldType[item.deType]}`"
                   ></Icon>
                 </el-icon>
-                {{ item.name }}
+                <span class="ellipsis" :title="item.name">{{ item.name }}</span>
               </span>
             </div>
             <div v-else class="class-na">{{ t('dataset.na') }}</div>
@@ -470,8 +471,7 @@ initFunction()
               <span
                 v-for="item in state.quotaData"
                 :key="item.id"
-                class="item-quota flex-align-center ellipsis"
-                :title="item.name"
+                class="item-quota flex-align-center"
                 @click="insertFieldToCodeMirror('[' + item.name + ']')"
               >
                 <el-icon v-if="!item.groupType">
@@ -483,7 +483,7 @@ initFunction()
                     :className="`field-icon-${fieldType[item.deType]}`"
                   ></Icon>
                 </el-icon>
-                {{ item.name }}
+                <span class="ellipsis" :title="item.name">{{ item.name }}</span>
                 <div v-if="!item.groupType" class="icon-right">
                   <el-icon @click.stop="updateParmasToQuota" class="hover-icon">
                     <Icon name="icon_edit_outlined"></Icon>
@@ -564,7 +564,13 @@ initFunction()
       title="添加计算参数"
       width="500"
     >
-      <el-form label-position="top" ref="formQuotaRef" :model="formQuota" :rules="formQuotaRules">
+      <el-form
+        @keydown.stop.prevent.enter
+        label-position="top"
+        ref="formQuotaRef"
+        :model="formQuota"
+        :rules="formQuotaRules"
+      >
         <el-form-item label="参数名称" prop="name">
           <el-input style="width: 100%" v-model="formQuota.name" placeholder="请输入1-50个字符" />
         </el-form-item>

core/core-frontend/src/views/workbranch/ShortcutOption.ts

@@ -1,7 +1,6 @@
 import { useI18n } from '@/hooks/web/useI18n'
 import request from '@/config/axios'
 const { t } = useI18n()
-console.log('useI18n', useI18n())
 export interface ShortcutRequest {
   keyword?: string
   type?: string