vue2-client 1.5.11 → 1.5.13

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 (5) hide show
  1. package/CHANGELOG.md +1 -1
  2. package/package.json +1 -1
  3. package/src/base-client/components/common/XFormTable/XFormTable.vue +9 -7
  4. package/src/base-client/components/common/XTable/XTable.vue +9 -6
  5. package/src/base-client/plugins/AppData.js +1 -4
package/CHANGELOG.md CHANGED
@@ -1,7 +1,7 @@
1
1
  # Change Log
2
2
  > 所有关于本项目的变化都在该文档里。
3
3
 
4
- **1.5.11 -2022-12-05 @江超**
4
+ **1.5.11 - 1.5.13 -2022-12-05 @江超**
5
5
  - 优化了查询配置生成界面的样式
6
6
 
7
7
  **1.5.6 - 1.5.10 -2022-12-05 @江超**
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vue2-client",
3
- "version": "1.5.11",
3
+ "version": "1.5.13",
4
4
  "private": false,
5
5
  "scripts": {
6
6
  "serve": "vue-cli-service serve",
package/src/base-client/components/common/XFormTable/XFormTable.vue CHANGED
@@ -10,7 +10,9 @@
10
10
  ref="xForm"
11
11
  style="margin-bottom: 14px;"
12
12
  @onSubmit="onSearchSubmit">
13
- <slot></slot>
13
+ <template slot="formBtnExpand">
14
+ <slot name="formBtnExpand"></slot>
15
+ </template>
14
16
  </x-form>
15
17
  <x-table
16
18
  ref="xTable"
@@ -25,18 +27,18 @@
25
27
  @selectRow="selectRow"
26
28
  @afterQuery="afterQuery"
27
29
  @tempTableEdit="tempTableEdit">
28
- <template slot="expand">
29
- <slot name="expand"></slot>
30
+ <template slot="button" slot-scope="{selectedRowKeys, selectedRows}">
31
+ <slot name="button" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
30
32
  </template>
31
- <template slot="rightBtnExpand">
32
- <slot name="rightBtnExpand"></slot>
33
+ <template slot="rightBtnExpand" slot-scope="{selectedRowKeys, selectedRows}">
34
+ <slot name="rightBtnExpand" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
33
35
  <a-button @click="toggleIsFormShow">
34
36
  <a-icon :style="iconStyle" type="vertical-align-top"/>
35
37
  </a-button>
36
38
  </template>
37
39
  <!-- 底部插槽 -->
38
- <template slot="footer">
39
- <slot name="footer"></slot>
40
+ <template slot="footer" slot-scope="{selectedRowKeys, selectedRows}">
41
+ <slot name="footer" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
40
42
  </template>
41
43
  </x-table>
42
44
  </div>
package/src/base-client/components/common/XTable/XTable.vue CHANGED
@@ -30,15 +30,14 @@
30
30
  </a-menu>
31
31
  <a-button>导出 <a-icon type="down" /> </a-button>
32
32
  </a-dropdown>
33
- <slot :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows" name="button"></slot>
33
+ <slot name="button" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
34
34
  </a-space>
35
- <slot name="expand"></slot>
36
35
  </span>
37
36
  </a-col>
38
37
  <a-col>
39
38
  <span :style="{ float: 'right', overflow: 'hidden', marginBottom: '8px' }">
40
39
  <a-button-group>
41
- <slot name="rightBtnExpand"></slot>
40
+ <slot name="rightBtnExpand" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
42
41
  <a-button @click="refresh(true)">
43
42
  <a-icon :style="iconStyle" type="reload" />
44
43
  </a-button>
@@ -84,7 +83,7 @@
84
83
  </span>
85
84
  </template>
86
85
  <template slot="footer">
87
- <slot name="footer"></slot>
86
+ <slot name="footer" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
88
87
  </template>
89
88
  </s-table>
90
89
  <!-- 上传文件 -->
@@ -363,7 +362,7 @@ export default {
363
362
  this.$emit('add')
364
363
  },
365
364
  // 编辑业务
366
- edit () {
365
+ edit (id) {
367
366
  this.editLoading = true
368
367
  // 组织被编辑数据
369
368
  const requestParameters = {
@@ -372,7 +371,11 @@ export default {
372
371
  pageNo: 1,
373
372
  pageSize: 1
374
373
  }
375
- this.selectId = this.selectedRowKeys[0]
374
+ if (!id) {
375
+ this.selectId = this.selectedRowKeys[0]
376
+ } else {
377
+ this.selectId = id
378
+ }
376
379
  const primaryKeyName = this.getPrimaryKeyName()
377
380
  requestParameters.conditionParams[primaryKeyName] = this.selectId
378
381
  requestParameters.f_businessid = this.selectId
package/src/base-client/plugins/AppData.js CHANGED
@@ -31,10 +31,7 @@ const GetAppDataService = {
31
31
  localStorage.setItem(process.env.VUE_APP_BADGE_KEY, JSON.stringify(badgeItemArray))
32
32
  })
33
33
  // 获取省市区数据
34
- await post(manageApi.getDivisionsOhChina, {}).then((res) => {
35
- // 追加参数
36
- localStorage.setItem(process.env.VUE_APP_DIVISIONSOHCHINA, JSON.stringify(res))
37
- })
34
+ localStorage.setItem(process.env.VUE_APP_DIVISIONSOHCHINA, JSON.stringify([]))
38
35
  },
39
36
  // 返回树形省市区
40
37
  getDivisionsOhChinaForTree () {