diff --git a/src/components/AutoDataTable/index.vue b/src/components/AutoDataTable/index.vue index b1e03869a..2d3ef2e76 100644 --- a/src/components/AutoDataTable/index.vue +++ b/src/components/AutoDataTable/index.vue @@ -157,7 +157,7 @@ export default { } break } - this.$log.debug('Field: ', type, col.prop, col) + // this.$log.debug('Field: ', type, col.prop, col) return col }, addHelpTipsIfNeed(col) { diff --git a/src/views/assets/Asset/AssetCreateUpdate/CloudsPlatformCreateUpdate.vue b/src/views/assets/Asset/AssetCreateUpdate/CloudsPlatformCreateUpdate.vue index 1415410dc..8300ad84a 100644 --- a/src/views/assets/Asset/AssetCreateUpdate/CloudsPlatformCreateUpdate.vue +++ b/src/views/assets/Asset/AssetCreateUpdate/CloudsPlatformCreateUpdate.vue @@ -1,46 +1,23 @@ diff --git a/src/views/assets/Asset/AssetCreateUpdate/DatabaseCreateUpdate.vue b/src/views/assets/Asset/AssetCreateUpdate/DatabaseCreateUpdate.vue index 274e8c1ad..7e4e6b3c9 100644 --- a/src/views/assets/Asset/AssetCreateUpdate/DatabaseCreateUpdate.vue +++ b/src/views/assets/Asset/AssetCreateUpdate/DatabaseCreateUpdate.vue @@ -1,46 +1,23 @@ diff --git a/src/views/assets/Asset/AssetCreateUpdate/HostCreateUpdate.vue b/src/views/assets/Asset/AssetCreateUpdate/HostCreateUpdate.vue index 71a734389..6a274843d 100644 --- a/src/views/assets/Asset/AssetCreateUpdate/HostCreateUpdate.vue +++ b/src/views/assets/Asset/AssetCreateUpdate/HostCreateUpdate.vue @@ -1,47 +1,20 @@ diff --git a/src/views/assets/Asset/AssetCreateUpdate/NetworkCreateUpdate.vue b/src/views/assets/Asset/AssetCreateUpdate/NetworkCreateUpdate.vue index 9bd6b9dc2..6fa76ecf7 100644 --- a/src/views/assets/Asset/AssetCreateUpdate/NetworkCreateUpdate.vue +++ b/src/views/assets/Asset/AssetCreateUpdate/NetworkCreateUpdate.vue @@ -1,47 +1,20 @@ diff --git a/src/views/assets/Asset/AssetCreateUpdate/WebCreateUpdate.vue b/src/views/assets/Asset/AssetCreateUpdate/WebCreateUpdate.vue index 2dcf37501..779c6fc58 100644 --- a/src/views/assets/Asset/AssetCreateUpdate/WebCreateUpdate.vue +++ b/src/views/assets/Asset/AssetCreateUpdate/WebCreateUpdate.vue @@ -1,47 +1,23 @@ diff --git a/src/views/assets/Asset/AssetCreateUpdate/components/BaseCreateUpdate.vue b/src/views/assets/Asset/AssetCreateUpdate/components/BaseCreateUpdate.vue new file mode 100644 index 000000000..c98559a75 --- /dev/null +++ b/src/views/assets/Asset/AssetCreateUpdate/components/BaseCreateUpdate.vue @@ -0,0 +1,100 @@ + + + + + diff --git a/src/views/assets/const.js b/src/views/assets/const.js index 8cdce7ee6..136423417 100644 --- a/src/views/assets/const.js +++ b/src/views/assets/const.js @@ -4,7 +4,7 @@ import AssetAccounts from '@/components/FormFields/AssetAccounts' import rules from '@/components/DataForm/rules' import { Select2 } from '@/components/FormFields' -export const assetFieldsMeta = (vm) => { +export const assetFieldsMeta = () => { return { ip: { label: i18n.t('assets.ipDomain') @@ -82,35 +82,6 @@ export const assetFieldsMeta = (vm) => { } } -export const setPlatformInitial = async(vm) => { - const nodesInitial = [] - if (!vm.initial) vm.$set(vm, 'initial', {}) - if (vm.$route.query['node']) { - nodesInitial.push(vm.$route.query.node) - } - const platformId = vm.$route.query['platform'] || 1 - const url = `/api/v1/assets/platforms/${platformId}/` - vm.platform = await vm.$axios.get(url) - const initial = { - labels: [], - is_active: true, - nodes: nodesInitial, - platform: parseInt(platformId), - protocols: vm.platform.protocols || [] - } - vm.initial = Object.assign({}, initial, vm.initial) - vm.$set(vm.fieldsMeta.protocols.el, 'choices', (vm.platform['protocols'] || [])) - vm.$set(vm.fieldsMeta.accounts.el, 'protocols', (vm.platform['protocols'] || [])) - console.log('fieldsMeta: ', vm.fieldsMeta) - - const hiddenCheckFields = ['protocols', 'domain'] - for (const field of hiddenCheckFields) { - if (vm.platform[field + '_enabled'] === false) { - vm.fieldsMeta[field].hidden = () => true - } - } -} - export const Categories = [ { title: '主机',