diff --git a/app/src/components/StdDesign/StdDataEntry/components/StdSelector.vue b/app/src/components/StdDesign/StdDataEntry/components/StdSelector.vue
index 3bc380af..7dbb8956 100644
--- a/app/src/components/StdDesign/StdDataEntry/components/StdSelector.vue
+++ b/app/src/components/StdDesign/StdDataEntry/components/StdSelector.vue
@@ -1,85 +1,132 @@
@@ -88,19 +135,23 @@ const _selectedKey = computed({
class="std-selector"
@click="show"
>
-
-
- {{ M_value }}
+
+
+ {{ chipText?.[recordValueIndex] }}
+
{{ description }}
@@ -126,16 +178,18 @@ const _selectedKey = computed({
diff --git a/app/src/version.json b/app/src/version.json
index 933b833b..09e7e2cc 100644
--- a/app/src/version.json
+++ b/app/src/version.json
@@ -1 +1 @@
-{"version":"2.0.0-beta.22","build_id":130,"total_build":334}
\ No newline at end of file
+{"version":"2.0.0-beta.22","build_id":131,"total_build":335}
\ No newline at end of file
diff --git a/app/src/views/dashboard/ServerAnalytic.vue b/app/src/views/dashboard/ServerAnalytic.vue
index 2315a625..bb7be22c 100644
--- a/app/src/views/dashboard/ServerAnalytic.vue
+++ b/app/src/views/dashboard/ServerAnalytic.vue
@@ -214,6 +214,7 @@ function wsOnMessage(m: MessageEvent) {
:md="8"
>
const directivesMap = inject('directivesMap') as Ref>
const visible = ref(false)
-const record = ref({}) as Ref
const columns: Column[] = [{
title: () => $gettext('Name'),
@@ -55,31 +54,39 @@ function open() {
visible.value = true
}
-function onSelectedRecord(r: Cert) {
- record.value = r
-}
+const records = ref([]) as Ref
function ok() {
if (directivesMap.value.ssl_certificate?.[0]) {
- directivesMap.value.ssl_certificate[0].params = record.value.ssl_certificate_path
+ directivesMap.value.ssl_certificate[0].params = records.value[0].ssl_certificate_path
}
else {
current_server_directives?.value.push({
directive: 'ssl_certificate',
- params: record.value.ssl_certificate_path,
+ params: records.value[0].ssl_certificate_path,
})
}
if (directivesMap.value.ssl_certificate_key?.[0]) {
- directivesMap.value.ssl_certificate_key[0].params = record.value.ssl_certificate_key_path
+ directivesMap.value.ssl_certificate_key[0].params = records.value[0].ssl_certificate_key_path
}
else {
current_server_directives?.value.push({
directive: 'ssl_certificate_key',
- params: record.value.ssl_certificate_key_path,
+ params: records.value[0].ssl_certificate_key_path,
})
}
visible.value = false
}
+const selectedKeyBuffer = ref({})
+
+const computedSelectedKeys = computed({
+ get() {
+ return [selectedKeyBuffer.value]
+ },
+ set(v) {
+ selectedKeyBuffer.value = v
+ },
+})
@@ -94,11 +101,12 @@ function ok() {
@ok="ok"
>
diff --git a/app/version.json b/app/version.json
index 933b833b..09e7e2cc 100644
--- a/app/version.json
+++ b/app/version.json
@@ -1 +1 @@
-{"version":"2.0.0-beta.22","build_id":130,"total_build":334}
\ No newline at end of file
+{"version":"2.0.0-beta.22","build_id":131,"total_build":335}
\ No newline at end of file