centaline-data-driven-v3 0.1.13 → 0.1.14

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 (6) hide show
  1. package/dist/centaline-data-driven-v3.umd.js +6 -6
  2. package/package.json +1 -1
  3. package/src/components/web/SearchList/SearchTable.vue +1 -1
  4. package/src/loader/src/SearchTable.js +7 -2
  5. package/src/main.js +1 -1
  6. package/src/views/SearchList.vue +2 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "centaline-data-driven-v3",
3
- "version": "0.1.13",
3
+ "version": "0.1.14",
4
4
  "private": false,
5
5
  "description": "centaline-data-driven-v3",
6
6
  "main": "dist/centaline-data-driven-v3.umd.js",
package/src/components/web/SearchList/SearchTable.vue CHANGED
@@ -25,7 +25,7 @@
25
25
  <thead ref="refTableHead" class="right-no-fixation-th">
26
26
  <tr class="ct-tr" ref="refHeadTr" v-for="(columns, columnsIndex) in model.columnsArr"
27
27
  :key="columnsIndex">
28
- <th v-if="model.isMulti && columnsIndex === 0" ref="headLeftThs"
28
+ <th v-if="model.isMulti && columnsIndex === 0" ref="headLeftThs" :rowspan="model.multiRowSpan"
29
29
  class="ct-td left-fixation-th checkbox-td" :class="[model.tdClass]">
30
30
  <el-checkbox v-model="model.selectAll" :indeterminate="model.isIndeterminate"
31
31
  size="default" @change="selectAll"></el-checkbox>
package/src/loader/src/SearchTable.js CHANGED
@@ -262,10 +262,15 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
262
262
  get parameterAction() {
263
263
  return source.content.parameterAction;
264
264
  },
265
- get isMulti() { //是否多选
265
+ get multiRowSpan(){
266
266
  if (this.isMergeTitle) {
267
- return false; //合并表头暂不支持多选
267
+ if (typeof source.content.columns !== 'undefined') {
268
+ return source.content.columns.reduce((max, item) => Math.max(max, item.rowSpan), -Infinity);
269
+ }
268
270
  }
271
+ return 1;
272
+ },
273
+ get isMulti() { //是否多选
269
274
  return source.content.flagCheckBoxColumn === true;
270
275
  },
271
276
  // 表格行中要合并的列名列表
package/src/main.js CHANGED
@@ -67,7 +67,7 @@ app.use(centaline, {
67
67
  return {
68
68
  //authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVay1xvvOl3sJA2HiPIxElSIJBIIcXdAQEfPFK-YZt4Nlm2EChqtDafOYWqpRG6kxLoTxZhUTSRxHLUPH_DHfOmt5SDWt1gHScieHapNiol94q5pXYoNFJAvJ6isGHWmNMYVcBjWtyCr_iW2JZ93-fqPc8f18MwGIqFRCIO1GXmWGYd9npCZJ6N5JjYZ7g8AAAD__w.HgtNKtHWooj8c9Hy_vB8CfKq-qOeHMp0irnW0DfXtHo"}',
69
69
  //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
70
- authObject: '{token:"jiangzf-1956186756261081088",platform:"WEB"}',
70
+ authObject: '{token:"jiangzf-1957609871855812608",platform:"WEB"}',
71
71
  //authObject: '{token:"1-90f7df2c-fba7-4ea0-8874-aa7202034f06"}',
72
72
  };
73
73
  },
package/src/views/SearchList.vue CHANGED
@@ -4,8 +4,8 @@
4
4
  :searchDataApi="'/propertyPublishList/getListOfSearchModel'"
5
5
  :searchStatsApi="'/propertyPublishList/getListStats'"></ct-searchlist> -->
6
6
 
7
- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/EmployeeMaternityList/getLayoutOfSearch'"
8
- :searchDataApi="'/EmployeeMaternityList/getListOfSearchModel'"></ct-searchlist>
7
+ <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/EmployeeLeaveBalanceList/getLayoutOfSearch'"
8
+ :searchDataApi="'/EmployeeLeaveBalanceList/getListOfSearchModel'"></ct-searchlist>
9
9
 
10
10
  <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/OvertimeList/getLayoutOfSearch'"
11
11
  :searchDataApi="'/OvertimeList/getListOfSearchModel'"></ct-searchlist> -->