diff --git a/jero-web/src/components/OcrTable/DocTable.vue b/jero-web/src/components/OcrTable/DocTable.vue index 3db485a60..182fe4a57 100644 --- a/jero-web/src/components/OcrTable/DocTable.vue +++ b/jero-web/src/components/OcrTable/DocTable.vue @@ -271,7 +271,7 @@ text-overflow: ellipsis; /*! autoprefixer: off */ -webkit-box-orient: vertical; - -webkit-line-clamp: 2; + -webkit-line-clamp: 1; /*! autoprefixer: on;*/ text-justify: inter-ideograph; word-break: break-all diff --git a/jero-web/src/components/OcrTable/index.vue b/jero-web/src/components/OcrTable/index.vue index 0322fdee2..1cfd56cb9 100644 --- a/jero-web/src/components/OcrTable/index.vue +++ b/jero-web/src/components/OcrTable/index.vue @@ -263,7 +263,7 @@ text-overflow: ellipsis; /*! autoprefixer: off */ -webkit-box-orient: vertical; - -webkit-line-clamp: 2; + -webkit-line-clamp: 1; /*! autoprefixer: on;*/ text-justify: inter-ideograph; word-break: break-all diff --git a/jero-web/src/components/SplitTable/DocTable.vue b/jero-web/src/components/SplitTable/DocTable.vue index 6a6861442..365347e88 100644 --- a/jero-web/src/components/SplitTable/DocTable.vue +++ b/jero-web/src/components/SplitTable/DocTable.vue @@ -268,7 +268,7 @@ text-overflow: ellipsis; /*! autoprefixer: off */ -webkit-box-orient: vertical; - -webkit-line-clamp: 2; + -webkit-line-clamp: 1; /*! autoprefixer: on;*/ text-justify: inter-ideograph; word-break: break-all diff --git a/jero-web/src/components/SplitTable/index.vue b/jero-web/src/components/SplitTable/index.vue index 6c425aa1c..269cb4ae2 100644 --- a/jero-web/src/components/SplitTable/index.vue +++ b/jero-web/src/components/SplitTable/index.vue @@ -282,7 +282,7 @@ text-overflow: ellipsis; /*! autoprefixer: off */ -webkit-box-orient: vertical; - -webkit-line-clamp: 2; + -webkit-line-clamp: 1; /*! autoprefixer: on;*/ text-justify: inter-ideograph; word-break: break-all diff --git a/jero-web/src/components/tableDate/index.vue b/jero-web/src/components/tableDate/index.vue index 1137fbc59..5b2a65c70 100644 --- a/jero-web/src/components/tableDate/index.vue +++ b/jero-web/src/components/tableDate/index.vue @@ -273,7 +273,7 @@ text-overflow: ellipsis; /*! autoprefixer: off */ -webkit-box-orient: vertical; - -webkit-line-clamp: 2; + -webkit-line-clamp: 1; /*! autoprefixer: on;*/ text-justify: inter-ideograph; word-break: break-all diff --git a/jero-web/src/mixins/tableDragResize.js b/jero-web/src/mixins/tableDragResize.js new file mode 100644 index 000000000..00a8d14c0 --- /dev/null +++ b/jero-web/src/mixins/tableDragResize.js @@ -0,0 +1,58 @@ +import Vue from "vue"; +import VueDraggableResizable from "vue-draggable-resizable"; + +Vue.component("vue-draggable-resizable", VueDraggableResizable); +function initDrag(columns) { + const draggingMap = {}; + columns.forEach(col => { + draggingMap[col.key] = col.width; + }); + const draggingState = Vue.observable(draggingMap); + return (h, props, children) => { + let thDom = null; + const { key, ...restProps } = props; + const col = columns.find(col => { + const k = col.dataIndex || col.key; + return k === key; + }); + if (!col || !col.width) { + return