askbot-dragon 1.5.78-beta → 1.5.78

package/package.json

@@ -1,17 +1,14 @@
 {
   "name": "askbot-dragon",
-  "version": "1.5.78-beta",
+  "version": "1.5.78",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@ckeditor/ckeditor5-ui": "^10.1.0",
-    "@ckeditor/ckeditor5-vue2": "^3.0.1",
     "ali-oss": "^6.2.1",
     "audio-loader": "^1.0.3",
-    "ckeditor": "^4.12.1",
     "core-js": "^3.6.5",
     "install": "^0.13.0",
     "jquery": "^3.5.1",

package/public/index.html

@@ -23,13 +23,11 @@
         });
       }
     </script>
-    <script src="https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com/ckeditor5-build-classic/0.4.4/ckeditor.js"></script>
     <!-- 项目图标 -->
-    <link rel="stylesheet"  href="//at.alicdn.com/t/font_1566110_3hu6pyd938i.css"/>
+    <link rel="stylesheet"  href="//at.alicdn.com/t/c/font_2913049_ee8dx548hg.css"/>
     <!-- guoran图标 -->
     <link rel="stylesheet"  href="//at.alicdn.com/t/c/font_2913049_qtm7orae3l.css"/>
     <script src="https://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
-    <!-- <script src="https://static.guoranbot.com/ckeditor5-build-classic/0.3.7/build/ckeditor.js"></script> -->
     
     <!-- vue -->
     <!-- <script src="https://static.guoranbot.com/vue/2.6.11/dist/vue.min.js"></script>

package/src/assets/js/common.js

@@ -9,4 +9,245 @@ export function isMobile() {
         bool = false
     }
     return bool
