diff --git a/src/views/pages/deploy/job/publishing/module/instance-setting.vue b/src/views/pages/deploy/job/publishing/module/instance-setting.vue index 174173253f8a92be416b7b442917812b1058f9bc..c54dfa93dfca45d2e62347a58ee3bb6404f0da44 100644 --- a/src/views/pages/deploy/job/publishing/module/instance-setting.vue +++ b/src/views/pages/deploy/job/publishing/module/instance-setting.vue @@ -25,6 +25,17 @@ + + + + + + +
+
{{ $t('term.deploy.moduleenvnotinstance', {modulename: module.name, envname: envName}) }}
import('@/resources/components/TsCard/TsCard.vue'), - MoreInstanceDialog: () => import('./more-instance-dialog.vue') + MoreInstanceDialog: () => import('./more-instance-dialog.vue'), + InputSearcher: () => import('@/resources/components/InputSearcher/InputSearcher.vue') }, props: { disabled: { @@ -107,7 +120,9 @@ export default { isShowMoreDialog: false, tableData: {}, currentPage: 1, - instanceList: [] + instanceList: [], + keyword: '', + isHaveInitData: false //是否有初始数据 }; }, beforeCreate() {}, @@ -125,6 +140,7 @@ export default { methods: { initData() { this.instanceList = []; + this.isHaveInitData = false; if (this.module.instanceList && this.module.instanceList.length) { this.instanceList = this.module.instanceList.map(m => { return { @@ -142,19 +158,26 @@ export default { envId: this.envId, appModuleId: this.module.id, currentPage: currentPage || this.currentPage, - pageSize: 100 + pageSize: 100, + keyword: this.keyword }; currentPage && (this.currentPage = currentPage); this.$api.deploy.env.getInstanceList(data).then(res => { if (res.Status == 'OK') { this.tableData = res.Return; - if (isFirst && this.$utils.isEmpty(this.instanceList)) { - this.instanceList = this.tableData.tbodyList.map(m => { - return { - ...m, - isChecked: true - }; - }); + if (isFirst) { + if (!this.$utils.isEmpty(this.tableData.tbodyList)) { + this.isHaveInitData = true; + } + + if (this.$utils.isEmpty(this.instanceList)) { + this.instanceList = this.tableData.tbodyList.map(m => { + return { + ...m, + isChecked: true + }; + }); + } } this.tableData.tbodyList.forEach(i => { if (this.instanceList.find(ins => ins.id === i.id)) {