gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme

Browse Source 
# Conflicts:
#	nezha-fronted/src/components/cli/webSSH.vue
#	nezha-fronted/src/components/common/alert/alertLabel2.vue
#	nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
#	nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
#	nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
#	nezha-fronted/src/components/common/rightBox/moduleBox.vue
#	nezha-fronted/src/components/page/config/system.vue
#	nezha-fronted/src/components/page/monitor/project/index.vue
This commit is contained in:
chenjinsong
2021-11-11 11:28:19 +08:00
parent e7273d0be0 6abf76db08
commit a0dcb8d877
10076 changed files with 1357 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nezha-fronted/src/components/common/project/L5/CanvasProps.vue
View File

@@ -667,7 +667,7 @@
controls-position="right"
size="small" name="x"
class="input"
v-model.number="selection.pen.font.fontSize"
v-model.number="selection.pen.fontSize"
:readonly="readonly"
required
@change="onChange()"></el-input-number>
@@ -687,7 +687,7 @@
<el-select :placeholder="$t('el.select.placeholder')" :popper-append-to-body="true"
class="right-box-row-with-btn no-style-class" popper-class="chart-box-dropdown-small"
size="mini"
v-model="selection.pen.font.textAlign" value-key="chartType" @change="onChange">
v-model="selection.pen.textAlign" value-key="chartType" @change="onChange">
<el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in textAlignOptions">
<span class="panel-dropdown-label-txt">{{ item.name }}</span>
</el-option>
@@ -701,7 +701,7 @@
<el-select :placeholder="$t('el.select.placeholder')" :popper-append-to-body="true"
class="right-box-row-with-btn no-style-class" popper-class="chart-box-dropdown-small"
size="mini"
v-model="selection.pen.font.textBaseline" value-key="chartType" @change="onChange">
v-model="selection.pen.textBaseline" value-key="chartType" @change="onChange">
<el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in textBaselineOptions">
<span class="panel-dropdown-label-txt">{{ item.name }}</span>
</el-option>
@@ -1659,7 +1659,7 @@ export default {
}
}
if (name === 'fontColor') {
this.selection.pen.font.color = this.colorRGBtoHex(val)
// this.selection.pen.font.color = this.colorRGBtoHex(val)
}
this.selection.pen.data[name] = this.colorRGBtoHex(val)
this.onChange()