Merge branch 'v1.4' of github.com:dataease/dataease into v1.4

frontend/src/components/DeDrag/index.vue

@@ -1603,7 +1603,7 @@ export default {
       style.height = height
       style.rotate = this.rotate
       // this.hasMove = true
-      // console.log('recordMatrixCurShadowStyle:t1:' + t1 + ';mw:' + this.curCanvasScale.matrixStyleWidth + ';width:' + width)
+      console.log('recordMatrixCurShadowStyle:t1:' + JSON.stringify(style))
 
       this.$store.commit('setShapeStyle', style)
 

frontend/src/components/canvas/components/Editor/index.vue

@@ -51,7 +51,7 @@
       @onResizing="onResizing"
       @elementMouseDown="containerMouseDown"
       @amRemoveItem="removeItem(item._dragId)"
-      @amAddItme="addItemBox(item)"
+      @amAddItem="addItemBox(item)"
       @linkJumpSet="linkJumpSet(item)"
     >
       <!--      <span style="position:relative;left: 0px;top:0px">-->
@@ -338,6 +338,7 @@ function recalcCellWidth() {
 }
 
 function init() {
+  console.log('init')
   this.cellWidth = this.baseWidth + this.baseMarginLeft
   this.cellHeight = this.baseHeight + this.baseMarginTop
   this.yourList = this.getList()
@@ -357,7 +358,6 @@ function init() {
   recalcCellWidth.call(this)
 
   resetPositionBox.call(this)
-
   let i = 0
   // console.log('initList:' + JSON.stringify(vm.yourList))
   const timeid = setInterval(function() {
@@ -376,6 +376,7 @@ function init() {
 }
 
 function resizePlayer(item, newSize) {
+  // console.log('resizePlayer')
   const vm = this
   removeItemFromPositionBox(item)
 
@@ -424,6 +425,7 @@ function resizePlayer(item, newSize) {
  * @param {any} position
  */
 function checkItemPosition(item, position) {
+  // console.log('checkItemPosition-info' + JSON.stringify(item))
   position = position || {}
   position.x = position.x || item.x
   position.y = position.y || item.y
@@ -469,6 +471,7 @@ function checkItemPosition(item, position) {
  * @param {any} position
  */
 function movePlayer(item, position) {
+  // console.log('movePlayer')
   const vm = this
   removeItemFromPositionBox(item)
 
@@ -483,7 +486,7 @@ function movePlayer(item, position) {
 
   item.x = position.x
   item.y = position.y
-
+  // console.log('checkItemPosition3')
   checkItemPosition.call(this, item, position)
 
   emptyTargetCell.call(this, item)
@@ -520,11 +523,13 @@ function removeItem(index) {
 }
 
 function addItem(item, index) {
+  // console.log('addItem')
   if (index < 0) {
     index = this.yourList.length
   }
   item._dragId = index
 
+  // console.log('checkItemPosition4')
   checkItemPosition.call(this, item, {
     x: item.x,
     y: item.y
@@ -652,6 +657,7 @@ function changeItemCoord(item) {
  * @param {any} item
  */
 function emptyTargetCell(item) {
+  // console.log('emptyTargetCell')
   const vm = this
   const belowItems = findBelowItems(item)
 
@@ -708,6 +714,7 @@ function moveItemDown(item, size) {
     y: item.y + size
   }
   setPlayerPosition.call(this, item, targetPosition)
+  // console.log('checkItemPosition1')
   checkItemPosition.call(this, item, targetPosition)
 
   addItemToPositionBox.call(this, item)
@@ -1458,6 +1465,7 @@ export default {
       infoBox.oldSizeY = item.sizey
     },
     onMouseUp(e) {
+      // console.log('onMouseUp')
       const vm = this
       if (_.isEmpty(vm.infoBox)) return
       if (vm.infoBox.cloneItem) {
@@ -1626,6 +1634,7 @@ export default {
       }, 100)
     },
     addItemBox(item) {
+      // console.log('addItemBox:' + JSON.stringify(item))
       this.yourList.push(item)
 
       this.$nextTick(function() {

frontend/src/components/canvas/store/copy.js

@@ -3,6 +3,7 @@ import toast from '@/components/canvas/utils/toast'
 import generateID from '@/components/canvas/utils/generateID'
 import { deepCopy } from '@/components/canvas/utils/utils'
 import { chartCopy } from '@/api/chart/chart'
+import { uuid } from 'vue-uuid'
 
 export default {
   state: {
@@ -46,11 +47,14 @@ export default {
       if (data.type === 'view') {
         chartCopy(data.propValue.viewId).then(res => {
           const newView = deepCopy(data)
+          newView.id = uuid.v1()
           newView.propValue.viewId = res.data
           store.commit('addComponent', { component: newView })
         })
       } else {
-        store.commit('addComponent', { component: deepCopy(data) })
+        const newCop = deepCopy(data)
+        newCop.id = uuid.v1()
+        store.commit('addComponent', { component: newCop })
       }
       if (state.isCut) {
         state.copyData = null

frontend/src/lang/en.js

@@ -953,7 +953,8 @@ export default {
     table_page_size: 'Page Size',
     table_page_size_unit: 'Item/Page',
     result_count: 'Result',
-    result_mode_all: 'ALL'
+    result_mode_all: 'ALL',
+    splitCount_less_100: 'Split Count Range 0-100'
   },
   dataset: {
     sheet_warn: 'There are multiple sheet pages, and the first one is extracted by default',

frontend/src/lang/tw.js

@@ -954,7 +954,8 @@ export default {
     table_page_size: '分頁',
     table_page_size_unit: '條/頁',
     result_count: '結果展示',
-    result_mode_all: '全部'
+    result_mode_all: '全部',
+    splitCount_less_100: '刻度數範圍0-100'
   },
   dataset: {
     sheet_warn: '有多個 Sheet 頁，默認抽取第一個',

frontend/src/lang/zh.js

@@ -957,7 +957,8 @@ export default {
     table_page_size: '分页',
     table_page_size_unit: '条/页',
     result_count: '结果展示',
-    result_mode_all: '全部'
+    result_mode_all: '全部',
+    splitCount_less_100: '刻度数范围0-100'
   },
   dataset: {
     sheet_warn: '有多个 Sheet 页，默认抽取第一个',

frontend/src/styles/index.scss

@@ -676,3 +676,11 @@ div:focus {
 }
 
 
+.el-color-svpanel__black {
+  background: linear-gradient(to top, #000, rgba(0,0,0,0)) !important;
+}
+
+.el-color-svpanel__white {
+  background: linear-gradient(to right, #fff, rgba(255,255,255,0)) !important;
+}
+

frontend/src/views/chart/components/component-style/XAxisSelectorAntV.vue

@@ -160,6 +160,13 @@ export default {
       if (!this.axisForm.show) {
         this.isSetting = false
       }
+      if (this.axisForm.axisValue.splitCount && (parseInt(this.axisForm.axisValue.splitCount) > 100 || parseInt(this.axisForm.axisValue.splitCount) < 0)) {
+        this.$message({
+          message: this.$t('chart.splitCount_less_100'),
+          type: 'error'
+        })
+        return
+      }
       this.$emit('onChangeXAxisForm', this.axisForm)
     }
   }

frontend/src/views/chart/components/component-style/YAxisExtSelectorAntV.vue

@@ -163,6 +163,13 @@ export default {
       if (!this.axisForm.show) {
         this.isSetting = false
       }
+      if (this.axisForm.axisValue.splitCount && (parseInt(this.axisForm.axisValue.splitCount) > 100 || parseInt(this.axisForm.axisValue.splitCount) < 0)) {
+        this.$message({
+          message: this.$t('chart.splitCount_less_100'),
+          type: 'error'
+        })
+        return
+      }
       this.$emit('onChangeYAxisForm', this.axisForm)
     }
   }

frontend/src/views/chart/components/component-style/YAxisSelectorAntV.vue

@@ -171,6 +171,13 @@ export default {
       if (!this.axisForm.show) {
         this.isSetting = false
       }
+      if (this.axisForm.axisValue.splitCount && (parseInt(this.axisForm.axisValue.splitCount) > 100 || parseInt(this.axisForm.axisValue.splitCount) < 0)) {
+        this.$message({
+          message: this.$t('chart.splitCount_less_100'),
+          type: 'error'
+        })
+        return
+      }
       this.$emit('onChangeYAxisForm', this.axisForm)
     }
   }

frontend/src/views/panel/LinkJumpSet/index.vue

@@ -26,7 +26,7 @@
               <span @click.stop>
                 <div>
                   <span class="auth-span">
-                    <el-checkbox v-model="data.checked" @change="sourceFieldCheckedChange(data)"/>
+                    <el-checkbox v-model="data.checked" @change="sourceFieldCheckedChange(data)" />
                   </span>
                 </div>
               </span>
@@ -88,7 +88,10 @@
                           :label="item.name"
                           :value="item.id"
                         >
-                          <span style="float: left; color: #8492a6; font-size: 12px">{{ item.name }}</span>
+                          <span style="float: left">
+                            <svg-icon :icon-class="item.type" style="width: 14px;height: 14px" />
+                          </span>
+                          <span style="float: left; font-size: 12px"> {{ item.name }}</span>
                         </el-option>
                       </el-select>
                     </div>
@@ -108,7 +111,7 @@
                             <svg-icon v-if="viewField.deType === 2 || viewField.value === 3" icon-class="field_value" class="field-icon-value" />
                             <svg-icon v-if="viewField.deType === 5" icon-class="field_location" class="field-icon-location" />
                           </span>
-                          <span style="float: left; color: #8492a6; font-size: 12px">{{ viewField.name }}</span>
+                          <span style="float: left;font-size: 12px">{{ viewField.name }}</span>
                         </el-option>
                       </el-select>
                     </div>

frontend/src/views/panel/edit/index.vue

@@ -218,7 +218,7 @@ import generateID from '@/components/canvas/utils/generateID'
 import RectangleAttr from '@/components/canvas/components/RectangleAttr'
 import TextAttr from '@/components/canvas/components/TextAttr'
 import FilterTextAttr from '@/components/canvas/components/FilterTextAttr'
-import {queryPanelJumpInfo} from "@/api/panel/linkJump";
+import { queryPanelJumpInfo } from '@/api/panel/linkJump'
 
 export default {
   name: 'PanelEdit',
@@ -560,6 +560,11 @@ export default {
           this.currentFilterCom.style.top = (this.dragComponentInfo.y - 1) * this.curCanvasScale.matrixStyleOriginHeight
           this.currentFilterCom.style.width = this.dragComponentInfo.sizex * this.curCanvasScale.matrixStyleOriginWidth
           this.currentFilterCom.style.height = this.dragComponentInfo.sizey * this.curCanvasScale.matrixStyleOriginHeight
+        } else {
+          this.currentFilterCom.style.left = this.dragComponentInfo.shadowStyle.x
+          this.currentFilterCom.style.top = this.dragComponentInfo.shadowStyle.y
+          this.currentFilterCom.style.width = this.dragComponentInfo.style.width
+          this.currentFilterCom.style.height = this.dragComponentInfo.style.height
         }
         this.currentFilterCom.id = newComponentId
         this.currentFilterCom.auxiliaryMatrix = this.canvasStyleData.auxiliaryMatrix
@@ -808,7 +813,7 @@ export default {
       }
     },
     canvasScroll(event) {
-      console.log('testTop' + event.target.scrollTop)
+      // console.log('testTop' + event.target.scrollTop)
       this.scrollLeft = event.target.scrollLeft
       this.scrollTop = event.target.scrollTop
     },