vue2-client 1.2.50 → 1.2.53

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.
Files changed (31) hide show
  1. package/.env +15 -14
  2. package/.eslintrc.js +82 -82
  3. package/CHANGELOG.md +139 -130
  4. package/package.json +2 -1
  5. package/src/base-client/all.js +4 -1
  6. package/src/base-client/components/common/AddressSearchCombobox/AddressSearchCombobox.vue +225 -0
  7. package/src/base-client/components/common/AddressSearchCombobox/index.js +3 -0
  8. package/src/base-client/components/common/AmapMarker/AmapPointRendering.vue +111 -105
  9. package/src/base-client/components/common/AmapMarker/index.js +3 -3
  10. package/src/base-client/components/common/CitySelect/CitySelect.vue +244 -0
  11. package/src/base-client/components/common/CitySelect/index.js +3 -0
  12. package/src/base-client/components/common/CitySelect/index.md +109 -0
  13. package/src/base-client/components/common/CreateQuery/CreateQuery.vue +483 -1342
  14. package/src/base-client/components/common/CreateQuery/CreateQueryItem.vue +770 -555
  15. package/src/base-client/components/common/ScrollList/SrcollList.vue +113 -113
  16. package/src/base-client/components/common/ScrollList/index.js +3 -3
  17. package/src/base-client/components/common/Upload/Upload.vue +124 -124
  18. package/src/base-client/components/common/Upload/index.js +3 -3
  19. package/src/base-client/components/common/XAddForm/XAddForm.vue +331 -339
  20. package/src/base-client/components/common/XForm/XForm.vue +268 -275
  21. package/src/base-client/components/common/XForm/XFormItem.vue +348 -285
  22. package/src/base-client/components/iot/WebmeterAnalysisView/WebmeterAnalysisView.vue +205 -205
  23. package/src/base-client/plugins/AppData.js +72 -57
  24. package/src/config/CreateQueryConfig.js +298 -80
  25. package/src/pages/resourceManage/orgListManage.vue +40 -40
  26. package/src/services/api/manage.js +16 -14
  27. package/src/services/api/restTools.js +24 -24
  28. package/src/utils/map-utils.js +28 -28
  29. package/src/utils/request.js +198 -198
  30. package/src/utils/util.js +222 -176
  31. package/vue.config.js +143 -143
