瀏覽代碼

boman-report 8

shiqian 3 年之前
父節點
當前提交
dbdbdad1f3

+ 0 - 0
boman-report/src/main/resources/static/jmreport/desreport_/corelib/icons/f08cce4fc757983ae0c5e705ed6324ad.png → boman-report/src/main/resources/static/jmreport/desreport_/corelib/icons/f08cce4fc757983ae0c5e705ed6324ad123.png


+ 11 - 5
boman-report/src/main/resources/static/jmreport/desreport_/corelib/jmsheet.css

@@ -770,7 +770,7 @@ body {
   opacity: 0.9;
 }
 .jm-sheet-icon .jm-sheet-icon-img.help {
-  background-image: url(./icons/f08cce4fc757983ae0c5e705ed6324ad.png);
+  background-image: url(icons/f08cce4fc757983ae0c5e705ed6324ad123.png);
   opacity: 0.9;
 }
 .jm-sheet-icon .jm-sheet-icon-img.view-setting {
@@ -804,10 +804,10 @@ body {
   background-image: url(./icons/5ea0efc04b8a7bd10eb8eac1374caaf9.png);
   opacity: 0.9;
 }
-.jm-sheet-icon .jm-sheet-icon-img.qrcode {
-  background-image: url(./icons/c9d011bdbaec17669808f9d88fc2d366.png);
-  opacity: 0.8;
-}
+/*.jm-sheet-icon .jm-sheet-icon-img.qrcode {*/
+/*  background-image: url(./icons/c9d011bdbaec17669808f9d88fc2d366.png);*/
+/*  opacity: 0.8;*/
+/*}*/
 .jm-sheet-icon .jm-sheet-icon-img.barcode {
   background-image: url(./icons/e67b7bdc19df9ede78820d9bf5f59b73.png);
   opacity: 0.8;
@@ -1258,6 +1258,12 @@ ty-drag-content > div {
   cursor: move;
   position: absolute;
 }
+.ty-drag-content{
+  display: none;
+}
+.ty-drag-container{
+  display: none;
+}
 .ty-drag-circle {
   display: none;
 }

+ 5 - 5
boman-report/src/main/resources/static/jmreport/desreport_/corelib/jmsheet.js

@@ -59831,7 +59831,7 @@
                 chart: "图表",
                 img: "插入图片",
                 barcode: "条形码",
-                qrcode: "二维码",
+                // qrcode: "二维码",
                 paintformat: "格式刷",
                 clearformat: "清除格式",
                 format: "数据格式",
@@ -59860,7 +59860,7 @@
                 cellLine: "单元格斜线",
                 printSetting: "打印设置",
                 viewSetting: "预览工具条设置",
-                help: "帮助"
+                // help: "帮助"
             },
             rpBar: {
                 exportExcel: "exportExcel",
@@ -59922,7 +59922,7 @@
                 duration: "持续时间",
                 img: "图片",
                 barcode: "条形码",
-                qrcode: "二维码"
+                // qrcode: "二维码"
             },
             formula: {
                 sum: "求和",
@@ -69170,13 +69170,13 @@
         })(e)
     }
 
