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

backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java

@@ -66,6 +66,7 @@ public class EmailTaskHandler extends TaskHandler implements Job {
 
         XpackEmailTemplateDTO emailTemplate = (XpackEmailTemplateDTO) jobDataMap.get("emailTemplate");
         SysUserEntity creator = (SysUserEntity) jobDataMap.get("creator");
+        LogUtil.info("start execute send panel report task...");
         sendReport(taskInstance, emailTemplate, creator);
 
     }
@@ -103,8 +104,14 @@ public class EmailTaskHandler extends TaskHandler implements Job {
                            SysUserEntity user) {
         EmailXpackService emailXpackService = SpringContextUtil.getBean(EmailXpackService.class);
         try {
-            byte[] bytes = emailXpackService.printData(panelUrl(emailTemplateDTO.getPanelId()), tokenByUser(user),
-                    buildPixel(emailTemplateDTO));
+            String panelId = emailTemplateDTO.getPanelId();
+            String url = panelUrl(panelId);
+            String token = tokenByUser(user);
+            XpackPixelEntity xpackPixelEntity = buildPixel(emailTemplateDTO);
+            LogUtil.info("url is " + url);
+            LogUtil.info("token is " + token);
+            byte[] bytes = emailXpackService.printData(url, token, xpackPixelEntity);
+            LogUtil.info("picture of " + url + " is finished");
             // 下面继续执行发送邮件的
             String recipients = emailTemplateDTO.getRecipients();
             byte[] content = emailTemplateDTO.getContent();
@@ -118,7 +125,6 @@ public class EmailTaskHandler extends TaskHandler implements Job {
         } catch (Exception e) {
             error(taskInstance, e);
             LogUtil.error(e.getMessage(), e);
-            e.printStackTrace();
         }
     }
 

frontend/src/components/business/condition-table/index.vue

@@ -7,6 +7,9 @@
       :options="options"
       :load-options="loadData"
       style="width: 200px"
+      :noChildrenText="$t('commons.treeselect.no_children_text')"
+      :noOptionsText="$t('commons.treeselect.no_options_text')"
+      :noResultsText="$t('commons.treeselect.no_results_text')"
     />
   </div>
 </template>

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

@@ -7,7 +7,7 @@
   >
     <el-row>
       <el-form ref="form" size="mini" label-width="70px">
-        <el-form-item :label="$t('panel.is_enable')">
+        <el-form-item :label="$t('panel.enable_jump')">
           <el-switch v-model="linkInfo.enable" size="mini" />
           <span v-show="linkInfo.enable" style="color: #909399; font-size: 8px;margin-left: 3px">
             Tips:{{ $t('panel.link_open_tips') }}

frontend/src/lang/en.js

@@ -343,7 +343,12 @@ export default {
     },
     ukey_title: 'API Keys',
     thumbnail: 'thumbnail',
-    confirm_delete: 'Confirm delete'
+    confirm_delete: 'Confirm delete',
+    treeselect: {
+      no_children_text: 'No sub-options.',
+      no_options_text: 'No options available.',
+      no_results_text: 'No results found...'
+    }
   },
   documentation: {
     documentation: 'Documentation',
@@ -1437,7 +1442,7 @@ export default {
     open_mode: 'Open Model',
     new_window: 'New Window',
     now_window: 'Now Window',
-    hyperLinks: 'hyperlinks',
+    hyperLinks: 'target address',
     link_open_tips: 'Open When Panel Not In Edit Status',
     data_loading: 'Data Loading...',
     export_loading: 'Export Loading...',

frontend/src/lang/zh.js

@@ -344,7 +344,12 @@ export default {
     },
     ukey_title: 'API Keys',
     thumbnail: '缩略图',
-    confirm_delete: '确认删除'
+    confirm_delete: '确认删除',
+    treeselect: {
+      no_children_text: '没有子节点',
+      no_options_text: '没有可用选项',
+      no_results_text: '没有匹配的结果'
+    }
   },
   documentation: {
     documentation: '文档',
@@ -1449,7 +1454,7 @@ export default {
     open_mode: '打开方式',
     new_window: '新开页面',
     now_window: '当前页面',
-    hyperLinks: '超链接',
+    hyperLinks: '目标地址',
     link_open_tips: '仪表板非编辑状态可打开链接',
     data_loading: '数据准备中...',
     export_loading: '导出中...',

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

@@ -196,6 +196,9 @@
                 :options="chartGroupTreeAvailable"
                 :normalizer="normalizer"
                 :placeholder="$t('chart.select_group')"
+                :noChildrenText="$t('commons.treeselect.no_children_text')"
+                :noOptionsText="$t('commons.treeselect.no_options_text')"
+                :noResultsText="$t('commons.treeselect.no_results_text')"
               />
             </el-form-item>
           </el-col>

frontend/src/views/chart/view/ChartEdit.vue

@@ -232,6 +232,9 @@
                         :normalizer="normalizer"
                         @input="calcData"
                         @deselect="calcData"
+                        :noChildrenText="$t('commons.treeselect.no_children_text')"
+                        :noOptionsText="$t('commons.treeselect.no_options_text')"
+                        :noResultsText="$t('commons.treeselect.no_results_text')"
                       />
                     </span>
                   </el-row>

frontend/src/views/panel/LinkJumpSet/index.vue

@@ -52,6 +52,9 @@
                   :disable-branch-nodes="true"
                   :normalizer="normalizer"
                   :placeholder="$t('panel.select_jump_panel')"
+                  :noChildrenText="$t('commons.treeselect.no_children_text')"
+                  :noOptionsText="$t('commons.treeselect.no_options_text')"
+                  :noResultsText="$t('commons.treeselect.no_results_text')"
                   style="margin-right: 10px"
                   @select="panelNodeClick"
                   @input="inputVal"

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

@@ -96,6 +96,9 @@
             :load-options="loadMenus"
             style="width: 450px;"
             :placeholder="$t('menu.parent_category')"
+            :noChildrenText="$t('commons.treeselect.no_children_text')"
+            :noOptionsText="$t('commons.treeselect.no_options_text')"
+            :noResultsText="$t('commons.treeselect.no_results_text')"
           />
         </el-form-item>
       </el-form>

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

@@ -40,6 +40,9 @@
           :load-options="loadDepts"
           :auto-load-root-options="false"
           :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')"
           @open="filterData"
         />
       </el-form-item>

frontend/src/views/system/user/imp-ldap.vue

@@ -34,6 +34,9 @@
           :load-options="loadDepts"
           :auto-load-root-options="false"
           :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')"
           @open="filterData"
         />
       </el-form-item>

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

@@ -107,6 +107,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')"
           />
         </el-form-item>
         <el-form-item style="margin-bottom: 0;" :label="$t('commons.role')" prop="roleIds">

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

@@ -33,6 +33,9 @@
               :load-options="loadDepts"
               :auto-load-root-options="false"
               :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')"
             />
           </el-form-item>
           <el-form-item :label="$t('commons.role')" prop="roleIds">