doway-coms 2.10.30 → 2.10.32

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": "doway-coms",
3
- "version": "2.10.30",
3
+ "version": "2.10.32",
4
4
  "description": "doway组件库",
5
5
  "author": "dowaysoft",
6
6
  "main": "packages/index.js",
@@ -3,7 +3,8 @@
3
3
  <!-- <div @click="hiddenDetail = !hiddenDetail">展开</div> -->
4
4
  <div
5
5
  class="d-form-item"
6
- :style="{'width':col.colSpan?(col.colSpan*280+'px'):null}"
6
+ :style="{'width': col.colSpan ? 'calc('+col.colSpan*280+'px + '+(col.colSpan-1)*16+'px)': null,
7
+ 'flex': (col.colSpan ? col.colSpan+' 1 auto' : null)}"
7
8
  v-for="col in internalComputedHiddenCols"
8
9
  :key="col.field"
9
10
  v-show="hiddenDetail ? colIndex === 0 : true"
@@ -63,6 +63,7 @@ export default new Vuex.Store({
63
63
  },
64
64
  SET_MODULE_VIEW_INFO: (state, data) => {
65
65
  let tempDataInfo = {}
66
+ const tempPulldownFields = [];
66
67
  XEUtils.arrayEach(data.info.datas, loopData => {
67
68
  let tempFields = []
68
69
  let tempPagerButtons = []
@@ -116,6 +117,9 @@ export default new Vuex.Store({
116
117
  p => p.dictCode === extraInfo.dataSource
117
118
  )
118
119
  }
120
+ if (tempField.controlType === controlType.pulldown) {
121
+ tempPulldownFields.push(tempField);
122
+ }
119
123
 
120
124
  if (tempField.controlType === controlType.pager_button) {
121
125
  tempPagerButtons.push(tempField)
@@ -150,6 +154,32 @@ export default new Vuex.Store({
150
154
  tempDataInfo[loopData.code]['fields'] = tempFields
151
155
 
152
156
  })
157
+ //批量设置下拉属性
158
+ XEUtils.arrayEach(tempPulldownFields, (loopField) => {
159
+ loopField['columns'] = tempDataInfo[loopField.linkData].fields;
160
+ loopField['pageSize'] = tempDataInfo[loopField.linkData].pageSize;
161
+ loopField['pageSizeOptions'] = tempDataInfo[loopField.linkData].pageSizeOptions;
162
+ let tempApi = null;
163
+ switch(tempDataInfo[loopField.linkData].objectService){
164
+ case 'base':
165
+ tempApi = process.env.VUE_APP_BASE_SERVICE_URL
166
+ break;
167
+ case 'mes':
168
+ tempApi = process.env.VUE_APP_MES_SERVICE_URL
169
+ break;
170
+ case 'wms':
171
+ tempApi = process.env.VUE_APP_WMS_SERVICE_URL
172
+ break;
173
+ case 'erp':
174
+ tempApi = process.env.VUE_APP_ERP_SERVICE_URL
175
+ break;
176
+ default:
177
+ tempApi = process.env.VUE_APP_WMS_SERVICE_URL
178
+ break;
179
+ }
180
+ loopField['api'] = tempApi+'/v1/commonOperation/searchData';
181
+ loopField['currentModuleCode'] = moduleCode;
182
+ });
153
183
  data.info['dataInfo'] = tempDataInfo
154
184
  state.moduleViewInfo[data.moduleCode] = data.info
155
185
  },