Merge branch 'dev' into pr@dev_memory_component

2022-11-29 14:59:54 +08:00 · 2022-11-29 14:59:54 +08:00 · 66bf0a50a8
commit 66bf0a50a8
parent 077222f141 a90c4aa424
18 changed files with 116 additions and 58 deletions
--- a/frontend/src/api/dataset/dataset.js
+++ b/frontend/src/api/dataset/dataset.js
@ -185,7 +185,7 @@ export function multFieldValues(data) {
  return request({
    url: '/dataset/field/multFieldValues',
    method: 'post',
-    loading: true,
+    loading: false,
    data
  })
 }
@ -241,6 +241,7 @@ export function checkCustomDs() {
    loading: true
  })
 }
+
 export function exportExcel(data) {
  return request({
    url: '/dataset/taskLog/export',
@ -268,4 +269,5 @@ export function exportDataset(data) {
    responseType: 'blob'
  })
 }
+
 export default { loadTable, getScene, addGroup, delGroup, addTable, delTable, groupTree, checkCustomDs, exportDataset }
--- a/frontend/src/components/canvas/components/editor/EditBar.vue
+++ b/frontend/src/components/canvas/components/editor/EditBar.vue
@ -137,7 +137,7 @@
          :target="curComponent.hyperlinks.openMode "
          :href="curComponent.hyperlinks.content "
        >
-          <i class="icon iconfont icon-com-jump" />
+          <i class="icon iconfont icon-com-jump"/>
        </a>
      </span>

@ -243,6 +243,7 @@ export default {
  },
  data() {
    return {
+      systemOS: 'Mac',
      maxImageSize: 15000000,
      boardSetVisible: false,
      linkJumpSetVisible: false,
@ -362,6 +363,9 @@ export default {
    ])
  },
  mounted() {
+    if (navigator.platform.indexOf('Mac') == -1) {
+      this.systemOS = 'Other'
+    }
    this.initCurFields()
    if (this.element.type === 'view') {
      bus.$on('initCurFields-' + this.element.id, this.initCurFields)
--- a/frontend/src/components/canvas/components/editor/SettingMenu.vue
+++ b/frontend/src/components/canvas/components/editor/SettingMenu.vue
@ -17,7 +17,8 @@
            v-if="curComponent.type != 'custom-button'"
            icon="el-icon-document-copy"
            @click.native="copy"
-          >{{ $t('panel.copy') }}
+          ><span>{{ $t('panel.copy') }}(<span v-show="systemOS==='Mac'"><i class="icon iconfont icon-command"
+          />+ D</span> <span v-show="systemOS!=='Mac'">Control + D</span>)</span>
          </el-dropdown-item>
          <el-dropdown-item
            icon="el-icon-delete"
@ -162,6 +163,7 @@ export default {
  components: { CustomTabsSort, HyperlinksDialog },
  data() {
    return {
+      systemOS: 'Mac',
      showCustomSort: false,
      jumpExcludeViewType: [
        'richTextView',
@ -207,6 +209,11 @@ export default {
      'componentData'
    ])
  },
+  mounted() {
+    if (navigator.platform.indexOf('Mac') == -1) {
+      this.systemOS = 'Other'
+    }
+  },
  methods: {
    openCustomSort() {
      this.showCustomSort = true
--- a/frontend/src/components/canvas/customComponent/DeRichText.vue
+++ b/frontend/src/components/canvas/customComponent/DeRichText.vue
@ -18,8 +18,8 @@

 <script>
 import tinymce from 'tinymce/tinymce' // tinymce默认hidden，不引入不显示
-import Editor from '@tinymce/tinymce-vue'// 编辑器引入
-import 'tinymce/themes/silver/theme'// 编辑器主题
+import Editor from '@tinymce/tinymce-vue' // 编辑器引入
+import 'tinymce/themes/silver/theme' // 编辑器主题
 import 'tinymce/icons/default' // 引入编辑器图标icon，不引入则不显示对应图标
 // 引入编辑器插件（基本免费插件都在这儿了）
 import 'tinymce/plugins/advlist' // 高级列表
@ -29,9 +29,9 @@ import 'tinymce/plugins/image' // 插入编辑图片
 import 'tinymce/plugins/lists' // 列表插件
 import 'tinymce/plugins/charmap' // 特殊字符
 import 'tinymce/plugins/media' // 插入编辑媒体
-import 'tinymce/plugins/wordcount'// 字数统计
-import 'tinymce/plugins/table'// 表格
-import 'tinymce/plugins/contextmenu'// contextmenu
+import 'tinymce/plugins/wordcount' // 字数统计
+import 'tinymce/plugins/table' // 表格
+import 'tinymce/plugins/contextmenu' // contextmenu
 import 'tinymce/plugins/directionality'
 import 'tinymce/plugins/nonbreaking'
 import 'tinymce/plugins/pagebreak'
@ -173,34 +173,43 @@ export default {
 .rich-main-class {
  width: 100%;
  height: 100%;
-  overflow-y: auto!important;
+  overflow-y: auto !important;
  position: relative;
 }
+
 ::-webkit-scrollbar {
-  width: 0px!important;
-  height: 0px!important;
+  width: 0px !important;
+  height: 0px !important;
 }
+
 ::v-deep ol {
-  display: block!important;
+  display: block !important;
  list-style-type: decimal;
-  margin-block-start: 1em!important;
-  margin-block-end: 1em!important;
-  margin-inline-start: 0px!important;
-  margin-inline-end: 0px!important;
-  padding-inline-start: 40px!important;
+  margin-block-start: 1em !important;
+  margin-block-end: 1em !important;
+  margin-inline-start: 0px !important;
+  margin-inline-end: 0px !important;
+  padding-inline-start: 40px !important;
 }
+
 ::v-deep ul {
-  display: block!important;
+  display: block !important;
  list-style-type: disc;
-  margin-block-start: 1em!important;
-  margin-block-end: 1em!important;
-  margin-inline-start: 0px!important;
-  margin-inline-end: 0px!important;
-  padding-inline-start: 40px!important;
+  margin-block-start: 1em !important;
+  margin-block-end: 1em !important;
+  margin-inline-start: 0px !important;
+  margin-inline-end: 0px !important;
+  padding-inline-start: 40px !important;
 }
+
 ::v-deep li {
-  display: list-item!important;
-  text-align: -webkit-match-parent!important;
+  display: list-item !important;
+  text-align: -webkit-match-parent !important;
+}
+
+::v-deep p {
+  margin: 0px;
+  padding: 0px;
 }
 </style>

--- a/frontend/src/components/canvas/customComponent/DeRichTextView.vue
+++ b/frontend/src/components/canvas/customComponent/DeRichTextView.vue
@ -18,8 +18,8 @@

 <script>
 import tinymce from 'tinymce/tinymce' // tinymce默认hidden，不引入不显示
-import Editor from '@tinymce/tinymce-vue'// 编辑器引入
-import 'tinymce/themes/silver/theme'// 编辑器主题
+import Editor from '@tinymce/tinymce-vue' // 编辑器引入
+import 'tinymce/themes/silver/theme' // 编辑器主题
 import 'tinymce/icons/default' // 引入编辑器图标icon，不引入则不显示对应图标
 // 引入编辑器插件（基本免费插件都在这儿了）
 import 'tinymce/plugins/advlist' // 高级列表
@ -29,9 +29,9 @@ import 'tinymce/plugins/image' // 插入编辑图片
 import 'tinymce/plugins/lists' // 列表插件
 import 'tinymce/plugins/charmap' // 特殊字符
 import 'tinymce/plugins/media' // 插入编辑媒体
-import 'tinymce/plugins/wordcount'// 字数统计
-import 'tinymce/plugins/table'// 表格
-import 'tinymce/plugins/contextmenu'// contextmenu
+import 'tinymce/plugins/wordcount' // 字数统计
+import 'tinymce/plugins/table' // 表格
+import 'tinymce/plugins/contextmenu' // contextmenu
 import 'tinymce/plugins/directionality'
 import 'tinymce/plugins/nonbreaking'
 import 'tinymce/plugins/pagebreak'
@ -272,5 +272,10 @@ export default {
 ::v-deep .base-selected {
  background-color: #b4d7ff
 }
+
+::v-deep p {
+  margin: 0px;
+  padding: 0px;
+}
 </style>

--- a/frontend/src/components/canvas/customComponent/UserView.vue
+++ b/frontend/src/components/canvas/customComponent/UserView.vue
@ -861,6 +861,7 @@ export default {
      tableChart.customStyle = JSON.parse(this.chart.customStyle)
      tableChart.customAttr.color.tableHeaderBgColor = '#f8f8f9'
      tableChart.customAttr.color.tableItemBgColor = '#ffffff'
+      tableChart.customAttr.color.tableHeaderFontColor = '#7c7e81'
      tableChart.customAttr.color.tableFontColor = '#7c7e81'
      tableChart.customAttr.color.tableStripe = true
      tableChart.customStyle.text.show = false
--- a/frontend/src/components/canvas/utils/shortcutKey.js
+++ b/frontend/src/components/canvas/utils/shortcutKey.js
@ -15,7 +15,7 @@ const bKey = 66 // 拆分

 const lKey = 76 // 锁定

-const dKey = 68 // 删除
+const dKey = 68 // 复制并粘贴

 const deleteKey = 46 // 删除

@ -39,7 +39,7 @@ const unlockMap = {
  [xKey]: cut,
  [gKey]: compose,
  [bKey]: decompose,
-  [dKey]: deleteComponent,
+  [dKey]: copyAndPast,
  [deleteKey]: deleteComponent,
  [lKey]: lock,
  [sKey]: save,
@ -56,7 +56,7 @@ export function listenGlobalKeyDown() {
    if (keyCode === ctrlKey || keyCode === commandKey) {
      isCtrlOrCommandDown = true
    } else if (isCtrlOrCommandDown) {
-      if (keyCode === zKey || keyCode === yKey || keyCode === cKey || keyCode === sKey || keyCode === enlargeKey) {
+      if (keyCode === zKey || keyCode === yKey || keyCode === dKey || keyCode === sKey || keyCode === enlargeKey) {
        e.preventDefault()
        unlockMap[keyCode]()
      }
@ -125,6 +125,14 @@ function decompose() {
  }
 }

+function copyAndPast() {
+  if (store.state.curComponent) {
+    store.commit('copy')
+    store.commit('paste', false)
+    store.commit('recordSnapshot', 'copyAndPast')
+  }
+}
+
 function deleteComponent() {
  if (store.state.curComponent) {
    store.commit('deleteComponent')
--- a/frontend/src/components/deDrag/index.vue
+++ b/frontend/src/components/deDrag/index.vue
@ -65,7 +65,7 @@
        @mousedown.stop.prevent="handleDown(handlei, $event)"
        @touchstart.stop.prevent="handleTouchDown(handlei, $event)"
      >
-        <slot :name="handlei" />
+        <slot :name="handlei"/>
      </div>
      <div
        :id="componentCanvasId"
@ -78,7 +78,7 @@
          class="svg-background"
          :icon-class="mainSlotSvgInner"
        />
-        <slot />
+        <slot/>
      </div>
    </div>
  </div>
@ -588,7 +588,7 @@ export default {
          return 'auto'
        }
      }
-      if (this.element.auxiliaryMatrix) {
+      if (this.element.auxiliaryMatrix && this.curCanvasScaleSelf) {
        const width = Math.round(this.width / this.curCanvasScaleSelf.matrixStyleWidth) * this.curCanvasScaleSelf.matrixStyleWidth
        return (width - this.curGap * 2) + 'px'
      } else {
@ -602,7 +602,7 @@ export default {
          return 'auto'
        }
      }
-      if (this.element.auxiliaryMatrix) {
+      if (this.element.auxiliaryMatrix && this.curCanvasScaleSelf) {
        const height = Math.round(this.height / this.curCanvasScaleSelf.matrixStyleHeight) * this.curCanvasScaleSelf.matrixStyleHeight
        return (height - this.curGap * 2) + 'px'
      } else {
--- a/frontend/src/store/index.js
+++ b/frontend/src/store/index.js
@ -569,7 +569,7 @@ const data = {
      // 移动端布局转换
      state.componentData.forEach(item => {
        item.mobileStyle = (item.mobileStyle || BASE_MOBILE_STYLE)
-        if (item.mobileSelected) {
+        if (item.mobileSelected || item.canvasId !== 'canvas-main') {
          item.style.width = item.mobileStyle.style.width
          item.style.height = item.mobileStyle.style.height
          item.style.top = item.mobileStyle.style.top
--- a/frontend/src/styles/deicon/demo_index.html
+++ b/frontend/src/styles/deicon/demo_index.html
@ -54,6 +54,12 @@
      <div class="content unicode" style="display: block;">
          <ul class="icon_lists dib-box">
          
+            <li class="dib">
+              <span class="icon iconfont">&#xe644;</span>
+                <div class="name">command</div>
+                <div class="code-name">&amp;#xe644;</div>
+              </li>
+          
            <li class="dib">
              <span class="icon iconfont">&#xe63d;</span>
                <div class="name">font</div>
@ -804,9 +810,9 @@
 <pre><code class="language-css"
 >@font-face {
  font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1669087400468') format('woff2'),
-       url('iconfont.woff?t=1669087400468') format('woff'),
-       url('iconfont.ttf?t=1669087400468') format('truetype');
+  src: url('iconfont.woff2?t=1669699377636') format('woff2'),
+       url('iconfont.woff?t=1669699377636') format('woff'),
+       url('iconfont.ttf?t=1669699377636') format('truetype');
 }
 </code></pre>
          <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@ -832,6 +838,15 @@
      <div class="content font-class">
        <ul class="icon_lists dib-box">
          
+          <li class="dib">
+            <span class="icon iconfont icon-command"></span>
+            <div class="name">
+              command
+            </div>
+            <div class="code-name">.icon-command
+            </div>
+          </li>
+          
          <li class="dib">
            <span class="icon iconfont icon-font"></span>
            <div class="name">
@ -1957,6 +1972,14 @@
      <div class="content symbol">
          <ul class="icon_lists dib-box">
          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-command"></use>
+                </svg>
+                <div class="name">command</div>
+                <div class="code-name">#icon-command</div>
+            </li>
+          
            <li class="dib">
                <svg class="icon svg-icon" aria-hidden="true">
                  <use xlink:href="#icon-font"></use>
--- a/frontend/src/styles/deicon/iconfont.css
+++ b/frontend/src/styles/deicon/iconfont.css
@ -1,8 +1,8 @@
@font-face {
  font-family: "iconfont"; /* Project id 2459092 */
-  src: url('iconfont.woff2?t=1669087400468') format('woff2'),
-       url('iconfont.woff?t=1669087400468') format('woff'),
-       url('iconfont.ttf?t=1669087400468') format('truetype');
+  src: url('iconfont.woff2?t=1669699377636') format('woff2'),
+       url('iconfont.woff?t=1669699377636') format('woff'),
+       url('iconfont.ttf?t=1669699377636') format('truetype');
 }

 .iconfont {
@ -13,6 +13,10 @@
  -moz-osx-font-smoothing: grayscale;
 }

+.icon-command:before {
+  content: "\e644";
+}
+
 .icon-font:before {
  content: "\e63d";
 }
--- a/frontend/src/styles/deicon/iconfont.js
+++ b/frontend/src/styles/deicon/iconfont.js
--- a/frontend/src/styles/deicon/iconfont.json
+++ b/frontend/src/styles/deicon/iconfont.json
@ -5,6 +5,13 @@
  "css_prefix_text": "icon-",
  "description": "",
  "glyphs": [
+    {
+      "icon_id": "1567487",
+      "name": "command",
+      "font_class": "command",
+      "unicode": "e644",
+      "unicode_decimal": 58948
+    },
    {
      "icon_id": "109745",
      "name": "font",
--- a/frontend/src/styles/deicon/iconfont.ttf
+++ b/frontend/src/styles/deicon/iconfont.ttf
--- a/frontend/src/styles/deicon/iconfont.woff
+++ b/frontend/src/styles/deicon/iconfont.woff
--- a/frontend/src/styles/deicon/iconfont.woff2
+++ b/frontend/src/styles/deicon/iconfont.woff2
--- a/frontend/src/views/chart/components/ChartComponentG2.vue
+++ b/frontend/src/views/chart/components/ChartComponentG2.vue
@ -202,7 +202,7 @@ export default {
      })
    },
    checkSelected(param) {
-      return (this.linkageActiveParam.name.indexOf(param.name) > -1) &&
+      return (this.linkageActiveParam.name === param.name || (this.linkageActiveParam.name === 'NO_DATA' && !param.name)) &&
        (this.linkageActiveParam.category === param.category)
    },
    preDraw() {
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@ -798,7 +798,6 @@ export default {
  },
  created() {
    listenGlobalKeyDown()
-    document.addEventListener('paste', this.passFromClipboard)
  },
  mounted() {
    this.initWatermark()
@ -815,10 +814,7 @@ export default {
    this.init(this.$store.state.panel.panelInfo.id)
  },
  beforeDestroy() {
-    document.removeEventListener('paste', this.passFromClipboard)
    bus.$off('component-on-drag', this.componentOnDrag)
-    // bus.$off('component-dialog-edit', this.editDialog)
-    // bus.$off('button-dialog-edit', this.editButtonDialog)
    bus.$off('component-dialog-style', this.componentDialogStyle)
    bus.$off('previewFullScreenClose', this.previewFullScreenClose)
    bus.$off('change_panel_right_draw', this.changeRightDrawOpen)
@ -829,14 +825,6 @@ export default {
    elx && elx.remove()
  },
  methods: {
-    passFromClipboard(event) {
-      // 获取解析 粘贴的文本
-      const text = (event.clipboardData || window.clipboardData).getData('text')
-      if (text && text.includes('datease-component-')) {
-        event.preventDefault()
-        this.$store.commit('passFromClipboard', text.replace('datease-component-', ''))
-      }
-    },
    initWatermark() {
      if (this.panelInfo.watermarkInfo) {
        userLoginInfo().then(res => {