super-pages 0.7.59 → 0.7.60

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 CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "super-pages",
3
- "version": "0.7.59",
3
+ "version": "0.7.60",
4
4
  "description": "页面组件",
5
5
  "main": "lib/super-pages.umd.min.js",
6
6
  "keyword": "super-pages",
@@ -14,7 +14,7 @@
14
14
  @change="searchGridData"
15
15
  >
16
16
  <el-option
17
- v-for="item in optionListResult"
17
+ v-for="item in optionListResult(toolbar)"
18
18
  :key="item.value"
19
19
  :label="item.label"
20
20
  :value="item.value"
@@ -31,7 +31,7 @@
31
31
  @change="searchGridData"
32
32
  >
33
33
  <el-option
34
- v-for="item in optionListResult"
34
+ v-for="item in optionListResult(toolbar)"
35
35
  :key="item.value"
36
36
  :label="item.label"
37
37
  :value="item.value"
@@ -44,7 +44,7 @@
44
44
  @change="searchGridData"
45
45
  >
46
46
  <el-radio
47
- v-for="item in optionListResult"
47
+ v-for="item in optionListResult(toolbar)"
48
48
  :key="item.value"
49
49
  :label="item.value"
50
50
  > {{ item.name==null?item.label:item.name }}</el-radio>
@@ -56,7 +56,7 @@
56
56
  @change="searchGridData"
57
57
  >
58
58
  <el-checkbox
59
- v-for="item in optionListResult"
59
+ v-for="item in optionListResult(toolbar)"
60
60
  :key="item.value"
61
61
  :label="item.value"
62
62
  >
@@ -115,11 +115,6 @@ export default {
115
115
  dataTypeObj: {}
116
116
  }
117
117
  },
118
- computed: {
119
- optionListResult () {
120
- return this.toolbar.dynamicDataSourceCode ? this.optionsList[this.toolbar.dynamicDataSourceCode] : this.toolbar.optionGroupCode ? this.optionsList[this.toolbar.optionGroupCode] : null
121
- }
122
- },
123
118
  created () {
124
119
  const additionalParamMap = getStoreInfo(this.pageCode, 'additionalParamMap')
125
120
  if (additionalParamMap) {
@@ -133,6 +128,9 @@ export default {
133
128
  },
134
129
  methods: {
135
130
  ...Util,
131
+ optionListResult (toolbar) {
132
+ return toolbar.dynamicDataSourceCode ? this.optionsList[toolbar.dynamicDataSourceCode] : toolbar.optionGroupCode ? this.optionsList[toolbar.optionGroupCode] : null
133
+ },
136
134
  // 解析listToolbarList
137
135
  analysisListToolbarList () {
138
136
  if (this.listToolbarList && this.listToolbarList.length > 0) {
@@ -1,5 +1,8 @@
1
1
  <template>
2
- <span v-if="isCustomVisible" :id="pageCode + '_' + button.code">
2
+ <span
3
+ v-if="isCustomVisible"
4
+ :id="pageCode + '_' + button.code"
5
+ >
3
6
  <span
4
7
  v-if="!isView || button.code ==='back'"
5
8
  v-permission="permission"
@@ -15,6 +18,7 @@
15
18
  :get-entity="myFormDataFun"
16
19
  :refresh-list="getSystemRef"
17
20
  :class="button.code"
21
+ :additional-param-map="additionalParamMap"
18
22
  @refresh="refreshEmit"
19
23
  @prohibi-edit="fnProhibitToEdit"
20
24
  @refresh-tab="refreshTab"
@@ -226,7 +230,7 @@ export default {
226
230
  if (!this.displayConditions || this.displayConditions.length === 0) {
227
231
  // 如果没有配置按钮显示条件,则默认为显示
228
232
  this.isCustomVisible = true
229
- } else if (this.position === 'form' || this.position === 'workflowForm') {
233
+ } else if (this.position === 'form' || this.position === 'workflowForm') {
230
234
  this.isButtonVisible(this.displayConditions, this.tableName, this.additionalParamMap).then(result => {
231
235
  this.isCustomVisible = result
232
236
  })
@@ -1109,6 +1109,14 @@ export default {
1109
1109
  if (this.$refs.superForm) {
1110
1110
  return this.$refs.superForm.fnProhibitToEdit(entity)
1111
1111
  }
1112
+ },
1113
+ // 刷新表单数据
1114
+ refresMainTableFields (entity) {
1115
+ console.log('this.$refs.superForm', this.$refs.superForm)
1116
+ if (this.$refs.superForm) {
1117
+ this.reviewButton(entity)
1118
+ return this.$refs.superForm.refresMainTableFields(entity)
1119
+ }
1112
1120
  }
1113
1121
  }
1114
1122
  }