cloud-web-corejs 1.1.0-dev.82 → 1.1.0-dev.84
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/mixins.js +5 -0
- package/src/components/VabUpload/view.vue +4 -0
- package/src/components/baseAttachment/index.vue +1 -0
- package/src/components/baseAttachment/mixins.js +17 -0
- package/src/components/baseAttachment/showList.vue +12 -2
- package/src/components/baseAttachment/uploadDialog.vue +2 -1
- package/src/components/hiprint/hiprint.bundle.js +5 -1
- package/src/components/table/vxeFilter/mixin.js +326 -326
- package/src/components/xform/form-designer/form-widget/field-widget/baseAttachment-widget.vue +7 -0
- package/src/components/xform/form-designer/form-widget/field-widget/vabUpload-widget.vue +1 -0
- package/src/components/xform/form-designer/form-widget/field-widget/vabUpload2-widget.vue +186 -153
- package/src/components/xform/form-designer/setting-panel/property-editor/field-vabUpload/field-vabUpload-editor.vue +22 -9
- package/src/components/xform/form-designer/setting-panel/property-editor/field-vabUpload2/field-vabUpload2-editor.vue +13 -0
- package/src/components/xform/form-designer/setting-panel/property-editor/showDownloadButton-editor.vue +29 -0
- package/src/components/xform/form-designer/setting-panel/propertyRegister.js +1 -0
- package/src/components/xform/form-designer/widget-panel/widgetsConfig.js +3 -0
- package/src/components/xform/form-render/container-item/data-table-item.vue +1 -0
- package/src/components/xform/form-render/container-item/data-table-mixin.js +116 -0
- package/src/microRouter/index.js +5 -0
- package/src/store/modules/permission.js +2 -0
package/package.json
CHANGED
|
@@ -95,6 +95,7 @@
|
|
|
95
95
|
</div>
|
|
96
96
|
<div class="el-icon-tagEdit" v-if="attachment.h5 !== 1">
|
|
97
97
|
<el-tooltip
|
|
98
|
+
v-if="showDownloadButton"
|
|
98
99
|
class="item"
|
|
99
100
|
effect="dark"
|
|
100
101
|
:content="$t2('下载', 'system.button.download')"
|
|
@@ -226,6 +227,9 @@ export default {
|
|
|
226
227
|
ElImageViewer: () => import("./image-viewer"),
|
|
227
228
|
},
|
|
228
229
|
computed: {
|
|
230
|
+
showDownloadButton() {
|
|
231
|
+
return this.showDownload !== false && this.showDownload !== "false";
|
|
232
|
+
},
|
|
229
233
|
classList() {
|
|
230
234
|
// 'upload-img': this.dataType || (this.$attrs.hideInfo == true || this.$attrs.hideInfo == 'true')
|
|
231
235
|
let arr = [];
|
|
@@ -27,6 +27,7 @@
|
|
|
27
27
|
</template>
|
|
28
28
|
<uploadDialog v-if="showUploadDialog" :visiable.sync="showUploadDialog"
|
|
29
29
|
:rows.sync="rows" :title="title" :edit="edit" :param.sync="option.uploadConfig"
|
|
30
|
+
:showDownload="showDownloadButton"
|
|
30
31
|
:onConfirm="confirmInsertAttachment"/>
|
|
31
32
|
</template>
|
|
32
33
|
</span>
|
|
@@ -47,6 +47,11 @@ indexMixin = {
|
|
|
47
47
|
showViewButton() {
|
|
48
48
|
return this.option && this.option.showViewButton !== false ? true : false;
|
|
49
49
|
},
|
|
50
|
+
/* 未传或非 false 时显示下载按钮 */
|
|
51
|
+
showDownloadButton() {
|
|
52
|
+
let value = this.option && this.option.showDownloadButton;
|
|
53
|
+
return value !== false && value !== "false";
|
|
54
|
+
},
|
|
50
55
|
fileServerPreviewEnabled(){
|
|
51
56
|
return this.getFileServerPreviewEnabled();
|
|
52
57
|
},
|
|
@@ -269,6 +274,11 @@ uploadDialogMixin = {
|
|
|
269
274
|
type: Boolean,
|
|
270
275
|
default: false,
|
|
271
276
|
},
|
|
277
|
+
/* 附件弹窗里的下载按钮,默认显示 */
|
|
278
|
+
showDownload: {
|
|
279
|
+
type: Boolean,
|
|
280
|
+
default: true,
|
|
281
|
+
},
|
|
272
282
|
title: {
|
|
273
283
|
type: String,
|
|
274
284
|
default: () => this.$t2("凭证信息", "components.baseAttachment.title"),
|
|
@@ -283,6 +293,13 @@ uploadDialogMixin = {
|
|
|
283
293
|
},
|
|
284
294
|
mounted() {
|
|
285
295
|
},
|
|
296
|
+
computed: {
|
|
297
|
+
resolvedShowDownload() {
|
|
298
|
+
if (this.showDownload === false) return false;
|
|
299
|
+
let configValue = this.param && this.param.showDownload;
|
|
300
|
+
return configValue !== false && configValue !== "false";
|
|
301
|
+
},
|
|
302
|
+
},
|
|
286
303
|
data() {
|
|
287
304
|
var that = this;
|
|
288
305
|
return {
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
{{ attachment.name }}
|
|
15
15
|
</a>
|
|
16
16
|
</el-tooltip>
|
|
17
|
-
<el-tooltip class="item" effect="dark" :content="$t2('下载', 'system.button.preview')" placement="top"
|
|
17
|
+
<el-tooltip v-if="showDownloadButton" class="item" effect="dark" :content="$t2('下载', 'system.button.preview')" placement="top"
|
|
18
18
|
:enterable="false">
|
|
19
19
|
<a
|
|
20
20
|
href="javascript:void(0);"
|
|
@@ -34,7 +34,17 @@
|
|
|
34
34
|
export default {
|
|
35
35
|
name: "attachmentShowList",
|
|
36
36
|
props: {
|
|
37
|
-
rows: Array
|
|
37
|
+
rows: Array,
|
|
38
|
+
/* 未传或非 false 时显示下载按钮 */
|
|
39
|
+
showDownload: {
|
|
40
|
+
type: [Boolean, String],
|
|
41
|
+
default: true
|
|
42
|
+
}
|
|
43
|
+
},
|
|
44
|
+
computed: {
|
|
45
|
+
showDownloadButton() {
|
|
46
|
+
return this.showDownload !== false && this.showDownload !== "false";
|
|
47
|
+
}
|
|
38
48
|
}
|
|
39
49
|
}
|
|
40
50
|
</script>
|
|
@@ -15,7 +15,8 @@
|
|
|
15
15
|
>
|
|
16
16
|
<div id="containt">
|
|
17
17
|
<div class="detail-wrap" style="height: 450px;padding: 10px 10px;">
|
|
18
|
-
<baseUpload v-if="showUpload" v-bind="option" :file.sync="checkRows" :edit="edit"
|
|
18
|
+
<baseUpload v-if="showUpload" v-bind="option" :file.sync="checkRows" :edit="edit"
|
|
19
|
+
:showDownload="resolvedShowDownload" multi="true"></baseUpload>
|
|
19
20
|
</div>
|
|
20
21
|
</div>
|
|
21
22
|
<span slot="footer" class="dialog-footer">
|
|
@@ -8920,7 +8920,11 @@ var hiprint = function (t) {
|
|
|
8920
8920
|
}, t.prototype.getPrintStyle = function () {
|
|
8921
8921
|
return " <style printStyle>\n @page\n {\n border:0;\n padding:0cm;\n margin:0cm;\n " + this.getPrintSizeStyle() + "\n }\n </style>\n";
|
|
8922
8922
|
}, t.prototype.getPrintSizeStyle = function () {
|
|
8923
|
-
|
|
8923
|
+
if (this.paperType) {
|
|
8924
|
+
return "size:" + this.paperType + " " + (this.height > this.width ? "portrait" : "landscape") + ";";
|
|
8925
|
+
}
|
|
8926
|
+
// 自定义纸张由最终宽高决定方向;长度值不能与 portrait/landscape 混用。
|
|
8927
|
+
return "size: " + this.width + "mm " + this.height + "mm;";
|
|
8924
8928
|
}, t.prototype.deletePrintElement = function (t) {
|
|
8925
8929
|
var e = this;
|
|
8926
8930
|
this.printElements.filter(function (n, i) {
|