update linkis-web for 1.5.0 (#4979)

* chore: add new pages to linkis-web and fix bugs of web * upd: update version
apache · Nov 23, 2023 · 87661dd · 87661dd
1 parent 1afc612
commit 87661dd
Show file tree

Hide file tree

Showing 55 changed files with 3,122 additions and 590 deletions.
diff --git a/linkis-web/package.json b/linkis-web/package.json
@@ -1,6 +1,6 @@
 {
     "name": "linkis",
-    "version": "1.4.0",
+    "version": "1.5.0",
     "private": true,
     "scripts": {
         "serve": "vue-cli-service serve",

diff --git a/linkis-web/release-docs/licenses/LICENSE-hint.css.txt b/linkis-web/release-docs/licenses/LICENSE-hint.css.txt
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Kushagra Gour
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/linkis-web/src/apps/linkis/assets/styles/console.scss b/linkis-web/src/apps/linkis/assets/styles/console.scss
@@ -17,8 +17,29 @@
 
  @charset "UTF-8";
  @import '@/common/style/variables.scss';
+ @import './hint.min.css';
+//  * {
 
+//     font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "JinbiaoSong", "JinbiaoSongExt";
+//   }
+body {
+    font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif, "JinbiaoSong", "JinbiaoSongExt";
+}
 .console-page{
+    .ivu-input {
+        font-family: Arial, -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "JinbiaoSong", "JinbiaoSongExt";
+    }
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "JinbiaoSong", "JinbiaoSongExt" !important;
+    .monaco-editor {
+        --monaco-monospace-font: "SF Mono", Monaco, Menlo, Consolas, "Ubuntu Mono", "Liberation Mono", "DejaVu Sans Mono", "Courier New", monospace, "JinbiaoSong", "JinbiaoSongExt";
+    }
+    .monaco-mouse-cursor-text {
+        font-family: Consolas, "Courier New", monospace, "JinbiaoSong", "JinbiaoSongExt" !important;
+    }
+    .ivu-tooltip-inner {
+        overflow-wrap: break-word;
+        white-space: normal;
+    }
     position: $relative;
     width: $percent-all;
     height: $percent-all;

diff --git a/linkis-web/src/apps/linkis/assets/styles/hint.min.css b/linkis-web/src/apps/linkis/assets/styles/hint.min.css
diff --git a/linkis-web/src/apps/linkis/components/variable/index.scss b/linkis-web/src/apps/linkis/components/variable/index.scss
@@ -89,6 +89,11 @@
                     border: 1px solid red;
                 }
             }
+            .two-lines {
+                height: 60px;
+                resize: none;
+                overflow-y: scroll;
+            }
             .we-variable-content-input[disabled] {
                 background-color: #f3f3f3;
                 opacity: 1;

diff --git a/linkis-web/src/apps/linkis/components/variable/index.vue b/linkis-web/src/apps/linkis/components/variable/index.vue
@@ -36,7 +36,7 @@
       <template v-for="(item, index) in variable.settings">
         <div
           :key="index"
-          :title="item.description"
+          :title="`${item.description}${item.specialLimit ? $t('message.linkis.setting.maxLimit', { limit: item.specialLimit.maxValue }) : ''}`"
           class="we-variable-content-item"
           v-if="getItemIsShow(item)">
           <span class="we-variable-content-label-group">
@@ -54,6 +54,13 @@
               :key="i"
               :value="validateItem">{{ validateItem }}</Option>
           </Select>
+          <textarea
+            v-model="item.configValue"
+            :placeholder="item.defaultValue ? `${$t('message.linkis.defaultValue')}:${item.defaultValue}` : $t('message.linkis.noDefaultValue')"
+            class="two-lines we-variable-content-input"
+            :class="{'un-valid': unValid && unValid.key === item.key}"
+            v-else-if="item.key === 'spark.conf'">
+         </textarea>
           <input
             v-model="item.configValue"
             :placeholder="item.defaultValue ? `${$t('message.linkis.defaultValue')}:${item.defaultValue}` : $t('message.linkis.noDefaultValue')"
@@ -138,5 +145,4 @@ export default {
 };
 </script>
 <style lang="scss" src="./index.scss">
-
 </style>