@@ -1,339 +1,331 @@
1
- <template>
2
- <a-modal
3
- :title="businessTitle"
4
- :visible="visible"
5
- :width="1000"
6
- @cancel="onClose"
7
- okText="提交"
8
- :destroyOnClose="true"
9
- :confirm-loading="loading"
10
- :zIndex="1001"
11
- @ok="onSubmit">
12
- <div class="table-page-search-wrapper">
13
- <a-form-model
14
- v-if="loaded"
15
- ref="selectForm"
16
- :model="form"
17
- :rules="rules">
18
- <a-row :gutter="16">
19
- <x-form-item
20
- v-for="(item, index) in realJsonData"
21
- mode="新增/修改"
22
- :attr="item"
23
- :form="form"
24
- :key="index"
25
- :disabled="itemDisabled(item)"
26
- :xl="12"
27
- :xxl="8"
28
- />
29
- <div v-for="group in realJsonSelectsData" :key="group[0].group">
30
- <x-form-col v-for="groupItem in group" :key="groupItem.group + groupItem.groupIndex" :xl="12" :xxl="8">
31
- <a-form-model-item :label="groupItem.name" :disabled="itemDisabled(groupItem)">
32
- <a-select v-model="form[groupItem.model]" :disabled="itemDisabledPlus(groupItem.group,groupItem.groupIndex)" :allowClear="true" @change="selectsItemCheck(groupItem.group,groupItem.groupIndex,form[groupItem.model],group)" placeholder="请选择">
33
- <template v-for="option in SelectsArray[groupItem.group][groupItem.groupIndex]">
34
- <a-select-option :key="option.label" :value="option.value">
35
- {{ option.label }}
36
- </a-select-option>
37
- </template>
38
- </a-select>
39
- </a-form-model-item>
40
- </x-form-col>
41
- </div>
42
- </a-row>
43
- </a-form-model>
44
- </div>
45
- </a-modal>
46
- </template>
47
- <script>
48
- import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormItem'
49
- import { formatDate } from '@vue2-client/utils/util'
50
- import { mapState } from 'vuex'
51
- import { post } from '@vue2-client/services/api'
52
-
53
- export default {
54
- name: 'XAddForm',
55
- components: {
56
- XFormItem
57
- },
58
- data () {
59
- return {
60
- // 内容加载是否完成
61
- loaded: false,
62
- // 表单Model
63
- form: undefined,
64
- // 多层下拉框组 数据储存
65
- SelectsArray: {},
66
- // 多层下拉框组 各组数量
67
- SelectsNumber: {},
68
- // 校验
69
- rules: {},
70
- // 图标样式
71
- iconStyle: {
72
- position: 'relative',
73
- top: '1px'
74
- }
75
- }
76
- },
77
- computed: {
78
- // 过滤出用于新增/修改场景的表单项
79
- realJsonData: function () {
80
- return this.jsonData.filter(function (item) {
81
- return item.addOrEdit && item.addOrEdit !== 'no' &&
82
- item.addOrEdit !== 'silenceAdd' && !item.group && item.addOrEdit !== 'version'
83
- })
84
- },
85
- // 过滤出多个下拉框分组级联得数据
86
- realJsonSelectsData: function () {
87
- const Selectsata = this.jsonData.filter(item => !item.isOnlyAddOrEdit && item.group)
88
- const groupName = [...new Set(Selectsata.map(item => item.group))]
89
- // 初始化数据组
90
- groupName.forEach(item => {
91
- this.SelectsArray[item] = []
92
- })
93
- return groupName.map(groupName => {
94
- const SelectsItem = Selectsata.filter(item => {
95
- if (item.groupIndex === 1) {
96
- if (item.keyName.substring(0, 6) === 'logic@') {
97
- // 请求logic
98
- post('/webmeterapi/' + item.keyName.substring(6), {}).then(res => {
99
- this.SelectsArray[item.group][item.groupIndex] = res
100
- })
101
- } else {
102
- this.SelectsArray[item.group][item.groupIndex] = JSON.parse(item.keyName)
103
- }
104
- }
105
- return item.group === groupName
106
- }
107
- )
108
- this.SelectsNumber[groupName] = SelectsItem.length ? SelectsItem.length : 0
109
- return SelectsItem
110
- })
111
- },
112
- // 过滤出用于静默新增场景的表单项
113
- silenceAddJsonData: function () {
114
- return this.jsonData.filter(function (item) {
115
- return item.addOrEdit === 'silenceAdd'
116
- })
117
- },
118
- // 过滤出版本号表单项
119
- versionJsonData: function () {
120
- return this.jsonData.filter(function (item) {
121
- return item.addOrEdit === 'version'
122
- })
123
- },
124
- ...mapState('account', { currUser: 'user' })
125
- },
126
- props: {
127
- jsonData: {
128
- type: Array,
129
- default: () => {
130
- return []
131
- }
132
- },
133
- // 是否显示模态框
134
- visible: {
135
- type: Boolean,
136
- default: () => {
137
- return false
138
- }
139
- },
140
- // 业务类型
141
- businessType: {
142
- type: String,
143
- default: ''
144
- },
145
- // 业务标题
146
- businessTitle: {
147
- type: String,
148
- default: ''
149
- },
150
- // 修改操作前查询出的业务数据
151
- modifyModelData: {
152
- type: Object,
153
- default: () => {
154
- return {}
155
- }
156
- },
157
- // 新增或修改业务是否执行中
158
- loading: {
159
- type: Boolean,
160
- default: () => {
161
- return false
162
- }
163
- },
164
- // 固定新增表单
165
- fixedAddForm: {
166
- type: Object,
167
- default: () => {
168
- return {}
169
- }
170
- }
171
- },
172
- watch: {
173
- visible (rel) {
174
- if (rel) {
175
- this.formItemLoad()
176
- }
177
- }
178
- },
179
- mounted () {
180
- this.formItemLoad()
181
- },
182
- methods: {
183
- selectsItemCheck (groupName, index, value, group) {
184
- const tem = { }
185
- // 获取当前下拉框子下拉框的数据
186
- this.SelectsArray[groupName][index + 1] = this.SelectsArray[groupName][index].filter(item => item.value === value)[0].children
187
- // 清空子下拉框的子们的数据
188
- for (let i = index; i < this.SelectsNumber[groupName]; i++) {
189
- tem[group[i].model] = undefined
190
- }
191
- this.form = Object.assign({}, this.form, tem)
192
- // 清空子下拉框的子们的数据源
193
- for (let i = index + 2; i <= this.SelectsNumber[groupName]; i++) {
194
- this.SelectsArray[groupName][i] = []
195
- }
196
- },
197
- formItemLoad () {
198
- const formData = Object.assign({}, this.fixedAddForm)
199
- for (let i = 0; i < this.realJsonData.length; i++) {
200
- const item = this.realJsonData[i]
201
- formData[item.model] = undefined
202
- // 处理表单校验情况
203
- if (item.rule) {
204
- this.rules[item.model] = []
205
- const required = item.rule.required ? item.rule.required === true || item.rule.required === 'true' : false
206
- let trigger
207
- let message
208
- if (required) {
209
- switch (item.type) {
210
- case 'select':
211
- message = '请选择' + item.name
212
- trigger = 'change'
213
- break
214
- default:
215
- message = '请输入' + item.name
216
- trigger = 'blur'
217
- }
218
- this.rules[item.model].push({
219
- required: true,
220
- message: message,
221
- trigger: trigger
222
- })
223
- }
224
-
225
- switch (item.rule.type) {
226
- case 'number':
227
- case 'integer':
228
- case 'float':
229
- let defaultValue
230
- let message
231
- switch (item.rule.type) {
232
- case 'number':
233
- message = '数字'
234
- defaultValue = 0
235
- break
236
- case 'integer':
237
- message = '整数'
238
- defaultValue = 0
239
- break
240
- case 'float':
241
- message = '小数'
242
- defaultValue = 0.0
243
- break
244
- }
245
- this.rules[item.model].push({
246
- type: item.rule.type,
247
- message: item.name + '必须为' + message,
248
- transform: (value) => {
249
- if (value && value.length !== 0) {
250
- return Number(value)
251
- } else {
252
- return defaultValue
253
- }
254
- },
255
- trigger: 'blur'
256
- })
257
- break
258
- }
259
- }
260
- }
261
- this.form = formData
262
- if (Object.keys(this.modifyModelData).length > 0) {
263
- this.getModifyModelData()
264
- }
265
- this.loaded = true
266
- },
267
- itemDisabled (value) {
268
- return (this.businessType === '新增' && value.addOrEdit === 'edit') ||
269
- (this.businessType === '修改' && value.addOrEdit === 'add')
270
- },
271
- itemDisabledPlus (group, index) {
272
- return (!this.SelectsArray[group][index]) || (this.SelectsArray[group][index] && this.SelectsArray[group][index].length === 0)
273
- },
274
- resetForm () {
275
- this.$refs.selectForm.resetFields()
276
- },
277
- async onSubmit () {
278
- this.$refs.selectForm.validate(async valid => {
279
- for (const key of Object.keys(this.form)) {
280
- if (this.form[key] === null || this.form[key] === '') {
281
- this.form[key] = undefined
282
- }
283
- }
284
- const requestParameters = Object.assign({}, this.form)
285
- // 追加静默新增字段
286
- if (this.businessType === '新增') {
287
- for (const item of this.silenceAddJsonData) {
288
- switch (item.silencePurpose) {
289
- case 'createTime':
290
- requestParameters[item.model] = formatDate('now')
291
- break
292
- case 'operator':
293
- requestParameters[item.model] = this.currUser.name
294
- break
295
- case 'orgId':
296
- requestParameters[item.model] = this.currUser.orgid
297
- break
298
- }
299
- }
300
- // 通过请求追加静默新增:自定义字段
301
- for (const item of this.silenceAddJsonData.filter((item) => item.silencePurpose === 'customize')) {
302
- requestParameters[item.model] = await this.getSilenceSource(item.silenceSource, requestParameters)
303
- }
304
- }
305
- const data = {
306
- valid: valid,
307
- form: requestParameters
308
- }
309
- this.$emit('onSubmit', data)
310
- })
311
- },
312
- async getSilenceSource (silenceSource, requestParameters) {
313
- const result = await post('/webmeterapi/' + silenceSource, requestParameters)
314
- return result
315
- },
316
- getModifyModelData () {
317
- for (let i = 0; i < this.realJsonData.length; i++) {
318
- const item = this.realJsonData[i]
319
- if (this.modifyModelData[item.model] || this.modifyModelData[item.model] === 0) {
320
- this.form[item.model] = this.modifyModelData[item.model] + ''
321
- } else {
322
- this.form[item.model] = undefined
323
- }
324
- }
325
- // 追加版本号信息
326
- for (const item of this.versionJsonData) {
327
- if (!this.modifyModelData[item.model]) {
328
- this.form[item.model] = 0
329
- } else {
330
- this.form[item.model] = this.modifyModelData[item.model] + ''
331
- }
332
- }
333
- },
334
- onClose () {
335
- this.$emit('update:visible', false)
336
- }
337
- }
338
- }
339
- </script>
1
+ <template>
2
+ <a-modal
3
+ :title="businessTitle"
4
+ :visible="visible"
5
+ :width="1000"
6
+ @cancel="onClose"
7
+ okText="提交"
8
+ :destroyOnClose="true"
9
+ :confirm-loading="loading"
10
+ :zIndex="1001"
11
+ @ok="onSubmit">
12
+ <div class="table-page-search-wrapper">
13
+ <a-form-model
14
+ v-if="loaded"
15
+ ref="selectForm"
16
+ :model="form"
17
+ :rules="rules">
18
+ <a-row :gutter="16">
19
+ <x-form-item
20
+ v-for="(item, index) in realJsonData"
21
+ mode="新增/修改"
22
+ :attr="item"
23
+ :form="form"
24
+ :key="index"
25
+ :disabled="itemDisabled(item)"
26
+ :xl="12"
27
+ :xxl="8"
28
+ :selectsArray="SelectsArray"
29
+ @selectsItemCheck="selectsItemCheck"
30
+ />
31
+ </a-row>
32
+ </a-form-model>
33
+ </div>
34
+ </a-modal>
35
+ </template>
36
+ <script>
37
+ import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormItem'
38
+ import { formatDate } from '@vue2-client/utils/util'
39
+ import { mapState } from 'vuex'
40
+ import { post } from '@vue2-client/services/api'
41
+
42
+ export default {
43
+ name: 'XAddForm',
44
+ components: {
45
+ XFormItem
46
+ },
47
+ data () {
48
+ return {
49
+ // 内容加载是否完成
50
+ loaded: false,
51
+ // 表单Model
52
+ form: undefined,
53
+ // 多层下拉框组 数据储存
54
+ SelectsArray: { },
55
+ // 多层下拉框组 各组数量
56
+ SelectsNumber: {},
57
+ // 校验
58
+ rules: {},
59
+ // 图标样式
60
+ iconStyle: {
61
+ position: 'relative',
62
+ top: '1px'
63
+ }
64
+ }
65
+ },
66
+ computed: {
67
+ // 过滤出用于新增/修改场景的表单项
68
+ realJsonData: function () {
69
+ return this.jsonData.filter(function (item) {
70
+ return item.addOrEdit && item.addOrEdit !== 'no' && item.addOrEdit !== 'silenceAdd' && item.addOrEdit !== 'version'
71
+ })
72
+ },
73
+ // 过滤出用于静默新增场景的表单项
74
+ silenceAddJsonData: function () {
75
+ return this.jsonData.filter(function (item) {
76
+ return item.addOrEdit === 'silenceAdd'
77
+ })
78
+ },
79
+ // 过滤出版本号表单项
80
+ versionJsonData: function () {
81
+ return this.jsonData.filter(function (item) {
82
+ return item.addOrEdit === 'version'
83
+ })
84
+ },
85
+ ...mapState('account', { currUser: 'user' })
86
+ },
87
+ props: {
88
+ jsonData: {
89
+ type: Array,
90
+ default: () => {
91
+ return []
92
+ }
93
+ },
94
+ // 是否显示模态框
95
+ visible: {
96
+ type: Boolean,
97
+ default: () => {
98
+ return false
99
+ }
100
+ },
101
+ // 业务类型
102
+ businessType: {
103
+ type: String,
104
+ default: ''
105
+ },
106
+ // 业务标题
107
+ businessTitle: {
108
+ type: String,
109
+ default: ''
110
+ },
111
+ // 修改操作前查询出的业务数据
112
+ modifyModelData: {
113
+ type: Object,
114
+ default: () => {
115
+ return {}
116
+ }
117
+ },
118
+ // 新增或修改业务是否执行中
119
+ loading: {
120
+ type: Boolean,
121
+ default: () => {
122
+ return false
123
+ }
124
+ },
125
+ // 固定新增表单
126
+ fixedAddForm: {
127
+ type: Object,
128
+ default: () => {
129
+ return {}
130
+ }
131
+ }
132
+ },
133
+ watch: {
134
+ visible (rel) {
135
+ if (rel) {
136
+ this.formItemLoad()
137
+ this.getSelectsArray()
138
+ }
139
+ }
140
+ },
141
+ created () {
142
+ this.formItemLoad()
143
+ this.getSelectsArray()
144
+ },
145
+ methods: {
146
+ // 初始化级联框数据
147
+ getSelectsArray () {
148
+ const selectSate = this.jsonData.filter(item => !item.isOnlyAddOrEdit && item.group)
149
+ const groupName = [...new Set(selectSate.map(item => item.group))]
150
+ // 初始化数据组
151
+ groupName.forEach(groupName => {
152
+ this.SelectsArray[groupName] = []
153
+ const SelectsItem = selectSate.filter(item => {
154
+ if (item.groupIndex === 1) {
155
+ if (item.keyName.substring(0, 6) === 'logic@') {
156
+ // 请求logic
157
+ post('/webmeterapi/' + item.keyName.substring(6), {}).then(res => {
158
+ this.SelectsArray[item.group][item.groupIndex] = res
159
+ this.SelectsArray = JSON.parse(JSON.stringify(this.SelectsArray))
160
+ })
161
+ } else {
162
+ this.SelectsArray[item.group][item.groupIndex] = JSON.parse(item.keyName)
163
+ this.SelectsArray = JSON.parse(JSON.stringify(this.SelectsArray))
164
+ }
165
+ }
166
+ return item.group === groupName
167
+ }
168
+ )
169
+ this.SelectsNumber[groupName] = SelectsItem.length ? SelectsItem.length : 0
170
+ }
171
+ )
172
+ this.loaded = true
173
+ },
174
+ selectsItemCheck (callback, groupName, index, value) {
175
+ const tem = { }
176
+ const group = this.realJsonData.filter(item => item.addOrEdit && item.group && item.group === groupName)
177
+ // 获取当前下拉框子下拉框的数据
178
+ this.SelectsArray[groupName][index + 1] = this.SelectsArray[groupName][index].filter(item => item.value === value)[0].children
179
+ // 清空子下拉框的子们的数据
180
+ for (let i = index; i < this.SelectsNumber[groupName]; i++) {
181
+ tem[group[i].model] = undefined
182
+ }
183
+ this.form = Object.assign({}, this.form, tem)
184
+ // 清空子下拉框的子们的数据源
185
+ for (let i = index + 2; i <= this.SelectsNumber[groupName]; i++) {
186
+ this.SelectsArray[groupName][i] = []
187
+ }
188
+ callback(this.SelectsArray)
189
+ },
190
+ formItemLoad () {
191
+ const formData = Object.assign({}, this.fixedAddForm)
192
+ for (let i = 0; i < this.realJsonData.length; i++) {
193
+ const item = this.realJsonData[i]
194
+ formData[item.model] = undefined
195
+ // 处理表单校验情况
196
+ if (item.rule) {
197
+ this.rules[item.model] = []
198
+ const required = item.rule.required ? item.rule.required === true || item.rule.required === 'true' : false
199
+ let trigger
200
+ let message
201
+ if (required) {
202
+ switch (item.type) {
203
+ case 'select':
204
+ message = '请选择' + item.name
205
+ trigger = 'change'
206
+ break
207
+ default:
208
+ message = '请输入' + item.name
209
+ trigger = 'blur'
210
+ }
211
+ this.rules[item.model].push({
212
+ required: true,
213
+ message: message,
214
+ trigger: trigger
215
+ })
216
+ }
217
+
218
+ switch (item.rule.type) {
219
+ case 'number':
220
+ case 'integer':
221
+ case 'float':
222
+ let defaultValue
223
+ let message
224
+ switch (item.rule.type) {
225
+ case 'number':
226
+ message = '数字'
227
+ defaultValue = 0
228
+ break
229
+ case 'integer':
230
+ message = '整数'
231
+ defaultValue = 0
232
+ break
233
+ case 'float':
234
+ message = '小数'
235
+ defaultValue = 0.0
236
+ break
237
+ }
238
+ this.rules[item.model].push({
239
+ type: item.rule.type,
240
+ message: item.name + '必须为' + message,
241
+ transform: (value) => {
242
+ if (value && value.length !== 0) {
243
+ return Number(value)
244
+ } else {
245
+ return defaultValue
246
+ }
247
+ },
248
+ trigger: 'blur'
249
+ })
250
+ break
251
+ }
252
+ }
253
+ }
254
+ this.form = formData
255
+ if (Object.keys(this.modifyModelData).length > 0) {
256
+ this.getModifyModelData()
257
+ }
258
+ },
259
+ itemDisabled (value) {
260
+ return (this.businessType === '新增' && value.addOrEdit === 'edit') ||
261
+ (this.businessType === '修改' && value.addOrEdit === 'add')
262
+ },
263
+ itemDisabledPlus (group, index) {
264
+ return (!this.SelectsArray[group][index]) || (this.SelectsArray[group][index] && this.SelectsArray[group][index].length === 0)
265
+ },
266
+ resetForm () {
267
+ this.$refs.selectForm.resetFields()
268
+ },
269
+ async onSubmit () {
270
+ this.$refs.selectForm.validate(async valid => {
271
+ for (const key of Object.keys(this.form)) {
272
+ if (this.form[key] === null || this.form[key] === '') {
273
+ this.form[key] = undefined
274
+ }
275
+ }
276
+ const requestParameters = Object.assign({}, this.form)
277
+ // 追加静默新增字段
278
+ if (this.businessType === '新增') {
279
+ for (const item of this.silenceAddJsonData) {
280
+ switch (item.silencePurpose) {
281
+ case 'createTime':
282
+ requestParameters[item.model] = formatDate('now')
283
+ break
284
+ case 'operator':
285
+ requestParameters[item.model] = this.currUser.name
286
+ break
287
+ case 'orgId':
288
+ requestParameters[item.model] = this.currUser.orgid
289
+ break
290
+ }
291
+ }
292
+ // 通过请求追加静默新增:自定义字段
293
+ for (const item of this.silenceAddJsonData.filter((item) => item.silencePurpose === 'customize')) {
294
+ requestParameters[item.model] = await this.getSilenceSource(item.silenceSource, requestParameters)
295
+ }
296
+ }
297
+ const data = {
298
+ valid: valid,
299
+ form: requestParameters
300
+ }
301
+ this.$emit('onSubmit', data)
302
+ })
303
+ },
304
+ async getSilenceSource (silenceSource, requestParameters) {
305
+ const result = await post('/webmeterapi/' + silenceSource, requestParameters)
306
+ return result
307
+ },
308
+ getModifyModelData () {
309
+ for (let i = 0; i < this.realJsonData.length; i++) {
310
+ const item = this.realJsonData[i]
311
+ if (this.modifyModelData[item.model] || this.modifyModelData[item.model] === 0) {
312
+ this.form[item.model] = this.modifyModelData[item.model] + ''
313
+ } else {
314
+ this.form[item.model] = undefined
315
+ }
316
+ }
317
+ // 追加版本号信息
318
+ for (const item of this.versionJsonData) {
319
+ if (!this.modifyModelData[item.model]) {
320
+ this.form[item.model] = 0
321
+ } else {
322
+ this.form[item.model] = this.modifyModelData[item.model] + ''
323
+ }
324
+ }
325
+ },
326
+ onClose () {
327
+ this.$emit('update:visible', false)
328
+ }
329
+ }
330
+ }
331
+ </script>