Merge pull request #743 from Support-pl/dev-fixes

fixed reading params from link
Support-pl · Aug 8, 2024 · 5aba857 · 5aba857
2 parents a857876 + ebbf541
commit 5aba857
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/src/components/cloud/modules/keyweb/panels/os.vue b/src/components/cloud/modules/keyweb/panels/os.vue
@@ -24,11 +24,11 @@
             :label="`${capitalize($t('clientinfo.username'))}:`"
           >
             <a-input
-              v-model:value="authData.username"
+              :value="authData.username"
               :style="{
                 boxShadow: (authData.username.length < 2) ? '0 0 2px 2px var(--err)' : null
               }"
-              @change="setOptions('config.username', $event)"
+              @update:value="authData.username = $event; setOptions('config.username', $event)"
             />
 
             <div v-if="authData.username.length < 2" style="line-height: 1.5; color: var(--err)">
@@ -43,11 +43,11 @@
             :label="`${capitalize($t('hostname'))}:`"
           >
             <a-input
-              v-model:value="authData.hostname"
+              :value="authData.hostname"
               :style="{
                 boxShadow: (authData.hostname.length < 2) ? '0 0 2px 2px var(--err)' : null
               }"
-              @change="setOptions('config.hostname', $event)"
+              @update:value="authData.hostname = $event; setOptions('config.hostname', $event)"
             />
 
             <div v-if="authData.hostname.length < 2" style="line-height: 1.5; color: var(--err)">
@@ -68,9 +68,9 @@
             />
 
             <a-input-password
-              v-model:value="authData.password"
+              :value="authData.password"
               class="password"
-              @change="setOptions('config.password', $event)"
+              @update:value="authData.password = $event; setOptions('config.password', $event)"
             />
           </a-form-item>
         </a-col>

diff --git a/src/components/cloud/modules/keyweb/panels/plan.vue b/src/components/cloud/modules/keyweb/panels/plan.vue
@@ -41,7 +41,9 @@
 
 <script setup>
 import { inject, nextTick, watch, computed, ref } from 'vue'
+import { useRoute } from 'vue-router'
 import { EditorContainer } from 'nocloud-ui'
+
 import { useCloudStore } from '@/stores/cloud.js'
 import { getPeriods } from '@/functions.js'
 import { useSlider } from '@/hooks/utils'
@@ -59,13 +61,21 @@ watch(() => props.productSize, (value) => {
   emits('update:periods', getPeriods(value, props.plans))
 })
 
+const route = useRoute()
 const cloudStore = useCloudStore()
 const [product] = inject('useProduct', () => [])()
 const [, setOptions] = inject('useOptions', () => [])()
 const [, setPrice] = inject('usePriceOVH', () => [])()
 
-if (props.products.length > 0) setProduct(props.products[1] ?? props.products[0])
-else resetData()
+if (props.products.length > 0) {
+  const data = localStorage.getItem('data') ?? route.query.data
+  const { productSize } = JSON.parse(data ?? '{}')
+
+  if (productSize) setProduct(productSize)
+  else setProduct(props.products[1] ?? props.products[0])
+} else {
+  resetData()
+}
 
 watch(() => props.products, (value) => {
   if (value.length < 1) resetData()

diff --git a/src/components/services/custom/index.vue b/src/components/services/custom/index.vue
@@ -527,7 +527,8 @@ export default {
 
         this.checkedType = group
         this.options.size = data.productSize
-      } else return
+        return
+      }
 
       if (keys && this.options.period) {
         this.options.size = keys[this.options.period]