+}
+
+let imageTypeObj = {
+    PDF: 'pdf1',
+    pdf: 'pdf1',
+    TXT: 'txt1',
+    txt: 'txt1',
+    selfadd: 'selfadd1',
+    md: "md2",
+    html: 'selfadd1',
+    mode: "mode",
+    general: 'general',
+    word: "word1",
+    Word: "word1",
+    docx: "word1",
+    doc: "word1",
+    docm: "word1",
+    dotm: "word1",
+    dotx: "word1",
+    wpt: "word1",
+    wps: "word1",
+    WORD: "word1",
+    Excel: 'excel1',
+    EXCEL: 'excel1',
+    excel: 'excel1',
+    PPT: 'ppt1',
+    ppt: 'ppt1',
+    pptx: 'ppt1',
+    img: "image1",
+    image: "image1",
+    video: "video",
+    audio: 'audio',
+    link: "link",
+    wechat: "wechat",
+    mp4: "video",
+    MP4: "video",
+    xlsx: "excel1",
+    xls: "excel1",
+    csv: "excel1",
+    jpg: "image1",
+    JPG: "image1",
+    jpeg: "image1",
+    JPEG: "image1",
+    png: "image1",
+    PNG: "image1",
+    webp: "image1",
+    WEBP: "image1",
+    gif: "image1",
+    GIF: "image1",
+    svg: "image1",
+    bmp: "image1",
+    avi: "video",
+    mov: "video",
+    rmvb: "video",
+    wav: "audio",
+    mp3: "audio",
+    MOV: "video",
+    AIV: "video",
+    aiv: "video",
+    news:"news"
+}
+function newInitWaterMark(elId, textValue) {
+    //默认设置
+    var defaultSettings = {
+
+        watermark_txt: "",
+
+        visitorWatermark_txt: "",
+
+        watermark_x: 0, //水印起始位置x轴坐标
+
+        watermark_y: 0, //水印起始位置Y轴坐标
+
+        watermark_rows: 0, //水印行数
+
+        watermark_cols: 0, //水印列数
+
+        watermark_x_space: 40, //水印x轴间隔
+
+        watermark_y_space: 60, //水印y轴间隔
+
+        watermark_color: "black", //水印字体颜色
+
+        watermark_alpha: 0.3, //水印透明度
+
+        watermark_fontsize: "12px", //水印字体大小
+
+        watermark_font: "微软雅黑", //水印字体
+
+        watermark_width: 100, //水印宽度
+
+        watermark_height: 60, //水印长度
+
+        watermark_angle: 20 //水印倾斜度数
+
+    };
+    let textWatermarkValue = textValue;
+    if (textWatermarkValue) {
+        defaultSettings.watermark_txt = textWatermarkValue;
+    }
+    if (!textWatermarkValue) {
+        return;
+    }
+
+    //采用配置项替换默认值，作用类似jquery.extend
+
+    if (arguments.length === 1 && typeof arguments[0] === "object") {
+
+        // 获取参数配置
+
+        var src = arguments[0];
+
+        for (let key in src) {
+
+            if (src[key] && defaultSettings[key] && src[key] === defaultSettings[key])
+
+                continue;
+
+            else if (src[key])
+
+                defaultSettings[key] = src[key];
+
+        }
+
+    }
+
+    var oTemp = document.createDocumentFragment();
+
+    //获取页面最大宽度
+
+    var page_width = Math.max(document.getElementById(elId).scrollWidth, document.getElementById(elId).clientWidth);
+
+    var cutWidth = page_width * 0.0150;
+
+    page_width = page_width - cutWidth;
+
+    //获取页面最大高度
+    var page_height = document.getElementById(elId).scrollHeight;
+    console.log('page_height',page_height, page_width);
+
+    // var page_height = Math.max(document.body.scrollHeight, document.body.clientHeight);
+
+    // var page_height = document.body.scrollHeight+document.body.scrollTop;
+
+    //如果将水印列数设置为0，或水印列数设置过大，超过页面最大宽度，则重新计算水印列数和水印x轴间隔
+
+    if (defaultSettings.watermark_cols == 0 || (parseInt(defaultSettings.watermark_x + defaultSettings
+
+        .watermark_width * defaultSettings.watermark_cols + defaultSettings.watermark_x_space * (
+
+        defaultSettings.watermark_cols - 1)) > page_width)) {
+
+        defaultSettings.watermark_cols = parseInt((page_width - defaultSettings.watermark_x + defaultSettings
+
+            .watermark_x_space) / (defaultSettings.watermark_width + defaultSettings
+
+            .watermark_x_space));
+
+        defaultSettings.watermark_x_space = parseInt((page_width - defaultSettings.watermark_x -
+
+            defaultSettings
+
+                .watermark_width * defaultSettings.watermark_cols) / (defaultSettings.watermark_cols - 1));
+
+    }
+
+    //如果将水印行数设置为0，或水印行数设置过大，超过页面最大长度，则重新计算水印行数和水印y轴间隔
+
+    if (defaultSettings.watermark_rows == 0 || (parseInt(defaultSettings.watermark_y + defaultSettings
+
+        .watermark_height * defaultSettings.watermark_rows + defaultSettings.watermark_y_space * (
+
+        defaultSettings.watermark_rows - 1)) > page_height)) {
+
+        defaultSettings.watermark_rows = parseInt((defaultSettings.watermark_y_space + page_height -
+
+            defaultSettings
+
+                .watermark_y) / (defaultSettings.watermark_height + defaultSettings.watermark_y_space));
+
+        defaultSettings.watermark_y_space = parseInt(((page_height - defaultSettings.watermark_y) -
+
+            defaultSettings
+
+                .watermark_height * defaultSettings.watermark_rows) / (defaultSettings.watermark_rows - 1));
+
+    }
+
+    var x;
+    var y;
+    for (var i = 0; i < defaultSettings.watermark_rows; i++) {
+        y = defaultSettings.watermark_y + (defaultSettings.watermark_y_space + defaultSettings.watermark_height) * i;
+        for (var j = 0; j < defaultSettings.watermark_cols; j++) {
+            x = defaultSettings.watermark_x + (defaultSettings.watermark_width + defaultSettings.watermark_x_space) * j;
+            var mask_div = document.createElement("div");
+
+            mask_div.id = "mask_div" + i + j;
+            mask_div.className = "mask_div";
+            mask_div.style.webkitTransform = "rotate(-" + defaultSettings.watermark_angle + "deg)";
+            mask_div.style.MozTransform = "rotate(-" + defaultSettings.watermark_angle + "deg)";
+            mask_div.style.msTransform = "rotate(-" + defaultSettings.watermark_angle + "deg)";
+            mask_div.style.OTransform = "rotate(-" + defaultSettings.watermark_angle + "deg)";
+            mask_div.style.transform = "rotate(-" + defaultSettings.watermark_angle + "deg)";
+            mask_div.style.visibility = "";
+            mask_div.style.position = "absolute";
+            //奇偶行错开，这样水印就不对齐，显的不呆板
+            mask_div.style.left = x + 20 + "px";
+            mask_div.appendChild(document.createTextNode(defaultSettings.watermark_txt));
+
+            mask_div.style.top = y + 10 + "px";
+
+            mask_div.style.overflow = "hidden";
+
+            mask_div.style.pointerEvents = "none"; //让水印不遮挡页面的点击事件
+
+            mask_div.style.opacity = defaultSettings.watermark_alpha;
+
+            mask_div.style.fontSize = defaultSettings.watermark_fontsize;
+
+            mask_div.style.fontFamily = defaultSettings.watermark_font;
+
+            mask_div.style.color = defaultSettings.watermark_color;
+
+            mask_div.style.textAlign = "center";
+
+            mask_div.style.width = defaultSettings.watermark_width + "px";
+
+            mask_div.style.height = defaultSettings.watermark_width + "px";
+
+            mask_div.style.display = "block";
+
+            mask_div.style.wordBreak = 'break-all'
+
+            oTemp.appendChild(mask_div);
+        }
+    }
+    document.getElementById(elId).appendChild(oTemp);
+}
+export {
+    imageTypeObj,
+    newInitWaterMark
 }

