vue2-client 1.5.18 → 1.5.20

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 (11) hide show
  1. package/CHANGELOG.md +2 -1
  2. package/package.json +1 -1
  3. package/src/base-client/components/common/CitySelect/CitySelect.vue +4 -2
  4. package/src/base-client/components/common/XAddForm/XAddForm.vue +2 -2
  5. package/src/base-client/components/common/XAddForm/index.md +1 -1
  6. package/src/base-client/components/common/XForm/XForm.vue +3 -3
  7. package/src/base-client/components/common/XForm/XFormItem.vue +5 -3
  8. package/src/base-client/components/common/XForm/index.md +1 -1
  9. package/src/base-client/components/common/XFormTable/XFormTable.vue +3 -3
  10. package/src/base-client/components/common/XFormTable/index.md +1 -1
  11. package/src/base-client/plugins/AppData.js +10 -5
package/CHANGELOG.md CHANGED
@@ -1,7 +1,7 @@
1
1
  # Change Log
2
2
  > 所有关于本项目的变化都在该文档里。
3
3
 
4
- **1.5.14 - 1.5.18 -2022-12-12 @苗艳强**
4
+ **1.5.14 - 1.5.19 -2022-12-12 @苗艳强**
5
5
  - 修复徽标显示问题
6
6
  - 修复fixedQueryForm问题
7
7
  - 修复修改时树形选择框不能回填问题
@@ -13,6 +13,7 @@
13
13
  - 修改查询配置
14
14
  - 修复清空查询缓存回调问题
15
15
  - 新增调用logic获取数据源可自定义追加参数
16
+ - 修改省市区数据获取
16
17
 
17
18
  **1.5.11 - 1.5.13 -2022-12-05 @江超**
18
19
  - 优化了查询配置生成界面的样式
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vue2-client",
3
- "version": "1.5.18",
3
+ "version": "1.5.20",
4
4
  "private": false,
