vue2-client 1.2.55 → 1.2.58

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