Merge branch 'dev' of github.com:dataease/dataease into dev

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

@@ -53,6 +53,7 @@ export default {
       }
       // 加载视图数据
       initPanelData(this.panelId, function() {
+        this.dataLoading = false
         // 如果含有跳转参数 进行触发
         const tempParam = localStorage.getItem('jumpInfoParam')
         if (tempParam) {

frontend/src/components/widget/DeWidget/DeDate.vue

@@ -158,7 +158,6 @@ export default {
         this.element.options.manualModify = true
       }
       this.setCondition()
-      this.styleChange()
     },
     formatFilterValue() {
       if (this.values === null) return []
@@ -184,9 +183,6 @@ export default {
         return timeSection(parseFloat(value), this.element.options.attrs.type)
       }
     },
-    styleChange() {
-      this.$store.commit('recordStyleChange')
-    },
     fillValueDerfault() {
       const defaultV = this.element.options.value === null ? '' : this.element.options.value.toString()
       if (this.element.options.attrs.type === 'daterange') {

frontend/src/components/widget/DeWidget/DeNumberRange.vue

@@ -185,7 +185,6 @@ export default {
           }
 
           this.setCondition()
-          this.$store.commit('recordStyleChange')
         })
       })
     },
@@ -219,9 +218,6 @@ export default {
         return
       }
     },
