cloud-web-corejs 1.0.54-dev.70 → 1.0.54-dev.72
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 +1 -1
- package/src/components/VabUpload/propertiesDialog.vue +2 -2
- package/src/components/fileLibrary/index.vue +1 -1
- package/src/components/fileLibrary/mixins/propertiesDialogMixins.js +2 -1
- package/src/components/fileLibrary/propertiesDialog.vue +1 -1
- package/src/components/table/index.js +1 -1
- package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/data-table-editor.vue +6 -0
- package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/table-column-dialog.vue +5 -0
- package/src/components/xform/form-designer/setting-panel/property-editor/field-import-button/import-button-editor.vue +1 -1
- package/src/components/xform/form-designer/widget-panel/widgetsConfig.js +1 -0
- package/src/components/xform/form-render/container-item/data-table-item.vue +2 -1
- package/src/components/xform/form-render/container-item/data-table-mixin.js +1873 -1
|
@@ -13,6 +13,12 @@
|
|
|
13
13
|
</el-form-item>-->
|
|
14
14
|
<!-- <el-form-item :label="i18nt('designer.setting.showIndex')"><el-switch v-model="optionModel.showIndex"></el-switch></el-form-item>
|
|
15
15
|
<el-form-item :label="i18nt('designer.setting.showCheckBox')"><el-switch v-model="optionModel.showCheckBox"></el-switch></el-form-item> -->
|
|
16
|
+
<el-form-item label="启用数据行合并">
|
|
17
|
+
<el-switch v-model="optionModel.mergeRowEnabled"></el-switch>
|
|
18
|
+
</el-form-item>
|
|
19
|
+
<el-form-item :label="i18nt('合并行唯一字段')">
|
|
20
|
+
<el-input v-model="optionModel.mergeRowKey"></el-input>
|
|
21
|
+
</el-form-item>
|
|
16
22
|
<el-form-item label="查询列表">
|
|
17
23
|
<el-switch v-model="optionModel.isQueryTable"></el-switch>
|
|
18
24
|
</el-form-item>
|
|
@@ -63,6 +63,11 @@
|
|
|
63
63
|
<el-switch v-model="scope.row.sortable"></el-switch>
|
|
64
64
|
</template>
|
|
65
65
|
</el-table-column>
|
|
66
|
+
<el-table-column :label="i18nt('明细行')" width="70" prop="sortable">
|
|
67
|
+
<template slot-scope="scope">
|
|
68
|
+
<el-switch v-model="scope.row.isItemLine"></el-switch>
|
|
69
|
+
</template>
|
|
70
|
+
</el-table-column>
|
|
66
71
|
<el-table-column :label="i18nt('designer.setting.fixedColumn')" width="100" prop="fixed">
|
|
67
72
|
<template slot-scope="scope">
|
|
68
73
|
<el-select v-model="scope.row.fixed" clearable>
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
<el-form-item label="导入数据表名">
|
|
7
7
|
<el-input v-model="optionModel.importEntity"></el-input>
|
|
8
8
|
</el-form-item>
|
|
9
|
-
<el-form-item label="
|
|
9
|
+
<el-form-item label="文件大小限制（M）">
|
|
10
10
|
<base-input-number v-model="optionModel.importFileLimitSize" :max="200"></base-input-number>
|
|
11
11
|
</el-form-item>
|
|
12
12
|
<el-form-item label="选择导入模板文件">
|
|
@@ -2,7 +2,8 @@
|
|
|
2
2
|
<vxe-grid :ref="widget.id" v-bind="vxeOption" :auto-resize="true" v-show="!widget.options.hidden"
|
|
3
3
|
@resizable-change="$vxeTableUtil.onColumnWitchChange" @custom="$vxeTableUtil.customHandle"
|
|
4
4
|
@checkbox-change="handleCheckboxChange" @checkbox-all="handleCheckboxAll"
|
|
5
|
-
@cell-dblclick="handleCellDblclick" :class="dataTableConfig.class" :data="fieldModel"
|
|
5
|
+
@cell-dblclick="handleCellDblclick" :class="dataTableConfig.class" :data="fieldModel"
|
|
6
|
+
:span-method="mergeRowMethod">
|
|
6
7
|
<template #form>
|
|
7
8
|
<!-- <div v-if="widget.options.showSearchArea" class="clearfix screen-btns">
|
|
8
9
|
<div class="fl">
|