cloud-web-corejs 1.0.54-dev.269 → 1.0.54-dev.271

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -4,7 +4,7 @@
4
4
  <template #form>
5
5
  <div class="clearfix screen-btns">
6
6
  <div class="fl">
7
- <!-- <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">
7
+ <!-- <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog()">
8
8
  {{ $t1('新增') }}
9
9
  </vxe-button>-->
10
10
  </div>
@@ -83,7 +83,8 @@ export default {
83
83
  formData: {},
84
84
  advancedFormData: {},
85
85
  serviceIds: [],
86
- serverName: null
86
+ serverName: null,
87
+ editServerName: null
87
88
  };
88
89
  },
89
90
  computed: {
@@ -112,9 +113,23 @@ export default {
112
113
  this.formData = {};
113
114
  this.$refs['table-m1'].commitProxy('reload');
114
115
  },
115
- openEditDialog(id) {
116
- this.dataId = !id || typeof id == 'object' ? 0 : id;
117
- this.$emit('openEditDialog', this.dataId);
116
+ openEditDialog(row) {
117
+ this.dataId = row?.id ?? 0;
118
+ let serverName = null;
119
+ if(row){
120
+ if(row.serverName){
121
+ let arr = row.serverName.split(":");
122
+ if(arr.length){
123
+ serverName = arr[0];
124
+ }else{
125
+ serverName = row.serverName;
126
+ }
127
+ }
128
+ }else{
129
+ serverName = this.serverName
130
+ }
131
+ this.editServerName = serverName;
132
+ this.$emit('openEditDialog', this.dataId, this.editServerName);
118
133
  },
119
134
  initTableList() {
120
135
  let that = this;
@@ -128,11 +143,12 @@ export default {
128
143
  vue: this,
129
144
  tableRef: 'table-m1',
130
145
  tableName: 'bd_push_data_list-m1',
131
- path: this.current_prefix + '/push_data/listPage',
146
+ path: ()=>{
147
+ return this.current_prefix + '/push_data/listPage';
148
+ },
132
149
  param: () => {
133
150
  return {
134
- ...this.formData,
135
- serverName: this.serverName
151
+ ...this.formData
136
152
  }
137
153
  },
138
154
  columns: [
@@ -227,7 +243,7 @@ export default {
227
243
  href="javascript:void(0);"
228
244
  class="a-link"
229
245
  onclick={() => {
230
- this.openEditDialog(row.id);
246
+ this.openEditDialog(row);
231
247
  }}
232
248
  >
233
249
  <el-tooltip enterable={false} effect="dark" content={this.$t1('查看')} placement="top"
@@ -4,7 +4,7 @@
4
4
  <template #form>
5
5
  <div class="clearfix screen-btns">
6
6
  <div class="fl">
7
- <!-- <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">
7
+ <!-- <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog()">
8
8
  {{ $t1('新增') }}
9
9
  </vxe-button>-->
10
10
  </div>
@@ -83,7 +83,8 @@ export default {
83
83
  formData: {},
84
84
  advancedFormData: {},
85
85
  serviceIds: [],
86
- serverName: null
86
+ serverName: null,
87
+ editServerName: null
87
88
  };
88
89
  },
89
90
  computed: {
@@ -112,9 +113,23 @@ export default {
112
113
  this.formData = {};
113
114
  this.$refs['table-m1'].commitProxy('reload');
114
115
  },
115
- openEditDialog(id) {
116
- this.dataId = !id || typeof id == 'object' ? 0 : id;
117
- this.$emit('openEditDialog', this.dataId);
116
+ openEditDialog(row) {
117
+ this.dataId = row?.id ?? 0;
118
+ let serverName = null;
119
+ if(row){
120
+ if(row.serverName){
121
+ let arr = row.serverName.split(":");
122
+ if(arr.length){
123
+ serverName = arr[0];
124
+ }else{
125
+ serverName = row.serverName;
126
+ }
127
+ }
128
+ }else{
129
+ serverName = this.serverName
130
+ }
131
+ this.editServerName = serverName;
132
+ this.$emit('openEditDialog', this.dataId, this.editServerName);
118
133
  },
119
134
  initTableList() {
120
135
  let that = this;
@@ -128,11 +143,12 @@ export default {
128
143
  vue: this,
129
144
  tableRef: 'table-m1',
130
145
  tableName: 'bd_push_data_h_list-m1',
131
- path: this.current_prefix + '/push_data_h/listPage',
146
+ path: ()=>{
147
+ return this.current_prefix + '/push_data_h/listPage';
148
+ },
132
149
  param: () => {
133
150
  return {
134
- ...this.formData,
135
- serverName: this.serverName
151
+ ...this.formData
136
152
  }
137
153
  },
138
154
  columns: [
@@ -237,7 +253,7 @@ export default {
237
253
  href="javascript:void(0);"
238
254
  class="a-link"
239
255
  onclick={() => {
240
- this.openEditDialog(row.id);
256
+ this.openEditDialog(row);
241
257
  }}
242
258
  >
243
259
  <el-tooltip enterable={false} effect="dark" content={this.$t1('查看')} placement="top"
@@ -2,7 +2,7 @@
2
2
  <div id="containt">
3
3
  <el-tabs v-model="activeName" class="tab-box" @tab-click="changeActiveName">
4
4
  <el-tab-pane :label="$t1('常规')" name="first">
5
- <component v-if="showEdit" visible-key="showEdit" :is="editComponentName" :_dataId.sync="dataId"
5
+ <component v-if="showEdit" visible-key="showEdit" :is="editComponentName" :_dataId.sync="dataId" :serverName="serverName"
6
6
  :parent-target="_self" @reload="$reloadHandle"></component>
7
7
  </el-tab-pane>
8
8
  <el-tab-pane :label="$t1('列表')" name="second">
@@ -88,6 +88,7 @@ export default {
88
88
  editComponentName: null,
89
89
  showPushDataList: false,
90
90
  showPushDataHList: false,
91
+ serverName:null,
91
92
  };
92
93
  },
93
94
  mounted() {
@@ -106,18 +107,21 @@ export default {
106
107
  this.copyId = 0;
107
108
  this.dataId = !id || typeof id == 'object' ? 0 : id;
108
109
  this.editComponentName = "editView"
110
+ this.serverName = null;
109
111
  this.activeName = 'first';
110
112
  this.$openEditView('showEdit');
111
113
  },
112
- openPushDataEditView(id) {
114
+ openPushDataEditView(id, serverName) {
113
115
  this.dataId = !id || typeof id == 'object' ? 0 : id;
114
116
  this.editComponentName = "push_data_edit"
117
+ this.serverName = serverName;
115
118
  this.activeName = 'first';
116
119
  this.$openEditView('showEdit');
117
120
  },
118
- openPushDataHEditView(id) {
121
+ openPushDataHEditView(id, serverName) {
119
122
  this.dataId = !id || typeof id == 'object' ? 0 : id;
120
123
  this.editComponentName = "push_data_h_edit"
124
+ this.serverName = serverName;
121
125
  this.activeName = 'first';
122
126
  this.$openEditView('showEdit');
123
127
  },