Merge pull request #924 from dataease/v1.3

V1.3
2021-10-13 14:20:39 +08:00 · 2021-10-13 14:20:39 +08:00 · b49f186b7b
commit b49f186b7b
parent 3c5d05f344 e0b3e6a2c1
10 changed files with 72 additions and 20 deletions
--- a/backend/src/main/resources/db/migration/V14__area_code.sql
+++ b/backend/src/main/resources/db/migration/V14__area_code.sql
@ -0,0 +1,10 @@
+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 '省名称',
+  `province_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '省代码',
+  `city_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '市名称',
+  `city_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '市代码',
+  `county_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '县名称',
+  `county_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '县代码',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci;
--- a/backend/src/main/resources/db/migration/V18__add_demo.sql
+++ b/backend/src/main/resources/db/migration/V18__add_demo.sql
@ -230,6 +230,7 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- ----------------------------
 -- Table structure for demo_new_trend_of_diagnosis
 -- ----------------------------
+DROP TABLE IF EXISTS `demo_new_trend_of_diagnosis`;
 CREATE TABLE `demo_new_trend_of_diagnosis` (
                                               `date` varchar(50) NOT NULL DEFAULT '' COMMENT '日期',
                                               `new_diagnosis` bigint(13) DEFAULT NULL COMMENT '新增确诊',
--- a/frontend/src/components/canvas/index.vue
+++ b/frontend/src/components/canvas/index.vue
@ -35,7 +35,7 @@ import Toolbar from '@/components/Toolbar'
 import { deepCopy } from '@/utils/utils'
 import { mapState } from 'vuex'
 import generateID from '@/utils/generateID'
-import { listenGlobalKeyDown } from '@/utils/shortcutKey'
+// import { listenGlobalKeyDown } from '@/utils/shortcutKey'

 export default {
  // eslint-disable-next-line vue/no-unused-components
--- a/frontend/src/components/widget/DeWidget/DeSelect.vue
+++ b/frontend/src/components/widget/DeWidget/DeSelect.vue
@ -22,7 +22,7 @@
 </template>

 <script>
-
+import { fieldValues } from '@/api/dataset/dataset'
 export default {

  props: {
@ -68,6 +68,11 @@ export default {
  },
  created() {
    this.options = this.element.options
+    if (this.options.attrs.fieldId) {
+      fieldValues(this.options.attrs.fieldId).then(res => {
+        this.options.attrs.datas = this.optionDatas(res.data)
+      })
+    }

    // this.setCondition()
  },
@ -105,9 +110,19 @@ export default {
    },
    styleChange() {
      this.$store.commit('recordStyleChange')
+    },
+    optionDatas(datas) {
+      if (!datas) return null
+      return datas.filter(item => !!item).map(item => {
+        return {
+          id: item,
+          text: item
+        }
+      })
    }

  }
+
 }
 </script>

--- a/frontend/src/components/widget/DeWidget/DeSelectGrid.vue
+++ b/frontend/src/components/widget/DeWidget/DeSelectGrid.vue
@ -42,7 +42,7 @@
 </template>

 <script>
-
+import { fieldValues } from '@/api/dataset/dataset'
 export default {

  props: {
@ -114,9 +114,16 @@ export default {
  },
  created() {
    this.options = this.element.options
-    this.setMutiBox()
-    this.setRadioBox()
-    // this.setCondition()
+    if (this.options.attrs.fieldId) {
+      fieldValues(this.options.attrs.fieldId).then(res => {
+        this.options.attrs.datas = this.optionDatas(res.data)
+        this.setMutiBox()
+        this.setRadioBox()
+      })
+    } else {
+      this.setMutiBox()
+      this.setRadioBox()
+    }
  },
  mounted() {
    // this.$nextTick(() => {
@ -212,6 +219,15 @@ export default {
    // },
    styleChange() {
      this.$store.commit('recordStyleChange')
+    },
+    optionDatas(datas) {
+      if (!datas) return null
+      return datas.filter(item => !!item).map(item => {
+        return {
+          id: item,
+          text: item
+        }
+      })
    }

  }
--- a/frontend/src/layout/components/Topbar.vue
+++ b/frontend/src/layout/components/Topbar.vue
@ -35,10 +35,11 @@
      </template>

      <el-dropdown class="top-dropdown" style="display: flex;align-items: center; width:100px;" trigger="click">
-        <span class="el-dropdown-link" style="color: var(--TopTextColor);font-size: 14px;max-width: 80px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
-          {{ name }}
-          <i class="el-icon-arrow-down el-icon--right" />
-        </span>
+        <div class="el-dropdown-link" style="display: flex;color: var(--TopTextColor);font-size: 14px; width:100%;">
+
+          <span style="max-width:80px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;">{{ name }}</span>
+          <span><i class="el-icon-arrow-down el-icon--right" /></span>
+        </div>
        <el-dropdown-menu slot="dropdown">
          <router-link to="/person-info/index">
            <el-dropdown-item>{{ $t('commons.personal_info') }}</el-dropdown-item>
--- a/frontend/src/views/panel/GrantAuth/shareTree.vue
+++ b/frontend/src/views/panel/GrantAuth/shareTree.vue
@ -21,6 +21,7 @@
 import { loadTree } from '@/api/panel/share'
 import { uuid } from 'vue-uuid'
 import { get } from '@/api/panel/panel'
+import bus from '@/utils/bus'
 export default {
  name: 'ShareTree',
  props: {
@ -59,6 +60,7 @@ export default {
        this.$store.commit('setCanvasStyle', JSON.parse(response.data.panelStyle))

        this.$store.dispatch('panel/setPanelInfo', data)
+        bus.$emit('set-panel-is-share')
      })
    },
    resetID(data) {
--- a/frontend/src/views/panel/SubjectSetting/PreSubject/SubjectTemplateItem.vue
+++ b/frontend/src/views/panel/SubjectSetting/PreSubject/SubjectTemplateItem.vue
@ -47,7 +47,7 @@

    </div>
    <div style="position: absolute; left: 0px; right: 0px; bottom: 0px; height: 30px;" @dblclick="setEdit">
-      <div style=" background-color:#f7f8fa;color:#3d4d66;font-size:12px;height: 30px; line-height: 30px; text-align: center; white-space: pre; text-overflow: ellipsis; margin-left: 1px; margin-right: 1px;">
+      <div style=" background-color:#f7f8fa;color:#3d4d66;font-size:12px;height: 30px; line-height: 30px; text-align: center; white-space: pre; text-overflow: ellipsis; margin-left: 1px; margin-right: 1px;overflow: hidden">
        <el-input
          v-if="canEdit"
          ref="nameInput"
@ -55,7 +55,7 @@
          size="mini"
          @blur="loseFocus()"
        />
-        <span v-if="!canEdit" style="margin-top: 8px">{{ subjectItem.name }}</span>
+        <span v-if="!canEdit" style="margin-top: 8px" :title="subjectItem.name">{{ subjectItem.name }}</span>
      </div>
    </div>
  </div>
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@ -95,6 +95,7 @@
        </el-drawer>

        <div
+          v-if="!previewVisible"
          id="canvasInfo"
          :class="{'style-hidden':canvasStyleData.selfAdaption}"
          class="content this_canvas"
@ -103,8 +104,9 @@
          @dragover="handleDragOver"
          @mousedown="handleMouseDown"
          @mouseup="deselectCurComponent"
+          @scroll="canvasScroll"
        >
-          <Editor v-if="!previewVisible" ref="canvasEditor" :out-style="outStyle" @canvasScroll="canvasScroll" />
+          <Editor ref="canvasEditor" :out-style="outStyle" />
        </div>
      </de-main-container>
      <!--      <de-aside-container v-if="aidedButtonActive" :class="aidedButtonActive ? 'show' : 'hidden'" class="style-aside">-->
@ -160,7 +162,7 @@
    <input id="input" ref="files" type="file" accept="image/*" hidden @click="e => {e.target.value = '';}" @change="handleFileChange">

    <!--矩形样式组件-->
-    <RectangleAttr v-if="curComponent&&curComponent.type==='rect-shape'" :scroll-left="scrollLeft" :scroll-top="scrollTop" />
+    <RectangleAttr v-if="curComponent&&(curComponent.type==='rect-shape'||curComponent.type==='de-tabs')" :scroll-left="scrollLeft" :scroll-top="scrollTop" />
    <TextAttr v-if="curComponent&&curComponent.type==='v-text'" :scroll-left="scrollLeft" :scroll-top="scrollTop" />
    <FilterTextAttr v-if="curComponent&&curComponent.type==='custom'&&curComponent.options.attrs.title" :scroll-left="scrollLeft" :scroll-top="scrollTop" />
    <!--复用ChartGroup组件 不做显示-->
@ -187,7 +189,7 @@ import bus from '@/utils/bus'
 import Editor from '@/components/canvas/components/Editor/index'
 import { deepCopy } from '@/components/canvas/utils/utils'
 import componentList from '@/components/canvas/custom-component/component-list' // 左侧列表数据
-import { listenGlobalKeyDown } from '@/components/canvas/utils/shortcutKey'
+// import { listenGlobalKeyDown } from '@/components/canvas/utils/shortcutKey'
 import { mapState } from 'vuex'
 import { uuid } from 'vue-uuid'
 import Toolbar from '@/components/canvas/components/Toolbar'
@ -344,7 +346,7 @@ export default {
    this.init(this.$store.state.panel.panelInfo.id)
    // this.restore()
    // 全局监听按键事件
-    listenGlobalKeyDown()
+    // listenGlobalKeyDown()

    this.$store.commit('setCurComponent', { component: null, index: null })
    this.$store.commit('clearLinkageSettingInfo', false)
@ -653,7 +655,8 @@ export default {
          const canvasHeight = document.getElementById('canvasInfo').offsetHeight
          const canvasWidth = document.getElementById('canvasInfo').offsetWidth
          this.outStyle.height = canvasHeight
-          this.outStyle.width = canvasWidth
+          // 临时处理 确保每次restore 有会更新
+          this.outStyle.width = canvasWidth + (Math.random() * 0.000001)
          // console.log(canvasHeight + '--' + canvasWidth)
        })
      }
--- a/frontend/src/views/panel/list/PanelViewShow.vue
+++ b/frontend/src/views/panel/list/PanelViewShow.vue
@ -38,13 +38,13 @@
              </el-tooltip>
            </span>

-            <span v-if="!hasStar && panelInfo" style="float: right;margin-right: 10px">
+            <span v-if="!hasStar && panelInfo && !isShare" style="float: right;margin-right: 10px">
              <el-tooltip :content="$t('panel.store')">
                <el-button class="el-icon-star-off" size="mini" circle @click="star" />
              </el-tooltip>
            </span>

-            <span v-if="hasStar && panelInfo" style="float: right;margin-right: 10px">
+            <span v-if="hasStar && panelInfo && !isShare" style="float: right;margin-right: 10px">
              <el-tooltip :content="$t('commons.cancel')">
                <el-button class="el-icon-star-on" size="mini" circle @click="unstar" />
              </el-tooltip>
@ -131,7 +131,8 @@ export default {
      hasStar: false,
      fullscreen: false,
      pdfExportShow: false,
-      snapshotInfo: ''
+      snapshotInfo: '',
+      isShare: false
    }
  },
  computed: {
@ -162,6 +163,9 @@ export default {
    }
  },
  mounted() {
+    bus.$on('set-panel-is-share', () => {
+      this.isShare = true
+    })
    this.initPdfTemplate()
  },
  methods: {