#237 将遗留的补丁合入08分支

Merged
avadesian merged 8 commits from V20210731.patch into V202108 2 years ago
  1. +6
    -5
      templates/repo/cloudbrain/new.tmpl
  2. +2
    -2
      web_src/js/components/EditAboutInfo.vue

+ 6
- 5
templates/repo/cloudbrain/new.tmpl View File

@@ -161,14 +161,15 @@

<div class="inline required field">
<label>镜像</label>
<select class="ui search" id="cloudbrain_image" placeholder="选择镜像" style='width:385px;' name="image">
<input type="text" list="cloudbrain_image" placeholder="选择镜像" name="image">
<datalist class="ui search" id="cloudbrain_image" style='width:385px;' name="image">
{{range .images}}
<option name="image" value="{{.Place}}">{{.PlaceView}}</option>
{{end}}
{{range .public_images}}
<option name="image" value="{{.Place}}">{{.PlaceView}}</option>
{{end}}
</select>
</datalist>
</div>

<div class="inline required field">
@@ -242,9 +243,9 @@
.dropdown();

$('#cloudbrain_image').select2({
placeholder: "选择镜像"
});
// $('#cloudbrain_image').select2({
// placeholder: "选择镜像"
// });

$(".ui.button.reset").click(function(e){


+ 2
- 2
web_src/js/components/EditAboutInfo.vue View File

@@ -1,9 +1,9 @@
<template>
<div>
<h4 id="about-desc" class="ui header">简介
<a class="edit-icon" href="javascript:void(0)" @click="editClick">
<!-- <a class="edit-icon" href="javascript:void(0)" @click="editClick">
<i class="gray edit outline icon"></i>
</a>
</a> -->
</h4>
<edit-dialog-cmpt
:vmContext="vmContext"


Loading…
Cancel
Save