centaline-data-driven 1.6.46 → 1.6.47

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/package.json +1 -1
  2. package/release-log.md +7 -0
  3. package/src/centaline/loader/src/ctl/SearchTable.js +1 -1
  4. package/src/main.js +1 -1
  5. package/wwwroot/static/centaline/centaline-data-driven.js +1 -1
  6. package/wwwroot/static/centaline/centaline-data-driven.js.map +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "centaline-data-driven",
3
- "version": "1.6.46",
3
+ "version": "1.6.47",
4
4
  "description": "ccai",
5
5
  "author": "hjc <3226136347@qq.com>",
6
6
  "private": false,
package/release-log.md CHANGED
@@ -1,3 +1,10 @@
1
+ # v1.6.47
2
+ 2024-06-19
3
+
4
+ 优化
5
+
6
+ 多行表头的列表支持单行的表头固定
7
+
1
8
  # v1.6.46
2
9
  2024-06-13
3
10
 
package/src/centaline/loader/src/ctl/SearchTable.js CHANGED
@@ -187,7 +187,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
187
187
  };
188
188
  if (col.show) {
189
189
  //合并表头时暂不支持固定列
190
- if (col.lock && !self.isMergeTitle) {
190
+ if (col.lock && col.trOrder == 1 && col.colspan == 1) {
191
191
  if (lockLeft) {
192
192
  col.fixed = 'left';
193
193
  } else {
package/src/main.js CHANGED
@@ -76,7 +76,7 @@ Vue.use(centaline, {
76
76
  estateId: '',
77
77
 
78
78
  authObject: '{"currentEstate":{"estateId":"241112160400DF3DC1EB63A14A1DBBF4","estateName":"%E6%B5%8B%E8%AF%95%E6%8C%89%E7%82%B9%E4%BD%8Dhq","estDeptPath":"001.200.063.001"},"platform":1,"osVersion":"","machineCode":"eeb8e2fc88b5bcbc2e4f297777142537","token":"","random":"6TnEgk","time":1749115399017,"sign":"3a50eb5f08b7bd75b2e7c99f32fa220e","systemSource":"CCESU","empNo":"hqxtgl","empId":"2411121446336B97FBEB7FD54905A903","clientVersion":"12.5","empName":"hq%E7%B3%BB%E7%BB%9F%E7%AE%A1%E7%90%86","roleName":"%E7%B3%BB%E7%BB%9F%E7%AE%A1%E7%90%86%E5%91%98","deptFullName":"%E6%9C%AA%E5%8C%B9%E9%85%8DCCHR%E4%B8%ADHROC%E9%83%A8%E9%97%A8%2F%E9%9B%86%E5%9B%A2IT%2FCCES%E7%BB%84"}',
79
- AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImU0Y2MyMmVjLTA2OGEtNDE1Yi1hNzY3LTE0ZDBkODBkNTMxMCJ9.Rqk2TL4Q8rPqFh8LvDP5nAMDzRCzVia_DnrSXi5qnV8NoIkcl-nrRS4DRS-yRapMS5h8biWjI1tcFsneDJNvFQ',
79
+ AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImI2NTI2OTIwLTgwYTctNGEwYy05NDIzLTNhMjIyYTU5NGI1OSJ9.qNBufvjAR9abqVXOSsEpuVx_tmzSjLbeQhswo2d_Utx5Mhmn3YSRLOTGaq5LPsCtS3S77F7EEQZsiyOsHePkXQ',
80
80
  };
81
81
  },
82
82
  // 请求完成事件，可判断是否登录过期执行响应操作
package/wwwroot/static/centaline/centaline-data-driven.js CHANGED
@@ -59754,7 +59754,7 @@ var SearchTable = function SearchTable(data, callBack, searchModel, flagSearch,
59754
59754
  };
59755
59755
  if (col.show) {
59756
59756
  //合并表头时暂不支持固定列
59757
- if (col.lock && !self.isMergeTitle) {
59757
+ if (col.lock && col.trOrder == 1 && col.colspan == 1) {
59758
59758
  if (lockLeft) {
59759
59759
  col.fixed = 'left';
59760
59760
  } else {