diff --git a/web/public/js/components/common/request-variables.js b/web/public/js/components/common/request-variables.js new file mode 100644 index 00000000..8188fe39 --- /dev/null +++ b/web/public/js/components/common/request-variables.js @@ -0,0 +1,33 @@ +// 将变量转换为中文 +Vue.component("request-variables-describer", { + data: function () { + return { + vars:[] + } + }, + methods: { + update: function (variablesString) { + this.vars = [] + let that = this + variablesString.replace(/\${.+?}/g, function (v) { + let def = that.findVar(v) + if (def == null) { + return v + } + that.vars.push(def) + }) + }, + findVar: function (name) { + let def = null + window.REQUEST_VARIABLES.forEach(function (v) { + if (v.code == name) { + def = v + } + }) + return def + } + }, + template: ` + {{v.code}} - {{v.name}} +` +}) diff --git a/web/public/js/components/server/http-cache-ref-box.js b/web/public/js/components/server/http-cache-ref-box.js index 013594a4..8ad4682a 100644 --- a/web/public/js/components/server/http-cache-ref-box.js +++ b/web/public/js/components/server/http-cache-ref-box.js @@ -1,13 +1,16 @@ // 单个缓存条件设置 Vue.component("http-cache-ref-box", { props: ["v-cache-ref", "v-is-reverse"], + mounted: function () { + this.$refs.variablesDescriber.update(this.ref.key) + }, data: function () { let ref = this.vCacheRef if (ref == null) { ref = { isOn: true, cachePolicyId: 0, - key: "${scheme}://${host}${requestURI}", + key: "${scheme}://${host}${requestPath}${isArgs}${args}", life: {count: 2, unit: "hour"}, status: [200], maxSize: {count: 32, unit: "mb"}, @@ -20,6 +23,10 @@ Vue.component("http-cache-ref-box", { isReverse: this.vIsReverse } } + if (ref.key == null) { + ref.key = "" + } + if (ref.life == null) { ref.life = {count: 2, unit: "hour"} } @@ -60,6 +67,9 @@ Vue.component("http-cache-ref-box", { result.push(statusNumber) }) this.ref.status = result + }, + changeKey: function (key) { + this.$refs.variablesDescriber.update(key) } }, template: ` @@ -80,8 +90,8 @@ Vue.component("http-cache-ref-box", { 缓存Key * - -

用来区分不同缓存内容的唯一Key。

+ +

用来区分不同缓存内容的唯一Key。

diff --git a/web/public/js/components/server/http-cache-refs-config-box.js b/web/public/js/components/server/http-cache-refs-config-box.js index 70c48ec5..50175390 100644 --- a/web/public/js/components/server/http-cache-refs-config-box.js +++ b/web/public/js/components/server/http-cache-refs-config-box.js @@ -189,7 +189,7 @@ Vue.component("http-cache-refs-config-box", { -

所有条件匹配顺序为从上到下,可以拖动左侧的排序。

+

所有条件匹配顺序为从上到下,可以拖动左侧的排序。服务设置的优先级比全局缓存策略设置的优先级要高。

    +添加不缓存设置 diff --git a/web/public/js/components/server/http-header-policy-box.js b/web/public/js/components/server/http-header-policy-box.js index 588fa5b0..d7fed57d 100644 --- a/web/public/js/components/server/http-header-policy-box.js +++ b/web/public/js/components/server/http-header-policy-box.js @@ -53,7 +53,7 @@ Vue.component("http-header-policy-box", { responseDeletingHeaders = responsePolicy.deleteHeaders } } - + return { type: type, typeName: (type == "request") ? "请求" : "响应", @@ -74,21 +74,21 @@ Vue.component("http-header-policy-box", { addSettingHeader: function (policyId) { teaweb.popup("/servers/server/settings/headers/createSetPopup?" + this.vParams + "&headerPolicyId=" + policyId, { callback: function () { - window.location.reload() + teaweb.successRefresh("保存成功") } }) }, addDeletingHeader: function (policyId, type) { teaweb.popup("/servers/server/settings/headers/createDeletePopup?" + this.vParams + "&headerPolicyId=" + policyId + "&type=" + type, { callback: function () { - window.location.reload() + teaweb.successRefresh("保存成功") } }) }, updateSettingPopup: function (policyId, headerId) { teaweb.popup("/servers/server/settings/headers/updateSetPopup?" + this.vParams + "&headerPolicyId=" + policyId + "&headerId=" + headerId, { callback: function () { - window.location.reload() + teaweb.successRefresh("保存成功") } }) },