-    var vc = [{text: "社区首页", href: "http://www.jimureport.com/"}, {
+    var vc = [{text: "首页", href: "http://118.178.139.79:5000/index"}/*, {
         text: "视频教程",
         href: "http://www.jimureport.com/doc/video"
     }, {text: "帮助文档", href: "http://report.jeecg.com/2078898"}, {
         text: "BUG反馈",
         href: "https://gitee.com/jeecg/JimuReport/issues"
-    }], yc = function (e) {
+    }*/], yc = function (e) {
         !function (e, t) {
             if ("function" != typeof t && null !== t) throw new TypeError("Super expression must either be null or a function");
             e.prototype = Object.create(t && t.prototype, {

+ 3 - 3
boman-report/src/main/resources/static/jmreport/desreport_/corelib/locale/zh-cn.js

@@ -45,7 +45,7 @@
                 chart: "图表",
                 img: "插入图片",
                 barcode: "条形码",
-                qrcode: "二维码",
+                // qrcode: "二维码",
                 paintformat: "格式刷",
                 clearformat: "清除格式",
                 format: "数据格式",
@@ -74,7 +74,7 @@
                 cellLine: "单元格斜线",
                 printSetting: "打印设置",
                 viewSetting: "预览工具条设置",
-                help: "帮助"
+                help: "首页"
             },
             rpBar: {
                 exportExcel: "exportExcel",
@@ -136,7 +136,7 @@
                 duration: "持续时间",
                 img: "图片",
                 barcode: "条形码",
-                qrcode: "二维码"
+                // qrcode: "二维码"
             },
             formula: {
                 sum: "求和",

+ 3 - 3
boman-report/src/main/resources/static/jmreport/desreport_/js/biz/design.js

@@ -830,13 +830,13 @@ vm = new Vue({
                 valueExpression:"", //值表达式
                 valueCoordinate:"", //值坐标
                 dataLabel:(h) => {
-                  return this.reanderTooltip(h,'数据','http://report.jeecg.com/1605007');
+                  return this.reanderTooltip(h,'数据','');
                 },//数据选项卡名称自定义
                 codeLabel:(h) => {
-                  return this.reanderTooltip(h,'二维码设置','http://report.jeecg.com/2290861');
+                  return this.reanderTooltip(h,'二维码设置','');
                 },//二维码选项卡定义    
                 qrCodeLabel:(h) => {
-                  return this.reanderTooltip(h,'条形码设置','http://report.jeecg.com/2290862');
+                  return this.reanderTooltip(h,'条形码设置','');
                 },//条形码选项卡定义
                 functionScreen:false, //表达式弹窗放大缩小操作
                 funDraggable:true //表达式弹窗是否可以拖动

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

@@ -473,7 +473,7 @@
                                         <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="http://report.jeecg.com/1835711" target="_blank" style="margin-right: 15px"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 4px;"/></a>
+                                                    <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">
@@ -520,7 +520,7 @@
                                     <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="http://report.jeecg.com/2083759" target="_blank"  style="margin-right: 26px;"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 4px;"/></a>
+                                          <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>
@@ -564,7 +564,7 @@
                                         <i-option value="number" key="0" class="rightFontSize">数值</i-option>
                                         <i-option value="img" key="2" class="rightFontSize">图片</i-option>
                                         <i-option value="barcode" key="3" class="rightFontSize">条形码</i-option>
-                                        <i-option value="qrcode" key="4" class="rightFontSize">二维码</i-option>
+<#--                                        <i-option value="qrcode" key="4" class="rightFontSize">二维码</i-option>-->
                                         <#--<i-option value="chart" key="5">图表</i-option>-->
                                     </i-select>
                                   </div>
@@ -589,7 +589,7 @@
                                           <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="http://report.jeecg.com/2361240" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
+                                                    <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>
@@ -611,7 +611,7 @@
                                         <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="http://report.jeecg.com/2032023" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
+                                                <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>
@@ -647,7 +647,7 @@
                                             <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="http://report.jeecg.com/2276025" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
+                                                        <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>
@@ -667,7 +667,7 @@
                                     <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="http://report.jeecg.com/2306127" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
+                                                <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>
@@ -696,7 +696,7 @@
                                       <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="http://report.jeecg.com/2084138" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
+                                                  <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>
@@ -710,7 +710,7 @@
                                       <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="http://report.jeecg.com/2296481" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
+                                                <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>

+ 1 - 1
boman-report/src/main/resources/templates/jmreport/desreport/list.ftl

@@ -118,7 +118,7 @@
     <div class="layout" style="margin-left: -30px;margin-top: -10px;">
       <div style="background-color: #1890FF;height: 47px">
         <span class="aui-logo"></span>
-        <span class="jimu-header">欢迎进入积木报表工作台 </span>
+        <span class="jimu-header"> </span>
       </div>
         <Layout>
             <Sider breakpoint="md" collapsible :collapsed-width="78" v-model="isCollapsed">