Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update linkis-web for 1.5.0 #4979

Merged
merged 2 commits into from
Nov 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion linkis-web/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "linkis",
"version": "1.4.0",
"version": "1.5.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
Expand Down
21 changes: 21 additions & 0 deletions linkis-web/release-docs/licenses/LICENSE-hint.css.txt
Original file line number Diff line number Diff line change
@@ -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.
21 changes: 21 additions & 0 deletions linkis-web/src/apps/linkis/assets/styles/console.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
21 changes: 21 additions & 0 deletions linkis-web/src/apps/linkis/assets/styles/hint.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions linkis-web/src/apps/linkis/components/variable/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 8 additions & 2 deletions linkis-web/src/apps/linkis/components/variable/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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')"
Expand Down Expand Up @@ -138,5 +145,4 @@ export default {
};
</script>
<style lang="scss" src="./index.scss">

</style>
Loading
Loading