+ trigger="hover">
{{ $t('Please insert a Drive to Create Storage') }}
{{ $t('Create Storage') }}
+ size="is-small" @click="showCreate">{{ $t('Create Storage') }}
@@ -38,10 +38,10 @@
+ @reload="getDiskList">
+ @getDiskList="getDiskList">
@@ -57,10 +57,10 @@
+ :type="{ 'is-danger': errors[0], 'is-success': valid }">
+ @keyup.native="createStorageName = createStorageName.replace(/[^\w]/g, '')"
+ @paste.native="createStorageName = createStorageName.replace(/[^\w]/g, '')">
@@ -127,7 +127,7 @@
+ class="creating-animation">
{{ $t('Creation in progress') }}...
@@ -139,18 +139,18 @@
-
+
+ :type="createStorageType == 'format' ? 'is-primary' : ''" rounded @click="createStorge(true)"/>
+ type="is-primary" @click="createStorge(false)"/>
{{ $t('Merge Storages') }}
+ @click="$EventBus.$emit('casaUI:openInStorageManager');">{{ $t('Merge Storages') }}
@@ -168,8 +168,8 @@ import smoothReflow from 'vue-smooth-reflow'
import delay from 'lodash/delay';
import max from 'lodash/max';
import orderBy from 'lodash/orderBy';
-import { ValidationObserver, ValidationProvider } from "vee-validate";
-import { mixin } from '../../mixins/mixin';
+import {ValidationObserver, ValidationProvider} from "vee-validate";
+import {mixin} from '../../mixins/mixin';
import DriveItem from './DriveItem.vue'
import StorageItem from './StorageItem.vue'
import Popper from 'vue-popperjs';
@@ -313,7 +313,7 @@ export default {
try {
// get storage list info
- const storageRes = await this.$api.storage.list({ system: "show" }).then(v => v.data.data)
+ const storageRes = await this.$api.storage.list({system: "show"}).then(v => v.data.data)
let storageArray = []
let mergeConbinations = []
let testMergeMiss = mergeStorageList
@@ -453,42 +453,6 @@ export default {
this.createStorageName = "Storage" + nextMaxNum
},
- // show storage settings modal
- async showStorageSettingsModal() {
- // this.$messageBus('storagemanager_mergestorage');
- this.$EventBus.$emit('casaUI:openInStorageManager');
- // TODO: the part is repetition
- // with APPs Installation Location requirement document
- // 获取merge信息
- // let mergeStorageList
- // try {
- // mergeStorageList = await this.$api.local_storage.getMergerfsInfo().then((res) => res.data.data[0]['source_volume_uuids'])
- // } catch (e) {
- // mergeStorageList = []
- // console.log(e)
- // }
-
- // this.$buefy.modal.open({
- // parent: this,
- // component: MergeStorages,
- // hasModalCard: true,
- // trapFocus: true,
- // ariaModal: true,
- // canCancel: ['escape'],
- // onCancel: () => {
- // this.getDiskList()
- // },
- // events: {
- // close: () => {
- // this.getDiskList()
- // }
- // },
- // props: {
- // mergeStorageList
- // }
- // })
-
- },
/**
* @description: Validate form async
* @param {Object} ref ref of component
diff --git a/src/views/Home.vue b/src/views/Home.vue
index a0d792a3..4d72045c 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -147,6 +147,11 @@ export default {
sessionStorage.removeItem('fromWelcome')
}
this.$messageBus('global_visit')
+
+ this.$EventBus.$on('casaUI:openInStorageManager', () => {
+ this.showStorageSettingsModal();
+ });
+
},
methods: {