-    styleChange() {
-      this.$store.commit('recordStyleChange')
-    },
 
     inputChange(val) {
       if (!this.inDraw) {

frontend/src/components/widget/DeWidget/DeSelect.vue

@@ -168,7 +168,6 @@ export default {
         this.element.options.manualModify = true
       }
       this.setCondition()
-      this.styleChange()
       this.showNumber = false
 
       this.$nextTick(() => {
@@ -207,9 +206,6 @@ export default {
         return defaultV.split(',')[0]
       }
     },
-    styleChange() {
-      this.$store.commit('recordStyleChange')
-    },
     optionDatas(datas) {
       if (!datas) return null
       return datas.filter(item => !!item).map(item => {

frontend/src/components/widget/DeWidget/DeSelectGrid.vue

@@ -196,7 +196,6 @@ export default {
         this.element.options.manualModify = true
       }
       this.setCondition()
-      this.styleChange()
     },
 
     setCondition() {
@@ -222,10 +221,6 @@ export default {
         return defaultV.split(',')[0]
       }
     },
-
-    styleChange() {
-      this.$store.commit('recordStyleChange')
-    },
     optionDatas(datas) {
       if (!datas) return null
       return datas.filter(item => !!item).map(item => {

frontend/src/lang/en.js

@@ -1814,6 +1814,7 @@ export default {
     welcome_title: 'Welcome To Use DataEase',
     welcome_hint: 'Open source data visual analysis tool available to everyone',
     demo_video: 'Demo',
+    quick_start: 'Quick Start',
     online_document: 'Online',
     latest_developments: 'Latest',
     teaching_video: 'Teaching',
@@ -1822,9 +1823,9 @@ export default {
     demo_video_hint: 'How to make a DataEase dashboard in 3 minutes and share it with others',
     online_document_hint: 'It covers the installation steps, user manuals, tutorials, solutions to common problems, and secondary development of DataEase',
     teaching_video_bottom_hint: 'More videos',
-    enterprise_edition_hint1: 'Provide enterprise application scenario x-pack enhancement package',
+    enterprise_edition_hint1: 'Provide enterprise application scenario X-Pack enhancement package',
     enterprise_edition_hint2: 'Provide high-level original factory service support',
-    enterprise_edition_hint3: 'Provide dataease O & M security best practices',
+    enterprise_edition_hint3: 'Provide DateEase best practice recommendations',
     open_source_community: 'Open source community',
     click_show: 'Click To View',
     show_more: 'Show More',

frontend/src/lang/tw.js

@@ -465,7 +465,7 @@ export default {
     display: '顯示設置',
     ldap: 'LDAP設置',
     oidc: 'OIDC設置',
-    theme: '主题设置'
+    theme: '主題設置'
   },
   license: {
     i18n_no_license_record: '沒有 License 記錄',
@@ -1016,7 +1016,7 @@ export default {
     filter_exp: '過濾值',
     filter_type: '過濾方式',
     filter_value_can_not_str: '數值類型字段過濾值不能包含文本',
-    enum_value_can_not_null: '字段枚舉值不能为空'
+    enum_value_can_not_null: '字段枚舉值不能為空'
   },
   dataset: {
     sheet_warn: '有多個 Sheet 頁，默認抽取第一個',
@@ -1460,7 +1460,7 @@ export default {
     linkage: '聯動',
     jump: '跳轉',
     cancel_linkage: '取消聯動',
-    switch_picture: '更换图片',
+    switch_picture: '更換圖片',
     remove_all_linkage: '清除所有聯動',
     exit_un_march_linkage_field: '存在未匹配聯動關繫的字段',
     details: '詳情',
@@ -1549,7 +1549,7 @@ export default {
     themeLight: '淺色',
     themeDark: '深色',
     themeCustom: '自定義',
-    openHomePage: '显示首页'
+    openHomePage: '顯示首頁'
 
   },
   auth: {
@@ -1823,23 +1823,24 @@ export default {
     welcome_title: '歡迎使用DataEase',
     welcome_hint: '人人可用的開源數據可視化分析工具',
     demo_video: '演示視頻',
+    quick_start: '快速入門',
     online_document: '在線文檔',
     latest_developments: '最新動態',
     teaching_video: '教學視頻',
     enterprise_edition: '企業版',
-    contact_us: '聯系我們',
+    contact_us: '聯繫我們',
-    demo_video_hint: '如何3分鐘製作一個DataEase 數據看板、並分享給他人',
+    demo_video_hint: '如何3分鐘製作一個DataEase 數據看闆、並分享給他人',
     online_document_hint: '涵蓋DataEase的安裝步驟、用戶手冊、使用教程、常見問題的解決方案、以及二次開發等',
     teaching_video_bottom_hint: '更多視頻資料',
-    enterprise_edition_hint1: '提供企業級應用場景X-Pack增強包',
+    enterprise_edition_hint1: '提供企業級應用場景 X-Pack 增強包',
     enterprise_edition_hint2: '提供高等級原廠服務支持',
-    enterprise_edition_hint3: '提供DataEase 運維安全最佳實踐',
+    enterprise_edition_hint3: '提供 DataEase 最佳實踐建議',
     open_source_community: '開源社區',
     click_show: '點擊查看',
     show_more: '查看更多',
     click_inner: '點擊進入',
-    email: '邮箱：',
+    email: '郵箱：',
-    tel: '电话：',
+    tel: '電話：',
-    web: '网址：'
+    web: '網址：'
   }
 }

frontend/src/lang/zh.js

@@ -1833,6 +1833,7 @@ export default {
     welcome_title: '欢迎使用DataEase',
     welcome_hint: '人人可用的开源数据可视化分析工具',
     demo_video: '演示视频',
+    quick_start: '快速入门',
     online_document: '在线文档',
     latest_developments: '最新动态',
     teaching_video: '教学视频',
@@ -1841,9 +1842,9 @@ export default {
     demo_video_hint: '如何3分钟制作一个DataEase 数据看板、并分享给他人',
     online_document_hint: '涵盖DataEase的安装步骤、用户手册、使用教程、常见问题的解决方案、以及二次开发等',
     teaching_video_bottom_hint: '更多视频资料',
-    enterprise_edition_hint1: '提供企业级应用场景X-Pack增强包',
+    enterprise_edition_hint1: '提供企业级应用场景 X-Pack 增强包',
     enterprise_edition_hint2: '提供高等级原厂服务支持',
-    enterprise_edition_hint3: '提供DataEase 运维安全最佳实践',
+    enterprise_edition_hint3: '提供 DataEase 最佳实践建议',
     open_source_community: '开源社区',
     click_show: '点击查看',
     show_more: '查看更多',

frontend/src/views/wizard/details/CardDetail.vue

@@ -61,7 +61,7 @@ export default {
   }
   .demo_content{
     margin: auto;
-    padding-left: 15px;
+    padding-left: 8px;
     height: 100%;
     overflow: hidden;
     .head{
@@ -71,7 +71,7 @@ export default {
     .content{
       height: 50%;
       padding-top: 15px;
-      padding-right: 10px;
+      padding-right: 3px;
       color: var(--TextPrimary, #6D6D6D);
       font-size: 12px;
       overflow-y: auto;

frontend/src/views/wizard/index.vue

@@ -32,7 +32,7 @@ export default {
     return {
       cardList: [
         {
-          head: this.$t('wizard.demo_video'),
+          head: this.$t('wizard.quick_start'),
           content: this.$t('wizard.demo_video_hint'),
           bottom: '',
           href: 'https://www.bilibili.com/video/BV1UB4y1K7jA',
@@ -54,7 +54,7 @@ export default {
         },
         {
           head: this.$t('wizard.teaching_video'),
-          content: '<a href="https://www.bilibili.com/video/BV1pb4y1E7Zg?spm_id_from=333.999.0.0" target="_blank"><span style="line-height: 30px">【DataEase教学视频】视图钻取 </span></a><br><a href="https://www.bilibili.com/video/BV1Xq4y187H9?spm_id_from=333.999.0.0" target="_blank">【DataEase教学视频】移动端布局设置</a>',
+          content: '<a href="https://www.bilibili.com/video/BV1pb4y1E7Zg?spm_id_from=333.999.0.0" target="_blank">【DataEase教学视频】视图钻取</a><br><a href="https://www.bilibili.com/video/BV1rm4y1f7a7?spm_id_from=333.999.0.0" target="_blank">【DataEase教学视频】视图组件联动</a><br><a href="https://www.bilibili.com/video/BV1Xq4y187H9?spm_id_from=333.999.0.0" target="_blank">【DataEase教学视频】移动端布局设置</a>',
           bottom: '',
           href: 'https://space.bilibili.com/510493147/channel/collectiondetail?sid=150431',
           component: 'CardDetail'