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

2021-11-04 11:59:28 +08:00 · 2021-11-04 11:59:28 +08:00 · 0b45a14e2e
commit 0b45a14e2e
parent 73c95317a1 46cd212853
15 changed files with 69 additions and 22 deletions
--- a/frontend/src/components/DeDrag/index.vue
+++ b/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:' + JSON.stringify(style))
+      // console.log('recordMatrixCurShadowStyle:t1:' + JSON.stringify(style))

      this.$store.commit('setShapeStyle', style)

--- a/frontend/src/components/canvas/components/Editor/Preview.vue
+++ b/frontend/src/components/canvas/components/Editor/Preview.vue
@ -175,7 +175,11 @@ export default {
      this.timer && clearInterval(this.timer)
      let refreshTime = 300000
      if (this.canvasStyleData.refreshTime && this.canvasStyleData.refreshTime > 0) {
-        refreshTime = this.canvasStyleData.refreshTime * 60000
+        if (this.canvasStyleData.refreshUnit === 'second') {
+          refreshTime = this.canvasStyleData.refreshTime * 1000
+        } else {
+          refreshTime = this.canvasStyleData.refreshTime * 60000
+        }
      }
      this.timer = setInterval(() => {
        this.searchCount++
--- a/frontend/src/components/canvas/components/Editor/index.vue
+++ b/frontend/src/components/canvas/components/Editor/index.vue
@ -1,5 +1,6 @@
 <template>
  <div
+    v-if="editShow"
    id="editor"
    class="editor"
    :class="[
@ -338,7 +339,7 @@ function recalcCellWidth() {
 }

 function init() {
-  console.log('init')
+  // console.log('init-cellWidth')
  this.cellWidth = this.baseWidth + this.baseMarginLeft
  this.cellHeight = this.baseHeight + this.baseMarginTop
  this.yourList = this.getList()
@ -943,7 +944,8 @@ export default {
      positionBoxInfoArray: [],
      yourList: [],
      linkJumpSetVisible: false,
-      linkJumpSetViewId: null
+      linkJumpSetViewId: null,
+      editShow: false
    }
  },
  computed: {
@ -993,7 +995,7 @@ export default {
      'editor',
      'linkageSettingStatus',
      'curLinkageView',
-      'snapshotIndex'
+      'doSnapshotIndex'
    ])
  },
  watch: {
@ -1035,6 +1037,7 @@ export default {
        // 初始化时componentData 加载可能出现慢的情况 此时重新初始化一下matrix
        if (newVal.length !== this.lastComponentDataLength) {
          this.lastComponentDataLength = newVal.length
+          // console.log('.initMatrix2')
          this.initMatrix()
        }
      },
@ -1047,9 +1050,10 @@ export default {
      deep: true
    },
    // 镜像索引有变化 刷新一下矩阵（撤销重做等）
-    snapshotIndex: {
+    doSnapshotIndex: {
      handler(newVal, oldVla) {
        // console.log('snapshotIndexChange:' + newVal)
+        // console.log('.initMatrix3')
        this.initMatrix()
      },
      deep: true
@ -1057,15 +1061,20 @@ export default {
  },

  mounted() {
+    setTimeout(() => {
+      this.changeScale()
+      this.editShow = true
+    }, 500)
+    // this.changeScale()
    // 获取编辑器元素
    this.$store.commit('getEditor')
    const _this = this
    // bus.$on('auxiliaryMatrixChange', this.initMatrix)
-    bus.$on('auxiliaryMatrixChange', () => {
-      _this.$nextTick(() => {
-        _this.initMatrix()
-      })
-    })
+    // bus.$on('auxiliaryMatrixChange', () => {
+    //   _this.$nextTick(() => {
+    //     _this.initMatrix()
+    //   })
+    // })
    eventBus.$on('hideArea', () => {
      this.hideArea()
    })
@ -1300,6 +1309,7 @@ export default {
        this.baseHeight = this.matrixStyle.height
        this.cellWidth = this.matrixStyle.width
        this.cellHeight = this.matrixStyle.height
+        // console.log('.initMatrix1')
        this.initMatrix()

        this.scaleWidth = this.outStyle.width * 100 / this.canvasStyleData.width
--- a/frontend/src/components/canvas/custom-component/UserView.vue
+++ b/frontend/src/components/canvas/custom-component/UserView.vue
@ -1,6 +1,6 @@
 <template>
  <div
-    v-loading="requestStatus==='waiting'"
+    v-loading="canvasStyleData.refreshViewLoading&&requestStatus==='waiting'"
    :class="[
      {
        ['active']: active
@ -211,7 +211,7 @@ export default {
    },
    // 监听外部计时器变化
    searchCount: function(val1) {
-      if (val1 > 0) {
+      if (val1 > 0 && this.requestStatus !== 'waiting') {
        this.getData(this.element.propValue.viewId)
      }
    },
--- a/frontend/src/components/canvas/store/snapshot.js
+++ b/frontend/src/components/canvas/store/snapshot.js
@ -8,13 +8,15 @@ export default {
    snapshotIndex: -1, // 快照索引
    changeTimes: -1, // 修改次数
    lastSaveSnapshotIndex: 0, // 最后保存是snapshotIndex的索引
-    styleChangeTimes: 0 // 组件样式修改次数
+    styleChangeTimes: 0, // 组件样式修改次数
+    doSnapshotIndex: -1 // snapshot undo redo 时的索引记录
  },
  mutations: {
    undo(state) {
      store.commit('setCurComponent', { component: null, index: null })
      if (state.snapshotIndex > 0) {
        state.snapshotIndex--
+        state.doSnapshotIndex = state.snapshotIndex
        store.commit('setComponentData', deepCopy(state.snapshotData[state.snapshotIndex]))
        store.commit('setCanvasStyle', deepCopy(state.snapshotStyleData[state.snapshotIndex]))
      }
@ -24,6 +26,7 @@ export default {
      store.commit('setCurComponent', { component: null, index: null })
      if (state.snapshotIndex < state.snapshotData.length - 1) {
        state.snapshotIndex++
+        state.doSnapshotIndex = state.snapshotIndex
        store.commit('setComponentData', deepCopy(state.snapshotData[state.snapshotIndex]))
        store.commit('setCanvasStyle', deepCopy(state.snapshotStyleData[state.snapshotIndex]))
      }
@ -42,6 +45,7 @@ export default {
      }
    },
    refreshSnapshot(state) {
+      // console.log('refreshSnapshot')
      // 刷新快照
      state.snapshotData = []
      state.snapshotStyleData = []
--- a/frontend/src/components/canvas/utils/style.js
+++ b/frontend/src/components/canvas/utils/style.js
@ -63,8 +63,9 @@ export function getComponentRotatedStyle(style) {

 export function colorRgb(color, opacity) {
  var reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/
-  var sColor = color.toLowerCase()
+  var sColor = color
  if (sColor && reg.test(sColor)) {
+    sColor = sColor.toLowerCase()
    if (sColor.length === 4) {
      var sColorNew = '#'
      for (var i = 1; i < 4; i += 1) {
--- a/frontend/src/components/cron/cron.vue
+++ b/frontend/src/components/cron/cron.vue
@ -126,9 +126,9 @@ export default {
        })
      }
      const v = `${this.sVal} ${this.mVal} ${this.hVal} ${this.dVal} ${this.monthVal} ${this.weekVal} ${this.yearVal}`
-      if (v !== this.value) {
-        this.$emit('input', v)
-      }
+      // if (v !== this.value) {
+      this.$emit('input', v)
+      // }
      return v
    }
  },
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@ -1239,6 +1239,7 @@ export default {
    component_gap: 'Component Gap',
    refresh_time: 'Refresh Time',
    minute: 'minute',
+    second: 'second',
    photo: 'Photo',
    default_panel: 'Default Dashboard',
    create_public_links: 'Create public links',
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@ -1242,6 +1242,7 @@ export default {
    component_gap: '組件間隙',
    refresh_time: '刷新时间',
    minute: '分钟',
+    second: '秒',
    photo: '圖片',
    default_panel: '默認儀表板',
    create_public_links: '創建公共鏈接',
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@ -1250,6 +1250,7 @@ export default {
    component_gap: '组件间隙',
    refresh_time: '刷新时间',
    minute: '分钟',
+    second: '秒',
    photo: '图片',
    default_panel: '默认仪表板',
    create_public_links: '创建公共链接',
--- a/frontend/src/views/panel/LinkJumpSet/index.vue
+++ b/frontend/src/views/panel/LinkJumpSet/index.vue
@ -65,6 +65,7 @@
                  :placeholder="$t('panel.select_jump_panel')"
                  style="margin-right: 10px"
                  @select="panelNodeClick"
+                  @input="inputVal"
                />
              </el-col>
            </el-row>
@ -309,6 +310,13 @@ export default {
      this.linkJumpInfo.targetViewInfoList = []
      this.getPanelViewList(data.id)
    },
+    inputVal(value) {
+      if (!value) {
+        this.linkJumpInfo.targetViewInfoList = []
+        this.viewIdFieldArrayMap = {}
+        this.currentLinkPanelViewArray = []
+      }
+    },
    addLinkJumpField() {
      this.linkJumpInfo.targetViewInfoList.push({
        targetViewId: '',
--- a/frontend/src/views/panel/SubjectSetting/PanelStyle/PanelRefreshTime.vue
+++ b/frontend/src/views/panel/SubjectSetting/PanelStyle/PanelRefreshTime.vue
@ -7,9 +7,18 @@
        trigger="click"
      >
        <el-col>
-          <el-form ref="colorForm" label-width="80px" size="mini">
-            <el-form-item :label="$t('panel.minute')" class="form-item form-item-slider">
-              <el-slider v-model="canvasStyleData.refreshTime" show-input :show-input-controls="false" input-size="mini" :min="1" :max="60" @change="onChangePanelStyle" />
+          <el-form ref="colorForm" label-width="110px" size="mini">
+            <el-form-item :label="'视图加载提示'" class="form-item form-item-slider">
+              <el-checkbox v-model="canvasStyleData.refreshViewLoading" @change="onChangePanelStyle" />
+            </el-form-item>
+            <el-form-item :label="'刷新时间单位'" class="form-item form-item-slider">
+              <el-radio-group v-model="canvasStyleData.refreshUnit" @change="onChangePanelStyle">
+                <el-radio label="second">秒</el-radio>
+                <el-radio label="minute">分</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item :label="'刷新时间频率'" class="form-item form-item-slider">
+              <el-slider v-model="canvasStyleData.refreshTime" show-input :show-input-controls="false" input-size="mini" :min="1" :max="3600" @change="onChangePanelStyle" />
            </el-form-item>
          </el-form>
        </el-col>
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@ -423,6 +423,8 @@ export default {
        // this.$store.commit('setComponentData', this.resetID(JSON.parse(componentDataTemp)))
        const temp = JSON.parse(canvasStyleDataTemp)
        temp.refreshTime = (temp.refreshTime || 5)
+        temp.refreshViewLoading = (temp.refreshViewLoading || false)
+        temp.refreshUnit = (temp.refreshUnit || 'minute')

        this.$store.commit('setCanvasStyle', temp)
        // 清空临时画布数据
@ -444,6 +446,8 @@ export default {
          //   this.$store.commit('setComponentData', this.resetID(JSON.parse(response.data.panelData)))
          const panelStyle = JSON.parse(response.data.panelStyle)
          panelStyle.refreshTime = (panelStyle.refreshTime || 5)
+          panelStyle.refreshViewLoading = (panelStyle.refreshViewLoading || false)
+          panelStyle.refreshUnit = (panelStyle.refreshUnit || 'minute')

          this.$store.commit('setCanvasStyle', panelStyle)
          this.$store.commit('recordSnapshot', 'init')// 记录快照
--- a/frontend/src/views/panel/list/PanelList.vue
+++ b/frontend/src/views/panel/list/PanelList.vue
@ -632,6 +632,8 @@ export default {
          //   this.$store.commit('setComponentData', sourceInfo.type === 'custom' ? sourceInfo : this.resetID(sourceInfo))
          const temp = JSON.parse(response.data.panelStyle)
          temp.refreshTime = (temp.refreshTime || 5)
+          temp.refreshViewLoading = (temp.refreshViewLoading || false)
+          temp.refreshUnit = (temp.refreshUnit || 'minute')

          this.$store.commit('setCanvasStyle', temp)
          this.$store.dispatch('panel/setPanelInfo', data)
--- a/frontend/src/views/panel/panel.js
+++ b/frontend/src/views/panel/panel.js
@ -20,7 +20,9 @@ export const CANVAS_STYLE = {
  auxiliaryMatrix: true,
  openCommonStyle: true,
  panel: DEFAULT_PANEL_STYLE,
-  refreshTime: 5 // 仪表板刷新时间 默认五分钟
+  refreshViewLoading: true, // 仪表板视图loading提示
+  refreshUnit: 'minute', // 仪表板刷新时间带外 默认 分钟
+  refreshTime: 5 // 仪表板刷新时间 默认5分钟
 }

 export const DEFAULT_COMMON_CANVAS_STYLE_STRING = {