boman-report 9

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysUserController.java

@@ -234,7 +234,7 @@ public class SysUserController extends BaseController {
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/resetPwd")
     public AjaxResult resetPwd(@RequestBody SysUser user) {
-        userService.checkUserAllowed(user);
+//        userService.checkUserAllowed(user);
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         user.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(userService.resetPwd(user));

boman-report/src/main/resources/templates/jmreport/desreport/index.ftl

@@ -472,9 +472,9 @@
                                 <i-menu theme="light" style="margin-left: -25px;z-index: auto;width: auto !important;" :class="menuitemClasses">
                                         <div style="width:95%;height: 30px;border: none;margin-left: 10px; z-index:999;cursor: pointer;margin-left:27px">
                                             <span class="rightFontSize">数据集管理
-                                                <Tooltip :transfer="true" content="数据源管理文档" placement="left" class="jimu-tooltip">
-                                                    <a class=" help-color" href="" target="_blank" style="margin-right: 15px"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 4px;"/></a>
-                                                </Tooltip>
+<#--                                                <Tooltip :transfer="true" content="数据源管理文档" placement="left" class="jimu-tooltip">-->
+<#--                                                    <a class=" help-color" href="" target="_blank" style="margin-right: 15px"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 4px;"/></a>-->
+<#--                                                </Tooltip>-->
                                             </span>
                                             <Dropdown @on-click="onMenuSelect" placement="bottom-start" :transfer="true">
                                                 <a href="javascript:void(0)">
@@ -519,9 +519,9 @@
                                     <j-data-dictionary ref="dataDictionary"></j-data-dictionary>
                                     <div style="width:100%;height: 45px;border: none;margin-left: 25px;cursor: pointer;margin-top: 10px">
                                       <span @click="createDictClick" class="rightFontSize">数据字典<i style="position: relative;left:100px;font-size: 14px;" class="ivu-icon ivu-icon-md-create"></i></span>
-                                      <Tooltip :transfer="true" content="数据字典文档" placement="left" class="jimu-tooltip">
-                                          <a class="jimu-table-tip help-color" href="" target="_blank"  style="margin-right: 26px;"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 4px;"/></a>
-                                      </Tooltip>
+<#--                                      <Tooltip :transfer="true" content="数据字典文档" placement="left" class="jimu-tooltip">-->
+<#--                                          <a class="jimu-table-tip help-color" href="" target="_blank"  style="margin-right: 26px;"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 4px;"/></a>-->
+<#--                                      </Tooltip>-->
                                     </div>
                                 </i-menu>
                             </template>
@@ -588,9 +588,9 @@
                                       <Submenu name="blankRowSetting">
                                           <template slot="title">
                                               <span class="rightFontSize">补充空白行
-                                                <Tooltip :transfer="true" content="补充空白行文档" placement="left" class="jimu-tooltip">
-                                                    <a class="jimu-table-tip help-color help-margin" href="" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
-                                                </Tooltip>
+<#--                                                <Tooltip :transfer="true" content="补充空白行文档" placement="left" class="jimu-tooltip">-->
+<#--                                                    <a class="jimu-table-tip help-color help-margin" href="" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>-->
+<#--                                                </Tooltip>-->
                                               </span>
                                           </template>
                                           <div>
@@ -666,9 +666,9 @@
                                   <Submenu name="hyperlinksSetting">
                                     <template slot="title">
                                         <span class="rightFontSize">超链接设置
-                                            <Tooltip :transfer="true" content="超链接文档" placement="left" class="jimu-tooltip">
-                                                <a class="jimu-table-tip help-color help-margin" href="" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
-                                            </Tooltip>
+<#--                                            <Tooltip :transfer="true" content="超链接文档" placement="left" class="jimu-tooltip">-->
+<#--                                                <a class="jimu-table-tip help-color help-margin" href="" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>-->
+<#--                                            </Tooltip>-->
                                         </span>
                                     </template>
 
@@ -695,9 +695,9 @@
                                   <Submenu name="otherSetting">
                                       <template slot="title">
                                           <span class="rightFontSize">其他设置
-                                              <Tooltip :transfer="true" content="数据格式化文档" placement="left" class="jimu-tooltip">
-                                                  <a class="jimu-table-tip help-color help-margin" href="" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
-                                              </Tooltip>  
+<#--                                              <Tooltip :transfer="true" content="数据格式化文档" placement="left" class="jimu-tooltip">-->
+<#--                                                  <a class="jimu-table-tip help-color help-margin" href="" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>-->
+<#--                                              </Tooltip>  -->
                                           </span>
                                       </template>
                                     <div class="rightFontSize">
@@ -709,9 +709,9 @@
                                   <Submenu name="primarySubreportSetting">
                                       <template slot="title">
                                           <span class="rightFontSize">主子报表参数设置
-                                            <Tooltip :transfer="true" content="主子报表文档" placement="left" class="jimu-tooltip">
-                                                <a class="jimu-table-tip help-color help-margin" href="" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
-                                            </Tooltip>
+<#--                                            <Tooltip :transfer="true" content="主子报表文档" placement="left" class="jimu-tooltip">-->
+<#--                                                <a class="jimu-table-tip help-color help-margin" href="" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>-->
+<#--                                            </Tooltip>-->
                                           </span>
                                       </template>
                                     <i-button class="rightFontSize" @click="primarySubreportClick">新增</i-button>

boman-report/src/main/resources/templates/jmreport/desreport/modal.ftl

@@ -50,9 +50,9 @@
     <Modal :loading="loading" v-model="chartModule" :width="1000" @on-ok="okAddChart" @on-cancel="selectedChartType=''">
         <p slot="header">
             <span>添加图表
-               <Tooltip :transfer="true" content="图表文档" placement="top">
-                  <a class="jimu-table-tip help-color" href="http://report.jeecg.com/1605007" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
-               </Tooltip>  
+<#--               <Tooltip :transfer="true" content="图表文档" placement="top">-->
+<#--                  <a class="jimu-table-tip help-color" href="http://report.jeecg.com/1605007" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>-->
+<#--               </Tooltip>  -->
             </span>
         </p>
         <Tabs value="bar" class="chart-modal-content" >
@@ -93,15 +93,15 @@
     <Modal :draggable="funDraggable" :loading="loading" :fullscreen="functionScreen" v-model="customExpressionShow" :width="1000" :autosize="true" @on-ok="expressionSave" @on-cancel="expressionCancel" class="expression">
         <p slot="header">
             <span>添加表达式
-               <Tooltip :transfer="true" content="表达式文档" placement="top">
-                   <a class="jimu-table-tip help-color" href="http://report.jeecg.com/2332213" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
-               </Tooltip>
-               <Tooltip style="cursor: pointer;float: right;margin-right: 30px;" v-if="functionScreen" :transfer="true" content="缩小" placement="top">
-                   <Icon type="ios-contract" @click="functionScreenClick"/>
-               </Tooltip>
-               <Tooltip style="cursor: pointer;float: right;margin-right: 30px;" v-else :transfer="true" content="放大" placement="top">
-                     <Icon type="ios-expand" @click="functionScreenClick"/>
-               </Tooltip>
+<#--               <Tooltip :transfer="true" content="表达式文档" placement="top">-->
+<#--                   <a class="jimu-table-tip help-color" href="http://report.jeecg.com/2332213" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>-->
+<#--               </Tooltip>-->
+<#--               <Tooltip style="cursor: pointer;float: right;margin-right: 30px;" v-if="functionScreen" :transfer="true" content="缩小" placement="top">-->
+<#--                   <Icon type="ios-contract" @click="functionScreenClick"/>-->
+<#--               </Tooltip>-->
+<#--               <Tooltip style="cursor: pointer;float: right;margin-right: 30px;" v-else :transfer="true" content="放大" placement="top">-->
+<#--                     <Icon type="ios-expand" @click="functionScreenClick"/>-->
+<#--               </Tooltip>-->
             </span>
         </p>
         <i-form label-colon :label-width="90">

boman-report/src/main/resources/templates/jmreport/desreport/template/components/data_source_setting.ftl

@@ -50,9 +50,9 @@
                                 <i-option v-for="item in sourceTab.data" :value="item.id">{{ item.name }}</i-option>
                             </i-select>
                             <i-button size="small"  @click="sourceManage" v-if="sqlForm.dbType == 0" type="primary">维护</i-button>
-                            <Tooltip :transfer="true" content="数据源维护文档" placement="top" class="jimu-tooltip">
-                              <a class="jimu-table-tip help-color" href="http://report.jeecg.com/2084137" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
-                            </Tooltip>
+<#--                            <Tooltip :transfer="true" content="数据源维护文档" placement="top" class="jimu-tooltip">-->
+<#--                              <a class="jimu-table-tip help-color" href="http://report.jeecg.com/2084137" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>-->
+<#--                            </Tooltip>-->
                         </div>
                         <i-input size="small" style="margin-top: 10px" search enter-button v-model="tableName" placeholder="表名查询" @on-search="queryTableName" />
                         <div style="margin-top: 10px" v-if="tableList&&tableList.length>0">
@@ -145,17 +145,17 @@
                                       </i-input>
                                      </form-item>
                                 <#--    <i-button @click="handleSQLAnalyze" v-if="sqlForm.dbType == 0" type="primary">SQL解析</i-button>-->
-                                    <Tooltip v-if="sqlForm.dbType == 0"  :transfer="true" content="SQL解析文档" placement="top">
-                                        <a class="jimu-table-tip help-color" href="http://report.jeecg.com/2020087" target="_blank" style="font-size: 14px"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
-                                    </Tooltip>
-                                    <i-button @click="handleApiAnalyze" v-if="sqlForm.dbType == 1" type="primary">Api解析</i-button>
-                                    <Tooltip v-if="sqlForm.dbType == 1"  :transfer="true" content="Api解析文档" placement="top">
-                                        <a class="jimu-table-tip help-color" href="http://report.jeecg.com/2020177" target="_blank" style="font-size: 14px"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
-                                    </Tooltip>
-                                    <i-button @click="handleJsonAnalyze" v-if="sqlForm.dbType == 3" type="primary">JSON解析</i-button>
-                                    <Tooltip v-if="sqlForm.dbType == 3"  :transfer="true" content="JSON解析文档" placement="top">
-                                        <a class="jimu-table-tip help-color" href="http://report.jeecg.com/2290859" target="_blank" style="font-size: 14px;"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
-                                    </Tooltip>
+<#--                                    <Tooltip v-if="sqlForm.dbType == 0"  :transfer="true" content="SQL解析文档" placement="top">-->
+<#--                                        <a class="jimu-table-tip help-color" href="http://report.jeecg.com/2020087" target="_blank" style="font-size: 14px"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>-->
+<#--                                    </Tooltip>-->
+<#--                                    <i-button @click="handleApiAnalyze" v-if="sqlForm.dbType == 1" type="primary">Api解析</i-button>-->
+<#--                                    <Tooltip v-if="sqlForm.dbType == 1"  :transfer="true" content="Api解析文档" placement="top">-->
+<#--                                        <a class="jimu-table-tip help-color" href="http://report.jeecg.com/2020177" target="_blank" style="font-size: 14px"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>-->
+<#--                                    </Tooltip>-->
+<#--                                    <i-button @click="handleJsonAnalyze" v-if="sqlForm.dbType == 3" type="primary">JSON解析</i-button>-->
+<#--                                    <Tooltip v-if="sqlForm.dbType == 3"  :transfer="true" content="JSON解析文档" placement="top">-->
+<#--                                        <a class="jimu-table-tip help-color" href="http://report.jeecg.com/2290859" target="_blank" style="font-size: 14px;"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>-->
+<#--                                    </Tooltip>-->
                                 </i-col>
                             </Row>
                         </i-form>