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

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

@@ -35,6 +35,9 @@ export default {
   },
   created() {
     this.options = this.element.options
+    if ((this.options.attrs.type === 'date' || this.options.attrs.type === 'daterange') && Array.isArray(this.options.value) && this.options.value.length === 0) {
+      this.options.value = null
+    }
   },
   methods: {
     search() {

frontend/src/lang/en.js

@@ -1029,7 +1029,7 @@ export default {
     roleHead: 'All Role',
     userHead: 'All User',
     linkAuthHead: 'All Datasource',
-    datasetAuthHead: 'All Data',
+    datasetAuthHead: 'All Dataset',
     chartAuthHead: 'All Chart',
     panelAuthHead: 'All Chart',
     view: 'View',

frontend/src/lang/tw.js

@@ -1029,7 +1029,7 @@ export default {
     roleHead: '所有角色',
     userHead: '所有用戶',
     linkAuthHead: '所有數據源',
-    datasetAuthHead: '所有數據',
+    datasetAuthHead: '所有數據集',
     chartAuthHead: '所有視圖',
     panelAuthHead: '所有儀表板',
     view: '查看',

frontend/src/lang/zh.js

@@ -1029,7 +1029,7 @@ export default {
     roleHead: '所有角色',
     userHead: '所有用户',
     linkAuthHead: '所有数据源',
-    datasetAuthHead: '所有数据',
+    datasetAuthHead: '所有数据集',
     chartAuthHead: '所有视图',
     panelAuthHead: '所有仪表板',
     menuAuthHead: '所有菜单和操作',

frontend/src/views/chart/components/component-style/TitleSelector.vue

@@ -19,6 +19,7 @@
                 :placeholder="$t('chart.title')"
                 clearable
                 @blur="changeTitleStyle"
+                @input="inputOnInput($event)"
               />
             </el-form-item>
             <el-form-item :label="$t('chart.text_fontsize')" class="form-item">
@@ -124,6 +125,9 @@ export default {
         this.isSetting = false
       }
       this.$emit('onTextChange', this.titleForm)
+    },
+    inputOnInput: function(e) {
+      this.$forceUpdate()
     }
   }
 }

frontend/src/views/chart/group/Group.vue

@@ -202,6 +202,7 @@
         :show-close="false"
         width="70%"
         class="dialog-css"
+        :destroy-on-close="true"
       >
         <el-row style="width: 400px;">
           <el-form ref="form" :model="table" label-width="80px" size="mini" class="form-item">
@@ -544,6 +545,7 @@ export default {
 
     selectTable() {
       this.selectTableFlag = true
+      this.chartName = this.$t('chart.chartName')
     },
 
     closeCreateChart() {

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

@@ -3,7 +3,7 @@
     <el-row v-loading="slidersLoading">
       <el-col :span="2">
         <span>&nbsp;</span>
-        <ul class="direction">
+        <ul v-show="currentIndex>1" class="direction">
           <li class="left" @click="move(sliderWidth, 1, speed)">
             <svg class="icon" width="15px" height="15.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#ffffff" d="M481.233 904c8.189 0 16.379-3.124 22.628-9.372 12.496-12.497 12.496-32.759 0-45.256L166.488 512l337.373-337.373c12.496-12.497 12.496-32.758 0-45.255-12.498-12.497-32.758-12.497-45.256 0l-360 360c-12.496 12.497-12.496 32.758 0 45.255l360 360c6.249 6.249 14.439 9.373 22.628 9.373z" /></svg>
           </li>
@@ -49,7 +49,7 @@
       </el-col>
       <el-col :span="2">
         <span>&nbsp;</span>
-        <ul class="direction">
+        <ul v-show="currentIndex<sliders.length" class="direction">
           <li class="right" @click="move(sliderWidth, -1, speed)">
             <svg class="icon" width="15px" height="15.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#ffffff" d="M557.179 904c-8.189 0-16.379-3.124-22.628-9.372-12.496-12.497-12.496-32.759 0-45.256L871.924 512 534.551 174.627c-12.496-12.497-12.496-32.758 0-45.255 12.498-12.497 32.758-12.497 45.256 0l360 360c12.496 12.497 12.496 32.758 0 45.255l-360 360c-6.249 6.249-14.439 9.373-22.628 9.373z" /></svg>
           </li>
@@ -141,6 +141,7 @@ export default {
       const request = {
         details: JSON.stringify(this.canvasStyleData)
       }
+      this.slidersLoading = true
       saveSubject(request).then(response => {
         this.$message({
           message: '保存成功',
@@ -148,6 +149,8 @@ export default {
           showClose: true
         })
         this.querySubjectWithGroup()
+      }).catch(() => {
+        this.slidersLoading = false
       })
     },
     querySubjectWithGroup() {
@@ -155,6 +158,8 @@ export default {
       querySubjectWithGroup({}).then(response => {
         this.sliders = response.data
         this.slidersLoading = false
+      }).catch(() => {
+        this.slidersLoading = false
       })
     },
     move(offset, direction, speed) {

frontend/src/views/system/authority/authConfig.vue

@@ -100,7 +100,7 @@ export default {
           },
           {
             tabName: this.$t('auth.chartAuth'),
-            head: this.$t('auth.linkAuthHead'),
+            head: this.$t('auth.chartAuthHead'),
             direction: 'source',
             authType: 'chart',
             authTargets: 'dept,role,user'

frontend/src/views/system/authority/components/LazyTree.vue

@@ -266,6 +266,9 @@ export default {
         // 重新加载权限
         this.loadAuth()
         this.loading = false
+      }).catch((e) => {
+        // this.$warning(e)
+        this.loading = false
       })
     },
     // 高亮显示搜索内容