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

backend/src/main/resources/i18n/messages_en_US.properties

@@ -116,3 +116,4 @@ i18n_rp_exist=Row permission of the same type already exists
 i18n_field_name_repeat=Field name can't repeat
 i18n_calc_field_error=Field expression error
 i18n_cp_exist=Column permission of the same type already exists
+connection_failed=Connection Failed
\ No newline at end of file

backend/src/main/resources/i18n/messages_zh_CN.properties

@@ -115,3 +115,4 @@ i18n_rp_exist=已有同类型的行权限存在
 i18n_field_name_repeat=字段名不能重复
 i18n_calc_field_error=字段表达式语法错误
 i18n_cp_exist=已有同类型的列权限存在
+connection_failed=连接失败

backend/src/main/resources/i18n/messages_zh_TW.properties

@@ -116,3 +116,4 @@ i18n_rp_exist=已有同類型的行權限存在
 i18n_field_name_repeat=字段名不能重復
 i18n_calc_field_error=字段表達式語法錯誤
 i18n_cp_exist=已有同類型的列權限存在
+connection_failed=連接失敗

frontend/src/components/DeDrag/index.vue

@@ -539,6 +539,20 @@ export default {
     curGap() {
       return (this.canvasStyleData.panel.gap === 'yes' && this.element.auxiliaryMatrix) ? this.componentGap : 0
     },
+    miniWidth() {
+      return this.element.auxiliaryMatrix ? this.curCanvasScale.matrixStyleWidth * (this.element.miniSizex || 1) : 0
+    },
+    miniHeight() {
+      if (this.element.auxiliaryMatrix) {
+        if (this.element.component === 'de-number-range') {
+          return this.element.auxiliaryMatrix ? this.curCanvasScale.matrixStyleHeight * (this.element.miniSizey || 2) : 0
+        } else {
+          return this.element.auxiliaryMatrix ? this.curCanvasScale.matrixStyleHeight * (this.element.miniSizey || 1) : 0
+        }
+      } else {
+        return 0
+      }
+    },
     ...mapState([
       'editor',
       'curCanvasScale',
@@ -1190,8 +1204,10 @@ export default {
         newH = restrictToBounds(newH, 0, this.parentHeight)
       }
       // 外部传参限制大小
-      newW = restrictToBounds(newW, this.minW || 0, this.maxW)
-      newH = restrictToBounds(newH, this.minH || 0, this.maxH)
+      // newW = restrictToBounds(newW, this.minW || 0, this.maxW)
+      // newH = restrictToBounds(newH, this.minH || 0, this.maxH)
+      newW = restrictToBounds(newW, this.miniWidth || 0, this.maxW)
+      newH = restrictToBounds(newH, this.miniHeight || 0, this.maxH)
       // 纵横比
       if (this.lockAspectRatio) {
         // console.log(this.lockAspectRatio, this.aspectFactor)

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

@@ -102,6 +102,16 @@ export default {
     linkageInfo() {
       return this.targetLinkageInfo[this.element.propValue.viewId]
     },
+    miniHeight() {
+      let miniHeight = this.curComponent.miniSizey || 1
+      if (this.element.component === 'de-number-range') {
+        miniHeight = this.curComponent.miniSizey || 2
+      }
+      return miniHeight
+    },
+    miniWidth() {
+      return this.curComponent.miniSizex || 1
+    },
     ...mapState([
       'menuTop',
       'menuLeft',
@@ -146,6 +156,8 @@ export default {
         this.curComponent.y = Math.round(this.curComponent.style.top / this.curCanvasScale.matrixStyleOriginHeight) + 1
         this.curComponent.sizex = Math.round(this.curComponent.style.width / this.curCanvasScale.matrixStyleOriginWidth)
         this.curComponent.sizey = Math.round(this.curComponent.style.height / this.curCanvasScale.matrixStyleOriginHeight)
+        this.curComponent.sizey = this.curComponent.sizey > this.miniHeight ? this.curComponent.sizey : this.miniHeight
+        this.curComponent.sizex = this.curComponent.sizex > this.miniWidth ? this.curComponent.sizex : this.miniWidth
         this.curComponent.auxiliaryMatrix = true
         this.$emit('amAddItem')
       }

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

@@ -939,7 +939,8 @@ export default {
       'curLinkageView',
       'doSnapshotIndex',
       'componentGap',
-      'mobileLayoutStatus'
+      'mobileLayoutStatus',
+      'curCanvasScale'
     ])
   },
   watch: {

frontend/src/components/canvas/custom-component/component-list.js

@@ -11,6 +11,8 @@ export const BASE_MOBILE_STYLE = {
   y: 1,
   sizex: 6,
   sizey: 4,
+  miniSizex: 1,
+  miniSizey: 1,
   auxiliaryMatrix: true
 }
 
@@ -158,7 +160,9 @@ const list = [
     x: 1,
     y: 1,
     sizex: 10,
-    sizey: 2
+    sizey: 2,
+    miniSizex: 1,
+    miniSizey: 1
   },
   {
     id: '10002',
@@ -181,7 +185,9 @@ const list = [
       textAlign: '',
       color: '',
       backgroundColor: ''
-    }
+    },
+    miniSizex: 1,
+    miniSizey: 1
   },
   {
     id: '10003',
@@ -199,7 +205,9 @@ const list = [
     x: 1,
     y: 1,
     sizex: 10,
-    sizey: 6
+    sizey: 6,
+    miniSizex: 1,
+    miniSizey: 1
   },
   {
     id: '10003-1',
@@ -215,7 +223,9 @@ const list = [
       width: 600,
       height: 300,
       borderRadius: ''
-    }
+    },
+    miniSizex: 1,
+    miniSizey: 1
   },
   {
     id: '10004',
@@ -237,7 +247,9 @@ const list = [
     x: 1,
     y: 1,
     sizex: 10,
-    sizey: 6
+    sizey: 6,
+    miniSizex: 1,
+    miniSizey: 1
   },
   {
     id: '10005',
@@ -256,7 +268,9 @@ const list = [
     y: 36,
     sizex: 10,
     sizey: 6,
-    auxiliaryMatrix: true
+    auxiliaryMatrix: true,
+    miniSizex: 1,
+    miniSizey: 1
   },
   {
     id: '10006',
@@ -285,7 +299,9 @@ const list = [
     x: 1,
     y: 1,
     sizex: 10,
-    sizey: 10
+    sizey: 10,
+    miniSizex: 1,
+    miniSizey: 1
   },
   {
     id: '30001',
@@ -322,7 +338,9 @@ const list = [
     x: 1,
     y: 1,
     sizex: 10,
-    sizey: 2
+    sizey: 2,
+    miniSizex: 1,
+    miniSizey: 1
   },
   {
     id: '20001',
@@ -341,7 +359,9 @@ const list = [
     x: 1,
     y: 1,
     sizex: 10,
-    sizey: 5
+    sizey: 5,
+    miniSizex: 1,
+    miniSizey: 1
   },
   {
     id: '20002',
@@ -360,7 +380,9 @@ const list = [
     x: 1,
     y: 1,
     sizex: 10,
-    sizey: 5
+    sizey: 5,
+    miniSizex: 1,
+    miniSizey: 1
   }
 ]
 

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

@@ -127,14 +127,20 @@ export default {
     },
     'element.options.attrs.multiple': function(value, old) {
       if (typeof old === 'undefined' || value === old) return
-      // if (!this.inDraw) {
-      this.value = value ? [] : null
-      this.element.options.value = ''
-      // }
+      if (!this.inDraw) {
+        this.value = value ? [] : null
+        this.element.options.value = ''
+      } else {
+        this.value = this.fillValueDerfault()
+      }
 
       this.show = false
       this.$nextTick(() => {
         this.show = true
+        if (value) {
+          this.checkAll = this.value.length === this.datas.length
+          this.isIndeterminate = this.value.length > 0 && this.value.length < this.datas.length
+        }
       })
     }
   },

frontend/src/components/widget/serviceImpl/ButtonSureServiceImpl.js

@@ -25,7 +25,9 @@ const drawPanel = {
     },
     value: '测试按钮'
   },
-  component: 'de-button'
+  component: 'de-button',
+  miniSizex: 1,
+  miniSizey: 1
 }
 
 class ButtonSureServiceImpl extends WidgetService {

frontend/src/components/widget/serviceImpl/NumberRangeServiceImpl.js

@@ -34,7 +34,9 @@ const drawPanel = {
     textAlign: '',
     color: ''
   },
-  component: 'de-number-range'
+  component: 'de-number-range',
+  miniSizex: 1,
+  miniSizey: 2
 }
 
 class NumberRangeServiceImpl extends WidgetService {

frontend/src/components/widget/serviceImpl/NumberSelectGridServiceImpl.js

@@ -24,7 +24,9 @@ const dialogPanel = {
     manualModify: false
   },
   defaultClass: 'tree-filter',
-  component: 'de-select-grid'
+  component: 'de-select-grid',
+  miniSizex: 1,
+  miniSizey: 1
 }
 const drawPanel = {
   type: 'custom',

frontend/src/components/widget/serviceImpl/NumberSelectServiceImpl.js

@@ -24,7 +24,9 @@ const dialogPanel = {
     manualModify: false
   },
   defaultClass: 'tree-filter',
-  component: 'de-select'
+  component: 'de-select',
+  miniSizex: 1,
+  miniSizey: 1
 }
 const drawPanel = {
   type: 'custom',

frontend/src/components/widget/serviceImpl/TextInputServiceImpl.js

@@ -19,7 +19,9 @@ const dialogPanel = {
     manualModify: false
   },
   defaultClass: 'text-filter',
-  component: 'de-input-search'
+  component: 'de-input-search',
+  miniSizex: 1,
+  miniSizey: 1
 }
 const drawPanel = {
   type: 'custom',

frontend/src/components/widget/serviceImpl/TextSelectGridServiceImpl.js

@@ -24,7 +24,9 @@ const dialogPanel = {
     manualModify: false
   },
   defaultClass: 'text-filter',
-  component: 'de-select-grid'
+  component: 'de-select-grid',
+  miniSizex: 1,
+  miniSizey: 1
 }
 const drawPanel = {
   type: 'custom',

frontend/src/components/widget/serviceImpl/TextSelectServiceImpl.js

@@ -24,7 +24,9 @@ const dialogPanel = {
     manualModify: false
   },
   defaultClass: 'text-filter',
-  component: 'de-select'
+  component: 'de-select',
+  miniSizex: 1,
+  miniSizey: 1
 }
 const drawPanel = {
   type: 'custom',

frontend/src/components/widget/serviceImpl/TimeDateRangeServiceImpl.js

@@ -33,7 +33,9 @@ const dialogPanel = {
     manualModify: false
   },
   defaultClass: 'time-filter',
-  component: 'de-date'
+  component: 'de-date',
+  miniSizex: 1,
+  miniSizey: 1
 }
 const drawPanel = {
   type: 'custom',

frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js

@@ -44,7 +44,9 @@ const dialogPanel = {
     manualModify: false
   },
   defaultClass: 'time-filter',
-  component: 'de-date'
+  component: 'de-date',
+  miniSizex: 1,
+  miniSizey: 1
 }
 const drawPanel = {
   type: 'custom',

frontend/src/components/widget/serviceImpl/TimeMonthServiceImpl.js

@@ -39,7 +39,9 @@ const dialogPanel = {
     manualModify: false
   },
   defaultClass: 'time-filter',
-  component: 'de-date'
+  component: 'de-date',
+  miniSizex: 1,
+  miniSizey: 1
 }
 const drawPanel = {
   type: 'custom',

frontend/src/components/widget/serviceImpl/TimeQuarterServiceImpl.js

@@ -28,7 +28,9 @@ const drawPanel = {
     textAlign: '',
     color: ''
   },
-  component: 'de-quarter'
+  component: 'de-quarter',
+  miniSizex: 1,
+  miniSizey: 1
 }
 
 class TimeQuarterServiceImpl extends WidgetService {

frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js

@@ -38,7 +38,9 @@ const dialogPanel = {
     manualModify: false
   },
   defaultClass: 'time-filter',
-  component: 'de-date'
+  component: 'de-date',
+  miniSizex: 1,
+  miniSizey: 1
 }
 const drawPanel = {
   type: 'custom',

frontend/src/views/chart/chart/line/line_antv.js

@@ -157,8 +157,10 @@ export function baseAreaOptionAntV(plot, container, chart, action) {
         size: parseInt(s.lineSymbolSize),
         shape: s.lineSymbol
       }
-      options.lineStyle = {
-        lineWidth: parseInt(s.lineWidth)
+      options.line = {
+        style: {
+          lineWidth: parseInt(s.lineWidth)
+        }
       }
     }
   }

frontend/src/views/system/plugin/dynamic.vue

 <template>
-  <layout-content v-if="!noLayout" v-loading="$store.getters.loadingMap[$store.getters.currentPath]" :header="header" :back-name="backName">
+  <layout-content v-if="!noLayout" v-loading="jsname && !innerLoadingNames.includes(jsname) && $store.getters.loadingMap[$store.getters.currentPath]" :header="header" :back-name="backName">
     <async-component v-if="showAsync" :url="url" @execute-axios="executeAxios" @on-add-languanges="addLanguages" @on-plugin-layout="setLayoutInfo" @plugin-call-back="pluginCallBack" />
     <div v-else>
       <h1>未知组件无法展示</h1>
@@ -46,7 +46,8 @@ export default {
       header: null,
       backName: null,
       baseUrl: '/api/pluginCommon/async/',
-      url: null
+      url: null,
+      innerLoadingNames: ['SystemDept', 'SystemRole']
     }
   },
   created() {

frontend/src/views/system/user/index.vue

 <template>
-  <layout-content v-loading="$store.getters.loadingMap[$store.getters.currentPath]">
+  <layout-content>
     <complex-table
       v-if="canLoadDom"
+      v-loading="$store.getters.loadingMap[$store.getters.currentPath]"
       :data="data"
       :columns="columns"
       local-key="userGrid"
@@ -107,9 +108,9 @@
             :load-options="loadDepts"
             style="width: 430px"
             :placeholder="$t('user.choose_org')"
-            :noChildrenText="$t('commons.treeselect.no_children_text')"
-            :noOptionsText="$t('commons.treeselect.no_options_text')"
-            :noResultsText="$t('commons.treeselect.no_results_text')"
+            :no-children-text="$t('commons.treeselect.no_children_text')"
+            :no-options-text="$t('commons.treeselect.no_options_text')"
+            :no-results-text="$t('commons.treeselect.no_results_text')"
           />
         </el-form-item>
         <el-form-item style="margin-bottom: 0;" :label="$t('commons.role')" prop="roleIds">

mobile/src/locale/en.json

@@ -18,7 +18,8 @@
         "tw": "繁體中文",
         "zh": "简体中文",
         "sysLanguage": "Follow System",
-        "tips": "Tips"
+        "tips": "Tips",
+        "loading": "loading"
         
     },
     "login": {

mobile/src/locale/zh-Hans.json

@@ -19,7 +19,8 @@
         "tw": "繁體中文",
         "zh": "简体中文",
         "sysLanguage": "跟随系统",
-        "tips": "提示"
+        "tips": "提示",
+        "loading": "加载中"
     },
     "login": {
         "title": "用户登录",

mobile/src/locale/zh-Hant.json

@@ -19,7 +19,8 @@
         "tw": "繁體中文",
         "zh": "简体中文",
         "sysLanguage": "跟隨系統",
-        "tips": "提示"
+        "tips": "提示",
+        "loading": "加載中"
         
     },
     "login": {

mobile/src/pages/tabBar/home/detail.nvue

@@ -91,7 +91,7 @@
 			try {
 				this.banner = JSON.parse(decodeURIComponent(payload));
                 uni.showLoading({
-					title: 'loading'
+					title: this.$t('commons.loading')
 				});
                 this.loadLinkUrl()
 			} catch (error) {
@@ -189,7 +189,7 @@
                     if(!this.hasStar) {
                         uni.showToast({
                             icon: 'success',
-                            title: '收藏成功'
+                            title: this.$t('detail.starSuccess')
                         })
                     }
                     this.loadStarStatus()
@@ -201,7 +201,7 @@
             },
             refresh() {
                 uni.showLoading({
-					title: 'loading'
+					title: this.$t('commons.loading')
 				});
                 
                 this.url = null