package/src/components/ActionAlertIframe.vue

@@ -1,17 +1,39 @@
 <template>
     <div id="action_alert_iframe">
+        <div class="iframe-full-screen">
+                <span @click="showAskFullScreen = true" class="el-icon-full-screen"></span>
+            </div>
         <iframe
             class="grzh-iframe"
             :id="tampId"
             :data-name="tampId"
             :src="actionAlertIframe.template"
             :width="(actionAlertIframe.version == 1 && !phoneWidth100)?actionAlertIframe.width:'100%'"
-            :height="actionAlertIframe.height"
+            :height="showAskFullScreen?'90%':actionAlertIframe.height"
             :scrolling="actionAlertIframe.scrolling"
             frameborder="no"
             border="0"
         ></iframe>
+        
+        <div v-if="showAskFullScreen" class="ask-full-screen">
+            <div class="iframe-full-screen">
+                <br>
+                <span @click="showAskFullScreen = false" style="cursor: pointer;">
+                    <svg t="1702295921525" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="39588" width="20" height="20"><path d="M257.706667 376.32H128c-11.946667 0-21.333333-9.386667-21.333333-21.333333s9.386667-21.333333 21.333333-21.333334h129.706667c35.413333 0 64-28.586667 64-64V128c0-11.946667 9.386667-21.333333 21.333333-21.333333s21.333333 9.386667 21.333333 21.333333v141.653333a106.666667 106.666667 0 0 1-106.666666 106.666667zM896 376.32h-129.706667a106.666667 106.666667 0 0 1-106.666666-106.666667V128c0-11.946667 9.386667-21.333333 21.333333-21.333333s21.333333 9.386667 21.333333 21.333333v141.653333c0 35.413333 28.586667 64 64 64H896c11.946667 0 21.333333 9.386667 21.333333 21.333334s-9.386667 21.333333-21.333333 21.333333z" fill="#666666" p-id="39589"></path><path d="M896 376.32h-129.706667a106.666667 106.666667 0 0 1-106.666666-106.666667V128c0-11.946667 9.386667-21.333333 21.333333-21.333333s21.333333 9.386667 21.333333 21.333333v141.653333c0 35.413333 28.586667 64 64 64H896c11.946667 0 21.333333 9.386667 21.333333 21.333334s-9.386667 21.333333-21.333333 21.333333zM257.706667 376.32H128c-11.946667 0-21.333333-9.386667-21.333333-21.333333s9.386667-21.333333 21.333333-21.333334h129.706667c35.413333 0 64-28.586667 64-64V128c0-11.946667 9.386667-21.333333 21.333333-21.333333s21.333333 9.386667 21.333333 21.333333v141.653333a106.666667 106.666667 0 0 1-106.666666 106.666667zM680.96 917.333333c-11.946667 0-21.333333-9.386667-21.333333-21.333333v-141.653333a106.666667 106.666667 0 0 1 106.666666-106.666667H896c11.946667 0 21.333333 9.386667 21.333333 21.333333s-9.386667 21.333333-21.333333 21.333334h-129.706667c-35.413333 0-64 28.586667-64 64V896c0 11.946667-9.386667 21.333333-21.333333 21.333333zM343.04 917.333333c-11.946667 0-21.333333-9.386667-21.333333-21.333333v-141.653333c0-35.413333-28.586667-64-64-64H128c-11.946667 0-21.333333-9.386667-21.333333-21.333334s9.386667-21.333333 21.333333-21.333333h129.706667a106.666667 106.666667 0 0 1 106.666666 106.666667V896c0 11.946667-9.813333 21.333333-21.333333 21.333333z" fill="#666666" p-id="39590"></path><path d="M343.04 917.333333c-11.946667 0-21.333333-9.386667-21.333333-21.333333v-141.653333c0-35.413333-28.586667-64-64-64H128c-11.946667 0-21.333333-9.386667-21.333333-21.333334s9.386667-21.333333 21.333333-21.333333h129.706667a106.666667 106.666667 0 0 1 106.666666 106.666667V896c0 11.946667-9.813333 21.333333-21.333333 21.333333zM680.96 917.333333c-11.946667 0-21.333333-9.386667-21.333333-21.333333v-141.653333a106.666667 106.666667 0 0 1 106.666666-106.666667H896c11.946667 0 21.333333 9.386667 21.333333 21.333333s-9.386667 21.333333-21.333333 21.333334h-129.706667c-35.413333 0-64 28.586667-64 64V896c0 11.946667-9.386667 21.333333-21.333333 21.333333z" fill="#666666" p-id="39591"></path></svg>
+                </span>
+            </div>
+            <iframe
+                class="grzh-iframe"
+                :src="actionAlertIframe.template"
+                width="100%"
+                height="95%"
+                :scrolling="actionAlertIframe.scrolling"
+                frameborder="no"
+                border="0"
+            ></iframe>
+        </div>
     </div>
