cloud-web-corejs 1.0.54-dev.466 → 1.0.54-dev.468
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.
- package/package.json +1 -1
- package/src/views/user/common_attribute/list.vue +4 -1
- package/src/views/user/extend_datasource/dialog.vue +3 -0
- package/src/views/user/extend_datasource/edit.vue +1 -0
- package/src/views/user/extend_datasource/list.vue +3 -0
- package/src/views/user/wf/wf_transfer_setting/edit.vue +52 -0
- package/src/views/user/wf/wf_transfer_setting/list.vue +10 -0
package/package.json
CHANGED
|
@@ -142,7 +142,10 @@ export default {
|
|
|
142
142
|
tableName: 'basic_common_attribute_list-m1',
|
|
143
143
|
path: USER_PREFIX + '/common_attribute/listPage',
|
|
144
144
|
param: () => {
|
|
145
|
-
return
|
|
145
|
+
return {
|
|
146
|
+
...this.formData,
|
|
147
|
+
enabled: true
|
|
148
|
+
};
|
|
146
149
|
},
|
|
147
150
|
config: {
|
|
148
151
|
checkboxConfig: {
|
|
@@ -51,6 +51,7 @@
|
|
|
51
51
|
<el-select v-model="formData.dsType" clearable>
|
|
52
52
|
<el-option :value="0" label="mysql"></el-option>
|
|
53
53
|
<el-option :value="1" label="oracle"></el-option>
|
|
54
|
+
<el-option :value="2" label="doris"></el-option>
|
|
54
55
|
</el-select>
|
|
55
56
|
</template>
|
|
56
57
|
</vxe-form-item>
|
|
@@ -156,6 +157,8 @@ export default {
|
|
|
156
157
|
return 'mysql';
|
|
157
158
|
} else if (row.dsType === 1) {
|
|
158
159
|
return 'oracle';
|
|
160
|
+
} else if (row.dsType === 2) {
|
|
161
|
+
return 'doris';
|
|
159
162
|
}
|
|
160
163
|
}
|
|
161
164
|
}
|
|
@@ -48,6 +48,7 @@
|
|
|
48
48
|
<el-select v-model="formData.dsType" clearable>
|
|
49
49
|
<el-option :value="0" label="mysql"></el-option>
|
|
50
50
|
<el-option :value="1" label="oracle"></el-option>
|
|
51
|
+
<el-option :value="2" label="doris"></el-option>
|
|
51
52
|
</el-select>
|
|
52
53
|
</template>
|
|
53
54
|
</vxe-form-item>
|
|
@@ -133,6 +134,8 @@ export default {
|
|
|
133
134
|
return 'mysql';
|
|
134
135
|
} else if (row.dsType === 1) {
|
|
135
136
|
return 'oracle';
|
|
137
|
+
} else if (row.dsType === 2) {
|
|
138
|
+
return 'doris';
|
|
136
139
|
}
|
|
137
140
|
}
|
|
138
141
|
}
|
|
@@ -96,6 +96,56 @@
|
|
|
96
96
|
</el-input>
|
|
97
97
|
</el-form-item>
|
|
98
98
|
</td>
|
|
99
|
+
<th>
|
|
100
|
+
<em class="f-red">*</em>
|
|
101
|
+
{{ $t1("有效开始时间") }}
|
|
102
|
+
</th>
|
|
103
|
+
<td>
|
|
104
|
+
<el-form-item
|
|
105
|
+
prop="startDate"
|
|
106
|
+
:rules="[
|
|
107
|
+
{
|
|
108
|
+
required: true,
|
|
109
|
+
trigger: ['blur', 'change'],
|
|
110
|
+
},
|
|
111
|
+
]"
|
|
112
|
+
>
|
|
113
|
+
<el-date-picker
|
|
114
|
+
v-model="wfTransferSetting.startDate"
|
|
115
|
+
type="datetime"
|
|
116
|
+
size="small"
|
|
117
|
+
clearable
|
|
118
|
+
value-format="yyyy-MM-dd HH:mm:ss"
|
|
119
|
+
default-time="00:00:00"
|
|
120
|
+
:picker-options="$baseStartPickerOptions(wfTransferSetting.endDate)"
|
|
121
|
+
></el-date-picker>
|
|
122
|
+
</el-form-item>
|
|
123
|
+
</td>
|
|
124
|
+
<th>
|
|
125
|
+
<em class="f-red">*</em>
|
|
126
|
+
{{ $t1("有效结束时间") }}
|
|
127
|
+
</th>
|
|
128
|
+
<td>
|
|
129
|
+
<el-form-item
|
|
130
|
+
prop="endDate"
|
|
131
|
+
:rules="[
|
|
132
|
+
{
|
|
133
|
+
required: true,
|
|
134
|
+
trigger: ['blur', 'change'],
|
|
135
|
+
},
|
|
136
|
+
]"
|
|
137
|
+
>
|
|
138
|
+
<el-date-picker
|
|
139
|
+
v-model="wfTransferSetting.endDate"
|
|
140
|
+
type="datetime"
|
|
141
|
+
size="small"
|
|
142
|
+
clearable
|
|
143
|
+
value-format="yyyy-MM-dd HH:mm:ss"
|
|
144
|
+
default-time="23:59:59"
|
|
145
|
+
:picker-options="$baseEndPickerOptions(wfTransferSetting.startDate)"
|
|
146
|
+
></el-date-picker>
|
|
147
|
+
</el-form-item>
|
|
148
|
+
</td>
|
|
99
149
|
</tr>
|
|
100
150
|
<tr>
|
|
101
151
|
<th>{{ $t1("创建人") }}</th>
|
|
@@ -147,6 +197,8 @@ export default {
|
|
|
147
197
|
transferToName: null,
|
|
148
198
|
transferFrom: null,
|
|
149
199
|
transferTo: null,
|
|
200
|
+
startDate: null,
|
|
201
|
+
endDate: null,
|
|
150
202
|
},
|
|
151
203
|
showUserDialog1: false,
|
|
152
204
|
showUserDialog2: false,
|
|
@@ -180,6 +180,16 @@ export default {
|
|
|
180
180
|
field: "transferToName",
|
|
181
181
|
width: 250,
|
|
182
182
|
},
|
|
183
|
+
{
|
|
184
|
+
title: this.$t1("有效开始时间"),
|
|
185
|
+
field: "startDate",
|
|
186
|
+
width: 150,
|
|
187
|
+
},
|
|
188
|
+
{
|
|
189
|
+
title: this.$t1("有效结束时间"),
|
|
190
|
+
field: "endDate",
|
|
191
|
+
width: 150,
|
|
192
|
+
},
|
|
183
193
|
{
|
|
184
194
|
title: this.$t1("创建人"),
|
|
185
195
|
field: "_createBy",
|