cloud-web-corejs 1.1.0-dev.40 → 1.1.0-dev.41

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.1.0-dev.40",
4
+ "version": "1.1.0-dev.41",
5
5
  "scripts": {
6
6
  "build:ace-resources": "node build/build-ace-resources.js",
7
7
  "build:tinymce-resources": "node build/build-tinymce-resources.js",
@@ -1,9 +1,9 @@
1
1
  <template>
2
- <vxe-grid
3
- :ref="widget.id"
4
- v-bind="vxeOption"
5
- :style="dataTableStyle"
6
- :auto-resize="true"
2
+ <vxe-grid
3
+ :ref="widget.id"
4
+ v-bind="vxeOption"
5
+ :style="dataTableStyle"
6
+ :auto-resize="tableAutoResize"
7
7
  v-show="!widget.options.hidden"
8
8
  @resizable-change="$vxeTableUtil.onColumnWitchChange"
9
9
  @custom="$vxeTableUtil.customHandle"
@@ -77,9 +77,9 @@
77
77
  plain
78
78
  >{{ $t1("刷新") }}
79
79
  </vxe-button>
80
- <vxe-button
81
- v-if="!widget.options.isNotShowQueryButton"
82
- status="warning"
80
+ <vxe-button
81
+ v-if="!widget.options.isNotShowQueryButton"
82
+ status="warning"
83
83
  icon="el-icon-search"
84
84
  class="button-sty"
85
85
  @click="handleSearchClick"
@@ -264,7 +264,7 @@
264
264
  @click="removeEditRow(obj)"
265
265
  class="a-link"
266
266
  data-tit="删除"
267
- v-if="!hasSaveRow(obj.row) && canDeleteTableRow(obj)"
267
+ v-if="!hasSaveRow(obj.row) && canDeleteTableRow(obj)"
268
268
  >
269
269
  <el-tooltip
270
270
  :enterable="false"
@@ -249,6 +249,15 @@ modules = {
249
249
  if (/^\d+(?:\.\d+)?$/.test(width)) width += "px";
250
250
  return { width };
251
251
  },
252
+ /**
253
+ * 查询表 / 配了 tableHeight 的表才跟父级对高度(内部滚动)。
254
+ * 详情里的树表没设高度时必须跟着行数长,滚动交给页面的 .d-cont,
255
+ * 否则 auto-resize 会把表格撑满视口,页面滚动条消失。
256
+ */
257
+ tableAutoResize() {
258
+ let options = this.widget.options || {};
259
+ return !!(options.isQueryTable || options.tableHeight);
260
+ },
252
261
  singleRowSelectFlag: function () {
253
262
  return !this.widget.options.showCheckBox;
254
263
  },
@@ -3174,7 +3183,7 @@ modules = {
3174
3183
  }
3175
3184
  : {}),
3176
3185
  config: {
3177
- height: height,
3186
+ ...(height ? { height } : {}),
3178
3187
  showFooter,
3179
3188
  pagerConfig: this.isPaginationVisible ? pagerConfig : false,
3180
3189
  treeConfig,
@@ -1,7 +1,7 @@
1
- // Core xform container, card, query and setting-link styles.
2
- @import "~@base/styles/variables.scss";
3
- @import "~@base/styles/mixin.scss";
4
-
1
+ // Core xform container, card, query and setting-link styles.
2
+ @import "~@base/styles/variables.scss";
3
+ @import "~@base/styles/mixin.scss";
4
+
5
5
  .link-oneLind {
6
6
  // border: solid 1px #dddee0;
7
7
  // background: #f4f5f5;
@@ -179,6 +179,13 @@
179
179
  }
180
180
  }
181
181
 
182
+ /* PC 详情滚动区:flex 子项默认 min-height:auto,会被表格等内容撑开,
183
+ 父级 overflow 失效(H5 同款见 styles/h5.scss 块 G .h5-detail-body)。
184
+ 写在包内,消费应用升包即生效;不改 resources/css/style.scss。 */
185
+ .detail-wrap .d-header + div {
186
+ min-height: 0;
187
+ }
188
+
182
189
  .search-screen {
183
190
  padding: 4px 0;
184
191
  margin-bottom: 6px;
@@ -205,4 +212,4 @@
205
212
  }
206
213
  }
207
214
  }
208
- }
215
+ }