+    <!-- https://blog.csdn.net/qq_16992475/article/details/130633117 -->
 </template>
 <script>
 export default {
@@ -38,6 +60,7 @@ export default {
                 displayStyle:
                     "iframe 样式(点击弹出/嵌入iframe 字符串类型后端未做限制)",
             },
+            showAskFullScreen: false,
         };
     },
     methods: {},
@@ -63,6 +86,7 @@ export default {
         } else {
           this.actionAlertIframe.template = this.actionAlertIframe.template  + "&iframeId=" + this.tampId
         }
+        this.actionAlertIframe.template = this.actionAlertIframe.template.split("&amp;").join("&")
     },
 };
 </script>
@@ -73,6 +97,24 @@ export default {
     width: 100%;
     margin: 0 auto;
     overflow-x: auto;
+
+    .iframe-full-screen{
+        text-align: right;
+        padding-right: 12px;
+        .el-icon-full-screen{
+            cursor: pointer;
+        }
+    }
+
+    .ask-full-screen{
+        background-color: white;
+        position: fixed;
+        top: 0;
+        left: 0;
+        width: 100vw;
+        height: 100vh;
+        z-index: 9999999999999999999;
+    }
     .grzh-iframe {
         scrollbar-face-color: #9aa1c4;
         /* 滚动条滑块按钮的颜色 */