cloud-web-corejs 1.0.319 → 1.0.321

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,7 +1,7 @@
1
1
  {
2
2
  "name": "cloud-web-corejs",
3
3
  "private": false,
4
- "version": "1.0.319",
4
+ "version": "1.0.321",
5
5
  "scripts": {
6
6
  "dev": "vue-cli-service serve",
7
7
  "check:package-resources": "node build/check-package-resources.js",
@@ -434,15 +434,13 @@
434
434
  </div>
435
435
  <template v-if="showCandidate">
436
436
  <div v-show="tabIndex == '4'">
437
- <div style="width: 800px">
438
- <vxe-grid
439
- ref="table-candidate"
440
- v-bind="candidateOption"
441
- :data="candidateDatas"
442
- @resizable-change="$vxeTableUtil.onColumnWitchChange"
443
- @custom="$vxeTableUtil.customHandle"
444
- ></vxe-grid>
445
- </div>
437
+ <vxe-grid
438
+ ref="table-candidate"
439
+ v-bind="candidateOption"
440
+ :data="candidateDatas"
441
+ @resizable-change="$vxeTableUtil.onColumnWitchChange"
442
+ @custom="$vxeTableUtil.customHandle"
443
+ ></vxe-grid>
446
444
  </div>
447
445
  </template>
448
446
  </div>
@@ -2,7 +2,7 @@
2
2
  import {getToken} from "../../utils/auth";
3
3
  import settingConfig from "@/settings.js";
4
4
  import {selectDialogMixins} from "../../mixins/selectDialog";
5
- import {requireViewAsync} from "@base/utils/resolveViewComponent";
5
+ import {requireViewAsync} from "@base/utils/resolveViewComponent";
6
6
  import {getWfButtonNames, loadWfButtonNames} from "./wfButtonName";
7
7
  import {isWfAutoConfirm, loadWfAutoConfirm} from "./wfAutoConfirm";
8
8
  import {isWfTransferEnabled, loadWfTransferEnabled} from "./wfTransferEnabled";
@@ -13,7 +13,7 @@ let configUtil = {
13
13
  // 归属自己 / 包内组件本地渲染;归属别家子应用(remote)或缺文件时返回 null,
14
14
  // 不再抛错崩溃。归属解析见 @base/utils/resolveViewComponent。
15
15
  requireView: (url) => {
16
- return requireViewAsync(url);
16
+ return requireViewAsync(url);
17
17
  },
18
18
  };
19
19
 
@@ -199,11 +199,11 @@ wfIndexMixin = {
199
199
  modalStrictly: true,
200
200
  });
201
201
  },
202
- async openWfModifyDialog() {
202
+ async openWfModifyDialog() {
203
203
  let row = this.paramData;
204
204
  let url = row.url + ".vue";
205
205
  this.showModifyDialog = true;
206
- this.content = await configUtil.requireView(url);
206
+ this.content = await configUtil.requireView(url);
207
207
  this.$openEditView("showBillEdit");
208
208
  },
209
209
  modfyDialogClose() {
@@ -503,6 +503,12 @@ wfContentMixin = {
503
503
  },
504
504
  config: {
505
505
  height: 350,
506
+ // 关闭单行省略后按内容换行。虚拟滚动按固定行高裁切,这里关掉。
507
+ showOverflow: false,
508
+ scrollY: {
509
+ enabled: false,
510
+ gt: -1
511
+ },
506
512
  proxyConfig: {
507
513
  props: {
508
514
  result: "objx", // 配置响应结果列表字段
@@ -519,10 +525,11 @@ wfContentMixin = {
519
525
  {
520
526
  field: 'wfTaskCandidates',
521
527
  title: this.$t2('候选人', 'components.wf.candidate'),
522
- width: 450,
528
+ minWidth: 450,
523
529
  slots: {
524
- default: ({row, rowIndex}) => {
525
- return row.wfTaskCandidateDTOs ? row.wfTaskCandidateDTOs.map(item => item.name).join(",") : null;
530
+ default: ({row}) => {
531
+ let list = row.wfTaskCandidateDTOs || [];
532
+ return list.map(item => item.name).filter(Boolean).join(',');
526
533
  },
527
534
  },
528
535
  },
@@ -535,6 +542,12 @@ wfContentMixin = {
535
542
  ]
536
543
  };
537
544
  this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
545
+ // 列宽记忆会把候选人列写回固定 width,剩余空间就铺不满
546
+ let column = (opts.columns || []).find(item => item.field === 'wfTaskCandidates');
547
+ if (column) {
548
+ column.minWidth = column.minWidth || 450;
549
+ delete column.width;
550
+ }
538
551
  that.candidateOption = opts;
539
552
  });
540
553
  },
@@ -1990,11 +2003,11 @@ wfModifyMixin = {
1990
2003
  this.openWfModifyDialog(this.code);
1991
2004
  },
1992
2005
  methods: {
1993
- async openWfModifyDialog() {
2006
+ async openWfModifyDialog() {
1994
2007
  let row = this.paramData;
1995
2008
  let url = row.url + ".vue";
1996
2009
  this.showModifyDialog = true;
1997
- this.content = await configUtil.requireView(url);
2010
+ this.content = await configUtil.requireView(url);
1998
2011
  this.$openEditView("showBillEdit");
1999
2012
  },
2000
2013
  modfyDialogClose() {
@@ -80,4 +80,10 @@ export default {
80
80
  };
81
81
  </script>
82
82
 
83
- <style scoped></style>
83
+ <style>
84
+ /* 子列表高度沿 .flex-tabboxWidth 下的 v-for 节点传递。
85
+ 旧应用 style.scss 没有这条规则时,表格会缩成内容高度。 */
86
+ .flex > .tab-box-vertical + .flex-tabboxWidth > div {
87
+ height: 100%;
88
+ }
89
+ </style>