mirror of
				https://github.com/TeaOSLab/EdgeAdmin.git
				synced 2025-11-04 05:00:25 +08:00 
			
		
		
		
	实现自动匹配证书和批量选择证书功能
This commit is contained in:
		@@ -14,7 +14,6 @@ Tea.context(function () {
 | 
			
		||||
	// 批量上传证书
 | 
			
		||||
	this.uploadBatch = function () {
 | 
			
		||||
		teaweb.popup("/servers/certs/uploadBatchPopup", {
 | 
			
		||||
			height: "30em",
 | 
			
		||||
			callback: function () {
 | 
			
		||||
				window.location.reload()
 | 
			
		||||
			}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,26 +1,48 @@
 | 
			
		||||
{$layout "layout_popup"}
 | 
			
		||||
 | 
			
		||||
<h3>选择证书</h3>
 | 
			
		||||
<h3>选择证书 <span v-if="searchingDomains.length > 0">(当前服务域名:{{searchingDomains[0]}}<var style="font-style: normal" v-if="searchingDomains.length > 1">等{{searchingDomains.length}}个域名</var>)</span></h3>
 | 
			
		||||
 | 
			
		||||
<!-- 搜索表单 -->
 | 
			
		||||
<form class="ui form" action="/servers/certs/selectPopup">
 | 
			
		||||
    <input type="hidden" name="selectedCertIds" :value="selectedCertIds"/>
 | 
			
		||||
    <input type="hidden" name="searchingType" :value="searchingType"/>
 | 
			
		||||
    <input type="hidden" name="searchingDomains" :value="searchingDomains.join(',')"/>
 | 
			
		||||
    <div class="ui fields inline">
 | 
			
		||||
        <div class="ui field">
 | 
			
		||||
            <user-selector :v-user-id="userId"></user-selector>
 | 
			
		||||
        </div>
 | 
			
		||||
        <div class="ui field">
 | 
			
		||||
            <input type="text" name="keyword" v-model="keyword" placeholder="域名、说明文字等" size="30"/>
 | 
			
		||||
        </div>
 | 
			
		||||
        <div class="ui field">
 | 
			
		||||
            <button class="ui button" type="submit">搜索</button>  
 | 
			
		||||
            <a :href="'/servers/certs/selectPopup?selectedCertIds=' + selectedCertIds" v-if="keyword.length > 0">[清除条件]</a>
 | 
			
		||||
            <a :href="'/servers/certs/selectPopup?selectedCertIds=' + selectedCertIds + '&searchingType=' + searchingType + '&searchingDomains=' + encodeURL(searchingDomains.join(','))" v-if="keyword.length > 0">[清除条件]</a>
 | 
			
		||||
        </div>
 | 
			
		||||
    </div>
 | 
			
		||||
</form>
 | 
			
		||||
 | 
			
		||||
<!-- 选项卡 -->
 | 
			
		||||
<div v-if="searchingDomains.length > 0">
 | 
			
		||||
    <div class="ui divider" style="margin-bottom: 0"></div>
 | 
			
		||||
    <second-menu>
 | 
			
		||||
        <menu-item :active="searchingType == 'all'" :href="baseURL + '&searchingType=all'">所有证书 <span class="small">({{totalAll}})</span></menu-item>
 | 
			
		||||
        <span class="disabled item">|</span>
 | 
			
		||||
        <menu-item :active="searchingType == 'match'" :href="baseURL + '&searchingType=match'">域名匹配证书 <span class="small"> ({{totalMatch}})</span></menu-item>
 | 
			
		||||
    </second-menu>
 | 
			
		||||
</div>
 | 
			
		||||
 | 
			
		||||
<!-- 全选 -->
 | 
			
		||||
<div v-if="countChecked > 0">
 | 
			
		||||
    <div class="margin"></div>
 | 
			
		||||
    <button class="ui button small basic" type="button" @click.prevent="confirmChecked">使用选中的{{countChecked}}个证书</button>
 | 
			
		||||
</div>
 | 
			
		||||
 | 
			
		||||
<!-- 证书列表 -->
 | 
			
		||||
<p class="comment" v-if="certs.length == 0">暂时还没有相关的证书。</p>
 | 
			
		||||
<p class="comment" v-if="certs.length == 0">暂时还没有<span v-if="searchingType == 'match'">跟所添加域名匹配的</span>相关证书。</p>
 | 
			
		||||
<table class="ui table selectable celled" v-if="certs.length > 0">
 | 
			
		||||
	<thead>
 | 
			
		||||
        <tr>
 | 
			
		||||
            <th style="width:1em"><checkbox @input="changeAll"></checkbox></th>
 | 
			
		||||
            <th>证书说明</th>
 | 
			
		||||
            <th>域名</th>
 | 
			
		||||
            <th>过期日期</th>
 | 
			
		||||
@@ -30,6 +52,9 @@
 | 
			
		||||
        </tr>
 | 
			
		||||
	</thead>
 | 
			
		||||
	<tr v-for="(cert, index) in certs">
 | 
			
		||||
        <td>
 | 
			
		||||
            <checkbox v-model="cert.isChecked" ref="certCheckboxes" @input="changeCertChecked" v-if="!certInfos[index].isSelected"></checkbox>
 | 
			
		||||
        </td>
 | 
			
		||||
        <td>
 | 
			
		||||
            <a href="" @click.prevent="selectCert(cert)" v-if="!certInfos[index].isSelected"><keyword :v-word="keyword">{{cert.name}}</keyword></a>
 | 
			
		||||
            <span  v-if="certInfos[index].isSelected">{{cert.name}}</span>
 | 
			
		||||
 
 | 
			
		||||
@@ -11,4 +11,67 @@ Tea.context(function () {
 | 
			
		||||
			}
 | 
			
		||||
		})
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	this.encodeURL = function (arg) {
 | 
			
		||||
		return window.encodeURIComponent(arg)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	/**
 | 
			
		||||
	 * 复选框
 | 
			
		||||
	 */
 | 
			
		||||
	this.countChecked = 0
 | 
			
		||||
 | 
			
		||||
	this.certs.forEach(function (cert) {
 | 
			
		||||
		cert.isChecked = false
 | 
			
		||||
	})
 | 
			
		||||
 | 
			
		||||
	this.changeAll = function (b) {
 | 
			
		||||
		let that = this
 | 
			
		||||
		this.certs.forEach(function (cert) {
 | 
			
		||||
			cert.isChecked = b
 | 
			
		||||
		})
 | 
			
		||||
 | 
			
		||||
		if (b) {
 | 
			
		||||
			let countChecked = 0
 | 
			
		||||
			this.certs.forEach(function (cert, index) {
 | 
			
		||||
				if (cert.isChecked && !that.certInfos[index].isSelected) {
 | 
			
		||||
					countChecked++
 | 
			
		||||
				}
 | 
			
		||||
			})
 | 
			
		||||
			this.countChecked = countChecked
 | 
			
		||||
		} else {
 | 
			
		||||
			this.countChecked = 0
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	this.changeCertChecked = function () {
 | 
			
		||||
		let countChecked = 0
 | 
			
		||||
		this.certs.forEach(function (cert) {
 | 
			
		||||
			if (cert.isChecked) {
 | 
			
		||||
				countChecked++
 | 
			
		||||
			}
 | 
			
		||||
		})
 | 
			
		||||
		this.countChecked = countChecked
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	this.confirmChecked = function () {
 | 
			
		||||
		let resultCerts = []
 | 
			
		||||
		let resultCertRefs = []
 | 
			
		||||
		this.certs.forEach(function (cert) {
 | 
			
		||||
			if (cert.isChecked) {
 | 
			
		||||
				resultCerts.push(cert)
 | 
			
		||||
				resultCertRefs.push({
 | 
			
		||||
					isOn: true,
 | 
			
		||||
					certId: cert.id
 | 
			
		||||
				})
 | 
			
		||||
			}
 | 
			
		||||
		})
 | 
			
		||||
		NotifyPopup({
 | 
			
		||||
			code: 200,
 | 
			
		||||
			data: {
 | 
			
		||||
				certs: resultCerts,
 | 
			
		||||
				certRefs: resultCertRefs
 | 
			
		||||
			}
 | 
			
		||||
		})
 | 
			
		||||
	}
 | 
			
		||||
})
 | 
			
		||||
@@ -7,14 +7,14 @@
 | 
			
		||||
            <h3>新网站服务主要信息:</h3>
 | 
			
		||||
            <table class="ui table selectable definition">
 | 
			
		||||
                <tr v-show="hasUsers">
 | 
			
		||||
                    <td>所属用户<optional-label></optional-label></td>
 | 
			
		||||
                    <td class="title">所属用户<optional-label></optional-label></td>
 | 
			
		||||
                    <td>
 | 
			
		||||
                        <user-selector @change="changeUserId"></user-selector>
 | 
			
		||||
                        <p class="comment">当前服务所属平台用户。</p>
 | 
			
		||||
                    </td>
 | 
			
		||||
                </tr>
 | 
			
		||||
                <tr v-if="plans.length > 0">
 | 
			
		||||
                    <td>选择套餐</td>
 | 
			
		||||
                    <td class="title">选择套餐</td>
 | 
			
		||||
                    <td>
 | 
			
		||||
                        <select class="ui dropdown auto-width" name="userPlanId">
 | 
			
		||||
                            <option value="0">[选择套餐]</option>
 | 
			
		||||
@@ -23,7 +23,7 @@
 | 
			
		||||
                    </td>
 | 
			
		||||
                </tr>
 | 
			
		||||
                <tr>
 | 
			
		||||
                    <td>部署的集群 *</td>
 | 
			
		||||
                    <td class="title">部署的集群 *</td>
 | 
			
		||||
                    <td>
 | 
			
		||||
                        <div v-if="userId == 0">
 | 
			
		||||
                            <node-cluster-combo-box></node-cluster-combo-box>
 | 
			
		||||
@@ -47,7 +47,7 @@
 | 
			
		||||
                    <tr>
 | 
			
		||||
                        <td>{{tlsProtocolName.toUpperCase()}}证书</td>
 | 
			
		||||
                        <td>
 | 
			
		||||
                            <ssl-certs-box :v-protocol="tlsProtocolName.toLowerCase()"></ssl-certs-box>
 | 
			
		||||
                            <ssl-certs-box :v-protocol="tlsProtocolName.toLowerCase()" :v-domains="findServerNames"></ssl-certs-box>
 | 
			
		||||
                        </td>
 | 
			
		||||
                    </tr>
 | 
			
		||||
                </tbody>
 | 
			
		||||
@@ -77,7 +77,7 @@
 | 
			
		||||
                </tr>
 | 
			
		||||
 | 
			
		||||
                <tr>
 | 
			
		||||
                    <td>绑定端口 *</td>
 | 
			
		||||
                    <td class="title">绑定端口 *</td>
 | 
			
		||||
                    <td>
 | 
			
		||||
                        <network-addresses-box :v-server-type="serverType" :v-addresses="defaultAddresses"></network-addresses-box>
 | 
			
		||||
                    </td>
 | 
			
		||||
 
 | 
			
		||||
@@ -96,4 +96,11 @@ Tea.context(function () {
 | 
			
		||||
				this.plans = resp.data.plans
 | 
			
		||||
			})
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	/**
 | 
			
		||||
	 * 证书相关
 | 
			
		||||
	 */
 | 
			
		||||
	this.findServerNames = function () {
 | 
			
		||||
		return this.$refs.serverNameBox.allServerNames()
 | 
			
		||||
	}
 | 
			
		||||
})
 | 
			
		||||
		Reference in New Issue
	
	Block a user