5
5
  "scripts": {
6
6
  "serve": "vue-cli-service serve",
package/src/base-client/components/common/CitySelect/CitySelect.vue CHANGED
@@ -70,7 +70,7 @@ export default {
70
70
  return {
71
71
  open: false,
72
72
  tagData: {
73
- divisionsForTree: this.$appdata.getDivisionsOhChinaForTree(),
73
+ divisionsForTree: [],
74
74
  // 市
75
75
  cityData: [],
76
76
  // 区
@@ -99,7 +99,9 @@ export default {
99
99
  }
100
100
  },
101
101
  mounted () {
102
-
102
+ this.$appdata.getDivisionsOhChinaForTree().then(res => {
103
+ this.tagData.divisionsForTree = res
104
+ })
103
105
  },
104
106
  model: {
105
107
  prop: 'value',
package/src/base-client/components/common/XAddForm/XAddForm.vue CHANGED
@@ -29,7 +29,7 @@
29
29
  :xl="12"
30
30
  :xxl="8"
31
31
  mode="新增/修改"
32
- :get-data-append-params="getDataAppendParams"
32
+ :get-data-params="getDataParams"
33
33
  />
34
34
  </a-row>
35
35
  </a-form-model>
@@ -49,7 +49,7 @@ export default {
49
49
  },
50
50
  props: {
51
51
  // 调用logic获取数据源的追加参数
52
- getDataAppendParams: {
52
+ getDataParams: {
53
53
  type: Object,
54
54
  default: undefined
55
55
  }
package/src/base-client/components/common/XAddForm/index.md CHANGED
@@ -47,7 +47,7 @@ export default {
47
47
  | modifyModelData | 修改操作前查询出的业务数据 | Object | {} |
48
48
  | loading | 新增或修改业务是否执行中 | Boolean | false |
49
49
  | fixedAddForm | 固定新增表单，会和新增表单合并 | Object | {} |
50
- | getDataAppendParams | 调用logic获取数据源的追加参数 | Object | - |
50
+ | getDataParams | 调用logic获取数据源的追加参数 | Object | - |
51
51
  | @onSubmit | 表单的提交事件 | event | - |
52
52
 
53
53
  ## 例子1
package/src/base-client/components/common/XForm/XForm.vue CHANGED
@@ -14,7 +14,7 @@
14
14
  :attr="item"
15
15
  :form="form"
16
16
  :service-name="serviceName"
17
- :get-data-append-params="getDataAppendParams"
17
+ :get-data-params="getDataParams"
18
18
  />
19
19
  <a-drawer
20
20
  :get-container="() => {return $refs.drawerContainer}"
@@ -32,7 +32,7 @@
32
32
  :attr="item"
33
33
  :form="form"
34
34
  :service-name="serviceName"
35
- :get-data-append-params="getDataAppendParams"
35
+ :get-data-params="getDataParams"
36
36
  />
37
37
  </a-form-model>
38
38
  </a-drawer>
@@ -68,7 +68,7 @@ export default {
68
68
  },
69
69
  props: {
70
70
  // 调用logic获取数据源的追加参数
71
- getDataAppendParams: {
71
+ getDataParams: {
72
72
  type: Object,
73
73
  default: undefined
74
74
  }
package/src/base-client/components/common/XForm/XFormItem.vue CHANGED
@@ -374,7 +374,7 @@ export default {
374
374
  default: 'af-system'
375
375
  },
376
376
  // 调用logic获取数据源的追加参数
377
- getDataAppendParams: {
377
+ getDataParams: {
378
378
  type: Object,
379
379
  default: undefined
380
380
  }
@@ -442,8 +442,10 @@ export default {
442
442
  if (value !== '') {
443
443
  const logicName = this.attr.keyName
444
444
  const logic = logicName.substring(6)
445
- if (this.getDataAppendParams && this.getDataAppendParams[logic]) {
446
- Object.assign(value, this.getDataAppendParams[logic])
445
+ const field = this.attr.model.replace('_', '.')
446
+ // 调用logic前设置参数
447
+ if (this.getDataParams && this.getDataParams[field]) {
448
+ Object.assign(value, this.getDataParams[field])
447
449
  }
448
450
  post('/api/' + this.serviceName + '/logic/' + logic, value).then(res => {
449
451
  callback(res)
package/src/base-client/components/common/XForm/index.md CHANGED
@@ -38,7 +38,7 @@ export default {
38
38
  |-----------|--------------------------|---------|------|
39
39
  | jsonData | JSON配置，根据[工具>查询配置生成]功能生成 | Object | {} |
40
40
  | isExports | 是否显示导出按钮 | Boolean | true |
41
- | getDataAppendParams | 调用logic获取数据源的追加参数 | Object | - |
41
+ | getDataParams | 调用logic获取数据源的追加参数 | Object | - |
42
42
  | @onSubmit | 表单的提交事件 | event | - |
43
43
 
44
44
  ## 例子1
package/src/base-client/components/common/XFormTable/XFormTable.vue CHANGED
@@ -4,12 +4,12 @@
4
4
  <div v-show="!loading">
5
5
  <x-add-form
6
6
  ref="xAddForm"
7
- :get-data-append-params="getDataAppendParams"
7
+ :get-data-params="getDataParams"
8
8
  @onSubmit="onAddOrEditSubmit"
9
9
  />
10
10
  <x-form
11
11
  ref="xForm"
12
- :get-data-append-params="getDataAppendParams"
12
+ :get-data-params="getDataParams"
13
13
  style="margin-bottom: 14px;"
14
14
  @onSubmit="onSearchSubmit">
15
15
  <slot name="formBtnExpand"></slot>
@@ -129,7 +129,7 @@ export default {
129
129
  default: true
130
130
  },
131
131
  // 调用logic获取数据源的追加参数
132
- getDataAppendParams: {
132
+ getDataParams: {
133
133
  type: Object,
134
134
  default: undefined
135
135
  }
package/src/base-client/components/common/XFormTable/index.md CHANGED
@@ -44,7 +44,7 @@ export default {
44
44
  | fixedAddForm | 固定新增表单，会和新增表单合并 | Object | {} |
45
45
  | isExports | 是否显示导出按钮 | Boolean | true |
46
46
  | viewMode | 是否为预览模式 | Boolean | false |
47
- | getDataAppendParams | 调用logic获取数据源的追加参数 | Object | - |
47
+ | getDataParams | 调用logic获取数据源的追加参数 | Object | - |
48
48
  | @action | 表格详情列的单击事件 | event | - |
49
49
  | @afterSubmit | 增改提交后的回调方法 | event | - |
50
50
  | @afterDelete | 删除提交后的回调方法 | event | - |
package/src/base-client/plugins/AppData.js CHANGED
@@ -30,13 +30,18 @@ const GetAppDataService = {
30
30
  localStorage.setItem(process.env.VUE_APP_DICTIONARY_KEY, JSON.stringify(params))
31
31
  localStorage.setItem(process.env.VUE_APP_BADGE_KEY, JSON.stringify(badgeItemArray))
32
32
  })
33
- // 获取省市区数据
34
- localStorage.setItem(process.env.VUE_APP_DIVISIONSOHCHINA, JSON.stringify([]))
35
33
  },
36
34
  // 返回树形省市区
37
- getDivisionsOhChinaForTree () {
38
- const str = localStorage.getItem(process.env.VUE_APP_DIVISIONSOHCHINA)
39
- return handleTree(JSON.parse(str), 'code', 'parentcode')
35
+ async getDivisionsOhChinaForTree () {
36
+ let list = this.getDivisionsOhChinaForList()
37
+ // 获取省市区数据
38
+ if (!list) {
39
+ await post(manageApi.getDivisionsOhChina, {}).then((res) => {
40
+ list = res
41
+ localStorage.setItem(process.env.VUE_APP_DIVISIONSOHCHINA, JSON.stringify(res))
42
+ })
43
+ }
44
+ return handleTree(list, 'code', 'parentcode')
40
45
  },
41
46
  // 返回列表省市区
42
47
  getDivisionsOhChinaForList () {