Merge pull request #917 from dataease/dev

backend/src/main/resources/db/migration/V19__area_mapping.sql

@@ -161,6 +161,7 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- ----------------------------
 -- Table structure for area_mapping
 -- ----------------------------
+DROP TABLE IF EXISTS `area_mapping`;
 CREATE TABLE `area_mapping`  (
   `id` bigint(20) NOT NULL COMMENT 'id',
   `province_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '省名称',

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

@@ -296,7 +296,7 @@ function fillPositionBox(maxY) {
 function removeItemFromPositionBox(item) {
   const pb = positionBox
   // console.log('removeItem=>x:' + item.x + ';y:' + item.y + ';sizex:' + item.sizex + ';sizey:' + item.sizey)
-  if (item.x <= 0 || item.y <= 0) return
+  if (!item || item.x <= 0 || item.y <= 0) return
   for (let i = item.x - 1; i < item.x - 1 + item.sizex; i++) {
     for (let j = item.y - 1; j < item.y - 1 + item.sizey; j++) {
       if (pb[j][i]) {
@@ -1682,7 +1682,7 @@ export default {
       }
     },
     startMoveIn() {
-      if (this.dragComponentInfo.auxiliaryMatrix) {
+      if (this.$store.state.dragComponentInfo.auxiliaryMatrix) {
         const moveInItemInfo = this.$store.state.dragComponentInfo
         this.addItemBox(moveInItemInfo)
         // console.log('startMoveIn:')

frontend/src/components/canvas/components/Toolbar.vue

@@ -12,8 +12,8 @@
       </span>
     </div>
     <div v-else class="toolbar">
-
-      <!--      <el-tooltip :content="$t('panel.new_element_distribution')">-->
+      <!--      <div class="canvas-config" style="margin-right: 10px">-->
+      <!--        <span>{{ $t('panel.new_element_distribution') }}:</span>-->
       <!--        <el-switch-->
       <!--          v-model="canvasStyleData.auxiliaryMatrix"-->
       <!--          :width="35"-->
@@ -22,19 +22,33 @@
       <!--          :active-text="$t('panel.matrix')"-->
       <!--          :inactive-text="$t('panel.suspension')"-->
       <!--        />-->
-      <!--      </el-tooltip>-->
-
-      <div class="canvas-config" style="margin-right: 10px">
-        <el-switch v-model="canvasStyleData.auxiliaryMatrix" :width="35" name="auxiliaryMatrix" />
-        <span>{{ $t('panel.matrix_design') }}</span>
-      </div>
+      <!--      </div>-->
+      <!--      <div class="canvas-config" style="margin-right: 10px" @click.stop="auxiliaryMatrixChange">-->
+      <!--        <span>{{ $t('panel.new_element_distribution.matrix_design') }}:</span>-->
+      <!--        <span v-if="curComponent.auxiliaryMatrix">-->
+      <!--          <i class="icon iconfont icon-shujujuzhen" />-->
+      <!--          {{ $t('panel.matrix_design') }}-->
+      <!--        </span>-->
+      <!--        <span v-if="!curComponent.auxiliaryMatrix">-->
+      <!--          <i class="icon iconfont icon-xuanfuanniu" />-->
+      <!--          {{ $t('panel.suspension') }}-->
+      <!--        </span>-->
+      <!--      </div>-->
       <!--      <div class="canvas-config" style="margin-right: 10px">-->
       <!--        <span> {{ $t('panel.canvas_scale') }} </span>-->
       <!--        <input v-model="scale" @input="handleScaleChange"> %-->
       <!--      </div>-->
 
+      <el-tooltip v-if="!canvasStyleData.auxiliaryMatrix" :content="$t('panel.new_element_distribution')+':'+$t('panel.suspension')">
+        <el-button class="icon iconfont-tb icon-xuanfuanniu" size="mini" circle @click="auxiliaryMatrixChange" />
+      </el-tooltip>
+      <el-tooltip v-if="canvasStyleData.auxiliaryMatrix" :content="$t('panel.new_element_distribution')+':'+$t('panel.matrix')">
+        <el-button class="icon iconfont-tb icon-shujujuzhen" size="mini" circle @click="auxiliaryMatrixChange" />
+      </el-tooltip>
+
       <el-tooltip :content="$t('panel.style')">
-        <el-button :class="styleButtonActive?'button-show':'button-closed'" class="el-icon-magic-stick" size="mini" circle @click="showPanel" />
+        <el-button class="el-icon-magic-stick" size="mini" circle @click="showPanel" />
+        <!--        <el-button :class="styleButtonActive?'button-show':'button-closed'" class="el-icon-magic-stick" size="mini" circle @click="showPanel" />-->
       </el-tooltip>
 
       <!--      <el-tooltip v-if="!aidedButtonActive" :content="$t('panel.open_aided_design') ">-->
@@ -372,6 +386,9 @@ export default {
     },
     cancelLinkageSettingStatus() {
       this.$store.commit('clearLinkageSettingInfo')
+    },
+    auxiliaryMatrixChange() {
+      this.canvasStyleData.auxiliaryMatrix = !this.canvasStyleData.auxiliaryMatrix
     }
   }
 }
@@ -382,7 +399,7 @@ export default {
     float: right;
     height: 35px;
     line-height: 35px;
-    min-width: 500px;
+    min-width: 400px;
     /*background: #fff;*/
     /*border-bottom: 1px solid #ddd;*/
 
@@ -390,7 +407,6 @@ export default {
       display: inline-block;
       margin-left: 10px;
       font-size: 14px;
-      color: #606266;
 
       input {
         width: 50px;
@@ -398,7 +414,6 @@ export default {
         outline: none;
         padding: 0 5px;
         border: 1px solid #ddd;
-        color: #606266;
       }
 
       span {
@@ -413,7 +428,7 @@ export default {
       cursor: pointer;
       background: #FFF;
       border: 1px solid #DCDFE6;
-      color: #606266;
+      color: var(--TextPrimary, #606266);
       -webkit-appearance: none;
       text-align: center;
       box-sizing: border-box;
@@ -460,4 +475,12 @@ export default {
     margin-bottom: 2px;
   }
 
+  .iconfont-tb {
+    font-family: "iconfont" !important;
+    font-size: 12px;
+    font-style: normal;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+  }
+
 </style>

frontend/src/components/canvas/index.vue

@@ -55,7 +55,7 @@ export default {
   created() {
     this.restore()
     // 全局监听按键事件
-    listenGlobalKeyDown()
+    // listenGlobalKeyDown()
   },
   methods: {
     restore() {

frontend/src/lang/tw.js

@@ -1320,7 +1320,7 @@ export default {
     no_drill_field: '缺少關聯字段',
     matrix: '矩阵',
     suspension: '悬浮',
-    new_element_distribution: '新元素分布方式',
+    new_element_distribution: '当前元素移入分布方式',
     subject_no_edit: '系统主题不能修改',
     subject_name_not_null: '主题名称需要1~20字符'
   },

frontend/src/lang/zh.js

@@ -1325,7 +1325,7 @@ export default {
     no_drill_field: '缺少关联字段',
     matrix: '矩阵',
     suspension: '悬浮',
-    new_element_distribution: '新元素分布方式',
+    new_element_distribution: '当前元素移入分布方式',
     subject_no_edit: '系统主题不能修改',
     subject_name_not_null: '主题名称需要1~20字符'
   },

frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue

@@ -12,7 +12,7 @@
       <el-col :span="20">
         <el-row id="slider">
           <div class="window">
-            <ul class="container" :style="containerStyle">
+            <ul v-if="!slidersLoading" class="container" :style="containerStyle">
               <li>
                 <div style="width:240px; height: 208px;overflow: hidden">
                   <subject-template-item
@@ -156,6 +156,7 @@ export default {
     querySubjectWithGroup() {
       this.slidersLoading = true
       querySubjectWithGroup({}).then(response => {
+        this.sliders = []
         this.sliders = response.data
         this.slidersLoading = false
       }).catch(() => {

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

@@ -104,7 +104,7 @@
           @mousedown="handleMouseDown"
           @mouseup="deselectCurComponent"
         >
-          <Editor ref="canvasEditor" v-if="!previewVisible" :out-style="outStyle" @canvasScroll="canvasScroll" />
+          <Editor v-if="!previewVisible" ref="canvasEditor" :out-style="outStyle" @canvasScroll="canvasScroll" />
         </div>
       </de-main-container>
       <!--      <de-aside-container v-if="aidedButtonActive" :class="aidedButtonActive ? 'show' : 'hidden'" class="style-aside">-->
@@ -455,7 +455,9 @@ export default {
       const self = evt.target.closest('.el-drawer__wrapper')
       // 点击样式按钮 排除
       const stick = evt.target.closest('.el-icon-magic-stick')
-      if (!parent && !self && !stick) {
+      const xuanfuanniu = evt.target.closest('.icon-xuanfuanniu')
+      const shujujuzhen = evt.target.closest('.icon-shujujuzhen')
+      if (!parent && !self && !stick && !xuanfuanniu && !shujujuzhen) {
         this.show = false
         window.removeEventListener('click', this.closeSidebar)
         this.showIndex = -1

frontend/src/views/panel/list/PanelList.vue

@@ -798,11 +798,11 @@ export default {
 }
 </script>
 
-<style scoped>
+<style lang='scss' scoped>
   .header-title {
     font-size: 14px;
     flex: 1;
-    color: #606266;
+    color: var(--TextPrimary, #606266);
     font-weight: bold;
     display: block;
     height: 100%;