dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4427 from dataease/dev

Browse Source 
merge dev
This commit is contained in:
xuwei-fit2cloud 2023-01-31 15:51:50 +08:00 committed by GitHub
commit 53e7ffafe1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/sync2gitee.yml vendored Normal file
View File

@ -0,0 +1,16 @@
name: sync2gitee
on: [push]
jobs:
repo-sync:
runs-on: ubuntu-latest
steps:
- name: Mirror the Github organization repos to Gitee.
uses: Yikun/hub-mirror-action@master
with:
src: 'github/dataease'
dst: 'gitee/fit2cloud-feizhiyun'
dst_key: ${{ secrets.GITEE_PRIVATE_KEY }}
dst_token: ${{ secrets.GITEE_TOKEN }}
static_list: "DataEase"
force_update: true

5
frontend/src/components/canvas/components/Toolbar.vue
View File

@ -154,7 +154,7 @@
/>
</el-dropdown-item>
<el-dropdown-item>
<el-dropdown-item v-if="showPdfPageButton">
<span>
<svg-icon
style="width: 16px; height: 16px;"
@ -286,7 +286,8 @@ export default {
scale: '100%',
timer: null,
changes: 0,
closePanelVisible: false
closePanelVisible: false,
showPdfPageButton: false
}
},
computed: {

4
frontend/src/components/canvas/components/editor/EditBar.vue
View File

@ -346,10 +346,10 @@ export default {
return this.targetLinkageInfo[this.element.propValue.viewId]
},
miniHeight() {
return this.mobileLayoutStatus ? 1 : 4
return this.mobileLayoutStatus ? 1 : 1
},
miniWidth() {
return this.mobileLayoutStatus ? 1 : 4
return this.mobileLayoutStatus ? 1 : 1
},
curCanvasScaleSelf() {
return this.curCanvasScaleMap[this.canvasId]

9
frontend/src/components/deDrag/index.vue
View File

@ -630,7 +630,8 @@ export default {
}
if (this.element.auxiliaryMatrix && this.curCanvasScaleSelf) {
const height = Math.round(this.height / this.curCanvasScaleSelf.matrixStyleHeight) * this.curCanvasScaleSelf.matrixStyleHeight
return (height - this.curGap * 2) + 'px'
const hp = (height - this.curGap * 2)
return (hp > 3 ? hp : 3) + 'px'
} else {
return (this.height - this.curGap * 2) + 'px'
}
@ -682,14 +683,14 @@ export default {
return (this.canvasStyleData.panel.gap === 'yes' && this.element.auxiliaryMatrix) ? this.componentGap : 0
},
miniWidth() {
return this.element.auxiliaryMatrix ? this.curCanvasScaleSelf.matrixStyleWidth * (this.mobileLayoutStatus ? 1 : 4) : 0
return this.element.auxiliaryMatrix ? this.curCanvasScaleSelf.matrixStyleWidth * (this.mobileLayoutStatus ? 1 : 1) : 0
},
miniHeight() {
if (this.element.auxiliaryMatrix) {
if (this.element.component === 'de-number-range') {
return this.element.auxiliaryMatrix ? this.curCanvasScaleSelf.matrixStyleHeight * (this.mobileLayoutStatus ? 1 : 4) : 0
return this.element.auxiliaryMatrix ? this.curCanvasScaleSelf.matrixStyleHeight * (this.mobileLayoutStatus ? 1 : 1) : 0
} else {
return this.element.auxiliaryMatrix ? this.curCanvasScaleSelf.matrixStyleHeight * (this.mobileLayoutStatus ? 1 : 4) : 0
return this.element.auxiliaryMatrix ? this.curCanvasScaleSelf.matrixStyleHeight * (this.mobileLayoutStatus ? 1 : 1) : 0
}
} else {
return 0