npm - askbot-dragon - Versions diffs - 88.0.35 → 888.0.1 - Mend

askbot-dragon 88.0.35 → 888.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

package/package.json +1 -1
package/public/index.html +3 -0
package/src/assets/js/AliyunlssUtil.js +9 -7
package/src/components/AiGuide.vue +7 -4
package/src/components/ConversationContainer.vue +1 -2
package/src/components/MyEditor.vue +16 -18
package/src/components/answerRadio.vue +3 -2
package/src/components/askVideo.vue +119 -122
package/src/components/file/AliyunOssComponents.vue +1 -1
package/src/components/formTemplate.vue +52 -51
package/src/components/utils/AliyunIssUtil.js +2 -1
package/src/components/utils/ckeditor.js +16 -19

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "askbot-dragon",
-  "version": "88.0.35",
+  "version": "888.0.01",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",

package/public/index.html CHANGED Viewed

@@ -29,6 +29,9 @@
     <!-- iconfont图标 -->
     <link rel="stylesheet"  href="//at.alicdn.com/t/c/font_2913049_mfmhkqumc7i.css"/>
     <script src="https://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
+    <!-- aliyun-oss -->
+    <script src="https://static.guoranbot.com/cdn-common/alyun-oss/aliyun-oss-sdk-6.17.1.min.js"></script>
     <!-- vue -->
     <!-- <script src="https://static.guoranbot.com/vue/2.6.11/dist/vue.min.js"></script>

package/src/assets/js/AliyunlssUtil.js CHANGED Viewed

@@ -1,14 +1,16 @@
-const OSS = require('ali-oss');
+// const OSS = require('ali-oss');
+const OSS = window.OSS
 const ossConfig={
-    region: "oss-cn-zhangjiakou",
-        //云账号AccessKey有所有API访问权限，建议遵循阿里云安全最佳实践，创建并使用STS方式来进行API访问
-        accessKeyId: "LTAI4G3QtdEdwkEbihBngAsK",
-        accessKeySecret: "OwgdVfc5PeCkIgqIdug660xmiSPchn",
-        // stsToken: '<Your securityToken(STS)>',
-        bucket: "guoranopen-zjk",
+    region: "oss-ap-southeast-1",
+    //云账号AccessKey有所有API访问权限，建议遵循阿里云安全最佳实践，创建并使用STS方式来进行API访问
+    accessKeyId: "LTAI5tAusPLDNJJwkvUbqi2T",
+    accessKeySecret: "xqPVaunOIbvTe3g9qsXal2IZO6RftK",
+    // stsToken: '<Your securityToken(STS)>',
+    bucket: "askbotopen-ls",
 };
 let IDX = 256, HEX = [], SIZE = 256, BUFFER;

package/src/components/AiGuide.vue CHANGED Viewed

@@ -94,7 +94,7 @@
                     class="ig-types-list-cell"
                 >
                     <span>{{ intentCell.questionName }}</span>
-                    <span><i class="el-icon-arrow-right"></i></span
+                    <span><svg t="1720148108415" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="96725" width="12" height="12"><path d="M246.728409 927.106061l414.195993-414.195993-409.542106-417.779487A57.615128 57.615128 0 0 1 256.036184 16.247187a49.377747 49.377747 0 0 1 37.2311-16.335145 48.02812 48.02812 0 0 1 37.231101 16.893611l446.773206 457.616765a57.568589 57.568589 0 0 1-4.653887 78.883394c0 1.489244 0 2.792333-4.653888 4.095421L325.844497 1006.408305a56.218962 56.218962 0 0 1-79.116088-0.605005 62.687865 62.687865 0 0 1 0-78.697239z" p-id="96726" fill="#366aff"></path></svg></span
                 ></span>
             </div>
             <!-- 横向排版 -->
@@ -138,7 +138,7 @@
                     class="ig-types-list-cell"
                 >
                     <span>{{ intentCell.exampleQuestion }}</span>
-                    <span><i class="el-icon-arrow-right"></i></span
+                    <span><svg t="1720148108415" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="96725" width="12" height="12"><path d="M246.728409 927.106061l414.195993-414.195993-409.542106-417.779487A57.615128 57.615128 0 0 1 256.036184 16.247187a49.377747 49.377747 0 0 1 37.2311-16.335145 48.02812 48.02812 0 0 1 37.231101 16.893611l446.773206 457.616765a57.568589 57.568589 0 0 1-4.653887 78.883394c0 1.489244 0 2.792333-4.653888 4.095421L325.844497 1006.408305a56.218962 56.218962 0 0 1-79.116088-0.605005 62.687865 62.687865 0 0 1 0-78.697239z" p-id="96726" fill="#366aff"></path></svg></span
                 ></span>
             </div>
             <!-- 横向排版 -->
@@ -182,7 +182,7 @@
                     class="ig-types-list-cell"
                 >
                     <span>{{ intentCell.exampleQuestion }}</span>
-                    <span><i class="el-icon-arrow-right"></i></span
+                    <span><svg t="1720148108415" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="96725" width="12" height="12"><path d="M246.728409 927.106061l414.195993-414.195993-409.542106-417.779487A57.615128 57.615128 0 0 1 256.036184 16.247187a49.377747 49.377747 0 0 1 37.2311-16.335145 48.02812 48.02812 0 0 1 37.231101 16.893611l446.773206 457.616765a57.568589 57.568589 0 0 1-4.653887 78.883394c0 1.489244 0 2.792333-4.653888 4.095421L325.844497 1006.408305a56.218962 56.218962 0 0 1-79.116088-0.605005 62.687865 62.687865 0 0 1 0-78.697239z" p-id="96726" fill="#366aff"></path></svg></span
                 ></span>
             </div>
             <div
@@ -190,7 +190,8 @@
                 class="ig-change-list"
             >
                 <span @click="changeIntellectGuide" class="ig-change-list-btn">
-                    <i class="el-icon-refresh">换一批</i></span
+                    <svg t="1720148246364" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="136175" width="16" height="16"><path d="M225.6 540.8C240 686.4 363.2 800 512 800c76.8 0 150.4-30.4 203.2-84.8 12.8-12.8 32-12.8 44.8 0s12.8 32 0 44.8c-64 65.6-153.6 104-248 104-184 0-336-142.4-350.4-323.2l-43.2 41.6c-12.8 12.8-33.6 11.2-44.8 0s-11.2-33.6 0-44.8l99.2-96c12.8-12.8 33.6-11.2 44.8 0l92.8 96c12.8 12.8 11.2 33.6-1.6 44.8-12.8 12.8-33.6 11.2-44.8-1.6l-38.4-40zM800 497.6C792 345.6 665.6 224 512 224c-76.8 0-148.8 30.4-203.2 83.2-12.8 12.8-33.6 12.8-44.8 0-12.8-12.8-12.8-33.6 0-44.8 65.6-64 153.6-102.4 248-102.4 192 0 347.2 153.6 352 342.4l41.6-40c12.8-12.8 33.6-11.2 44.8 1.6 12.8 12.8 11.2 33.6-1.6 44.8l-94.4 89.6c-12.8 11.2-32 11.2-44.8 0l-97.6-96c-12.8-12.8-12.8-32 0-44.8 12.8-12.8 32-12.8 44.8 0l43.2 40z" p-id="136176" fill="#366aff"></path></svg>
+                    换一批</span
                 >
             </div>
         </div>
@@ -463,6 +464,8 @@ export default {
             font-weight: 600;
             color: #366aff;
             cursor: pointer;
+            display: flex;
+            align-items: center;
         }
     }
 }

package/src/components/ConversationContainer.vue CHANGED Viewed

@@ -45,7 +45,7 @@
     <answer-dissatisfaction :msg="answerDiss"></answer-dissatisfaction>
     <feed-back :feedBack="feedBack"></feed-back>
     <voice-compontent></voice-compontent> -->
-    <!-- <ai-guide :aiGuide="ActionAiGuideObj"></ai-guide> -->
+    <ai-guide :aiGuide="ActionAiGuideObj"></ai-guide>
     <!-- <answer-voice :msg="answerVoiceObj"></answer-voice> -->
     <!-- <answer-voice :msg="answerVoiceObj"></answer-voice> -->
     <!-- <div v-for="(item,index) in processAction" :key="index">
@@ -67,7 +67,6 @@
 import TextMessage from '@/components/message/TextMessage'
 import FormTemplate from "@/components/formTemplate";
-import FormTemplate from "@/components/formTemplate";
 /* import TextMessage from "@/components/message/TextMessage";*/
   // import FormTemplate from '@/components/formTemplate'

package/src/components/MyEditor.vue CHANGED Viewed

@@ -36,20 +36,19 @@
 <script>
 import { v4 as uuidv4 } from "uuid";
-// import { multipartUpload, ossFileUrl } from "./utils/AliyunIssUtil";
-import { putObject } from "../assets/js/obsBrowser";
+import { multipartUpload, ossFileUrl } from "./utils/AliyunIssUtil";
 export default {
     props: ["value", "placeholder", "havToolbar"],
     data () {
         return {
             ossConfig: {
-                region: "oss-cn-zhangjiakou",
+                region: "oss-ap-southeast-1",
                 //云账号AccessKey有所有API访问权限，建议遵循阿里云安全最佳实践，创建并使用STS方式来进行API访问
-                accessKeyId: "LTAI4G3QtdEdwkEbihBngAsK",
-                accessKeySecret: "OwgdVfc5PeCkIgqIdug660xmiSPchn",
+                accessKeyId: "LTAI5tAusPLDNJJwkvUbqi2T",
+                accessKeySecret: "xqPVaunOIbvTe3g9qsXal2IZO6RftK",
                 // stsToken: '<Your securityToken(STS)>',
-                bucket: "guoranopen-zjk",
+                bucket: "askbotopen-ls",
             },
             ischecked: false,
             text: ''
@@ -159,15 +158,14 @@ export default {
             let imgInfo = {
                 url: '',
             }
-            // let res = multipartUpload(
-            //     this.ossConfig,
-            //     file,
-            //     null,
-            //     imgInfo
-            // );
-            let res = putObject(file)
+            let res = multipartUpload(
+                this.ossConfig,
+                file,
+                null,
+                imgInfo
+            );
             res.then(resp => {
-                imgInfo.url = resp.url
+                imgInfo.url = ossFileUrl(this.ossConfig, resp.name)
                 resolve({
                     name: resp.name,
                     default: imgInfo.url
@@ -292,10 +290,10 @@ export default {
             -webkit-animation: rotate 1.5s linear infinite;
             animation: rotate 1.5s linear infinite;
         }
-        .wrap {
-            height: 1px;
-            width: 100%;
-        }
+        // .wrap {
+        //     height: 1px;
+        //     width: 100%;
+        // }
     }
     .editor_content:focus {
         box-shadow: 2px 2px 3px rgba(0, 0, 0, 0.1) inset, 0, 0;

package/src/components/answerRadio.vue CHANGED Viewed

@@ -13,8 +13,8 @@
       </div>
     </div>
     <div v-if="showPage" class="switch-page">
-      <!-- <span @click="changeActivePage" class="switch-page-btn">换一批</span> -->
-      <span @click="showMore" class="switch-page-btn">查看更多</span>
+      <span @click="changeActivePage" class="switch-page-btn">换一批</span>
+      <!-- <span @click="showMore" class="switch-page-btn">查看更多</span> -->
     </div>
   </div>
 </template>
@@ -71,6 +71,7 @@ export default {
       } else {
         this.activeIndex++;
       }
+      this.showOptions = this.formatOptions[this.activeIndex]
     },
     chunkArray(array, size) {
       let chunks = [];

package/src/components/askVideo.vue CHANGED Viewed

@@ -1,142 +1,139 @@
 <template>
-    <div
-            v-loading="loading"
-            :element-loading-text="showProgress"
-            id="dragon-video"
-    >
-        <!-- <video-player
-          class="video-player vjs-custom-skin"
-          x5-video-player-type="h5"
-          :options="videoOptions(msg.content,msg.type)"
-          @pause="statechanged"
-        /> -->
-        <video
-                controls="controls"
-                :controlslist="nodownload&&'nodownload'"
-                :raw-controls="true"
-                x5-video-player-type="h5-page"
-                style="object-fit: contain;width: calc(100vw - 139px);height: 160px;background-color: black;border-radius: 25px;max-width: 230px;padding-left: 10px"
-                preload
-                :poster="videoSrc+'?spm=qipa250&x-oss-process=video/snapshot,t_1000,f_jpg,w_0,h_0,m_fast'"
-                class="video-player vjs-custom-skin"
-                :id="msg.id+'key'">
-          <source :src="videoSrc"/>
-        </video>
-      <div id="output"></div>
-    </div>
+  <div
+          v-loading="loading"
+          :element-loading-text="showProgress"
+          id="dragon-video"
+  >
+      <!-- <video-player
+        class="video-player vjs-custom-skin"
+        x5-video-player-type="h5"
+        :options="videoOptions(msg.content,msg.type)"
+        @pause="statechanged"
+      /> -->
+      <video
+              controls="controls"
+              :controlslist="nodownload&&'nodownload'"
+              :raw-controls="true"
+              x5-video-player-type="h5-page"
+              style="object-fit: contain;width: calc(100vw - 139px);height: 160px;background-color: black;border-radius: 25px;max-width: 230px;padding-left: 10px"
+              preload
+              :poster="videoSrc+'?spm=qipa250&x-oss-process=video/snapshot,t_1000,f_jpg,w_0,h_0,m_fast'"
+              class="video-player vjs-custom-skin"
+              :id="msg.id+'key'">
+        <source :src="videoSrc"/>
+      </video>
+    <div id="output"></div>
+  </div>
 </template>
 <script>
-    import { putObject } from "../assets/js/obsBrowser";
-    export default {
-        name: "ask_video",
-        props: ["msg", "url", "localUrl", "progress", "nodownload"],
-        data() {
-            return {
-              videoSrc:'',
-              poster:''
-            }
-        },
-        watch: {
-        },
-        computed: {
-            showProgress() {
-                return parseInt(this.progress * 100);
-            },
-            loading() {
-                return this.url == null || this.url === "";
-            },
-            src() {
-                return this.url ? this.url : this.localUrl;
-            }
-        },
-      mounted() {
-          this.$nextTick(()=>{
-            let videoSrc = this.url ? this.url : this.localUrl
-            let newVideoSrc = videoSrc.replace("https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com","https://static.guoranbot.com")
-            this.videoSrc = newVideoSrc
-            console.debug('newVideoSrc',this.videoSrc,videoSrc)
-            this.poster = this.videoSrc+'?spm=qipa250&x-oss-process=video/snapshot,t_1000,f_jpg,w_0,h_0,m_fast'
-            console.debug('poster',this.poster)
-          })
+  import {ossConfig,uploadImageByBase64} from "../assets/js/AliyunlssUtil";
+  export default {
+      name: "ask_video",
+      props: ["msg", "url", "localUrl", "progress", "nodownload"],
+      data() {
+          return {
+            videoSrc:'',
+            poster:''
+          }
+      },
+      watch: {
       },
-      methods:{
-        getImage(){
-          let that = this
-          var video,output;
-          var scale = 0.8;
+      computed: {
+          showProgress() {
+              return parseInt(this.progress * 100);
+          },
+          loading() {
+              return this.url == null || this.url === "";
+          },
+          src() {
+              return this.url ? this.url : this.localUrl;
+          }
+      },
+    mounted() {
+        this.$nextTick(()=>{
+          let videoSrc = this.url ? this.url : this.localUrl
+          let newVideoSrc = videoSrc.replace("https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com","https://static.guoranbot.com")
+          this.videoSrc = newVideoSrc
+          console.debug('newVideoSrc',this.videoSrc,videoSrc)
+          this.poster = this.videoSrc+'?spm=qipa250&x-oss-process=video/snapshot,t_1000,f_jpg,w_0,h_0,m_fast'
+          console.debug('poster',this.poster)
+        })
-          var initialize = function() {
-            let id = that.msg.keyId+'key'
-            output = document.getElementById("output");
-            video = document.getElementById(id);
-            video.addEventListener('loadeddata',captureImage);
-          };
+    },
+    methods:{
+      getImage(){
+        let that = this
+        var video,output;
+        var scale = 0.8;
-          var captureImage = function() {
-            var canvas = document.createElement("canvas");
-            canvas.width = video.videoWidth * scale;
-            canvas.height = video.videoHeight * scale;
-            canvas.getContext('2d').drawImage(video, 0, 0, canvas.width, canvas.height);
-            /*var img = document.createElement("img");
-            img.crossOrigin = 'anonymous'
-            img.src = canvas.toDataURL("image/png");*/
-            let reg = /\.(png|jpg|gif)$/
-            console.debug('img.src',output)
-            let base64 = canvas.toDataURL("image/png")
-            let blob = that.dataURLtoFile(base64,'name')
-            // let promise = uploadImageByBase64(ossConfig,blob);
-            const file = new File([blob], 'name', { type: 'text/plain', lastModified: Date.now() });
-            console.debug('file',file)
-            let promise = putObject(file);
-            promise.then((res)=>{
-              console.debug("upload base64 reslut",res);
-              if (res&&res.url){
-                that.poster = res.url
-                if (!reg.test(that.poster)){
-                  that.poster +='.png'
-                }
+        var initialize = function() {
+          let id = that.msg.keyId+'key'
+          output = document.getElementById("output");
+          video = document.getElementById(id);
+          video.addEventListener('loadeddata',captureImage);
+        };
+        var captureImage = function() {
+          var canvas = document.createElement("canvas");
+          canvas.width = video.videoWidth * scale;
+          canvas.height = video.videoHeight * scale;
+          canvas.getContext('2d').drawImage(video, 0, 0, canvas.width, canvas.height);
+          /*var img = document.createElement("img");
+          img.crossOrigin = 'anonymous'
+          img.src = canvas.toDataURL("image/png");*/
+          let reg = /\.(png|jpg|gif)$/
+          console.debug('img.src',output)
+          let base64 = canvas.toDataURL("image/png")
+          let blob = that.dataURLtoFile(base64,'name')
+          let promise = uploadImageByBase64(ossConfig,blob);
+          promise.then((res)=>{
+            console.debug("upload base64 reslut",res);
+            if (res&&res.url){
+              that.poster = res.url
+              if (!reg.test(that.poster)){
+                that.poster +='.png'
               }
-              console.debug('poster',that.poster)
-            });
-          };
+            }
+            console.debug('poster',that.poster)
+          });
+        };
-          initialize();
-        },
-        dataURLtoFile(dataurl, filename) {
-          var arr = dataurl.split(',');
-          var mime = arr[0].match(/:(.*?);/)[1];
-          var bstr = atob(arr[1]);
-          var n = bstr.length;
-          var u8arr = new Uint8Array(n);
-          while(n--){
-            u8arr[n] = bstr.charCodeAt(n);
-          }
-          //转换成file对象
-          return new File([u8arr], filename, {type:mime});
-          //转换成成blob对象
-          /*return new Blob([u8arr],{type:'image/png'});*/
+        initialize();
+      },
+      dataURLtoFile(dataurl, filename) {
+        var arr = dataurl.split(',');
+        var mime = arr[0].match(/:(.*?);/)[1];
+        var bstr = atob(arr[1]);
+        var n = bstr.length;
+        var u8arr = new Uint8Array(n);
+        while(n--){
+          u8arr[n] = bstr.charCodeAt(n);
         }
+        //转换成file对象
+        return new File([u8arr], filename, {type:mime});
+        //转换成成blob对象
+        /*return new Blob([u8arr],{type:'image/png'});*/
       }
     }
+  }
 </script>
 <style scoped lang="less">
 video::-webkit-media-controls-mute-button { display: none !important;}
 #dragon-video{
-  position: relative;
-  #outputVideo{
-    position: absolute;
-    top: 0px;
-    /deep/img{
-      width: calc(100vw - 139px);
-      border-radius: 25px;
-      max-width: 230px;
-      height: 160px;
-    }
+position: relative;
+#outputVideo{
+  position: absolute;
+  top: 0px;
+  /deep/img{
+    width: calc(100vw - 139px);
+    border-radius: 25px;
+    max-width: 230px;
+    height: 160px;
   }
+}
 }
 </style>

package/src/components/file/AliyunOssComponents.vue CHANGED Viewed

@@ -9,7 +9,7 @@
 <script>
     import {uid} from 'uid';
-    const OSS = require('ali-oss');
+    // const OSS = require('ali-oss');
     Date.prototype.Format = function (fmt) {
         const o = {

package/src/components/formTemplate.vue CHANGED Viewed

@@ -869,7 +869,6 @@ import Tree from '../components/tree'
 import selectPopup from '../components/popup'
 import fileListView from './fielListView.vue'
 import { uniqueData } from './utils/math_utils'
-import { putObject } from "../assets/js/obsBrowser";
 export default {
   name: "formTemplate",
   data() {
@@ -945,12 +944,12 @@ export default {
       fileType:['PICTURE','VIDEO','AUDIO'],
       loading:'',
       ossConfig: {
-        region: "oss-cn-zhangjiakou",
+        region: "oss-ap-southeast-1",
         //云账号AccessKey有所有API访问权限，建议遵循阿里云安全最佳实践，创建并使用STS方式来进行API访问
-        accessKeyId: "LTAI4G3QtdEdwkEbihBngAsK",
-        accessKeySecret: "OwgdVfc5PeCkIgqIdug660xmiSPchn",
+        accessKeyId: "LTAI5tAusPLDNJJwkvUbqi2T",
+        accessKeySecret: "xqPVaunOIbvTe3g9qsXal2IZO6RftK",
         // stsToken: '<Your securityToken(STS)>',
-        bucket: "guoranopen-zjk",
+        bucket: "askbotopen-ls",
       },
       hideUploadEdit:false,
       limitNum:1,
@@ -1636,43 +1635,40 @@ export default {
         }
       }
     },
-    uploadImgFun(content,name,fileCon,file){
+    uploadImgFun (content, name, fileCon, file) {
       console.log(fileCon)
       let imageData = {
-        urls:[]
+        urls: []
       }
       let imageInfo = {
-        name:"",
-        status:'',
-        url:''
-      }
-      // let res = multipartUpload(
-      //         this.ossConfig,
-      //         file,
-      //         null,
-      //         imageInfo
-      // );
-      let resp = putObject(file);
-      resp.then((res) => {
+        name: "",
+        status: '',
+        url: ''
+      }
+      let res = multipartUpload(
+        this.ossConfig,
+        file,
+        null,
+        imageInfo
+      );
+      res.then((res) => {
         console.log("upload result:", res);
         // let filePath = res.name;
-        let obj = {
-          name:file.name,
-          url:res.url,
-          status:'success'
-        }
-        imageData.urls.push(obj)
-        // imageInfo.url = ossFileUrl(this.ossConfig, res.name)
-        imageInfo.url = res.url;
-        imageInfo.status='success'
-        imageInfo.name=file.name
-        for (let j=0;j<this.extInfoFieldValue[this.filedId].length;j++){
-          if (this.extInfoFieldValue[this.filedId][j].content && this.extInfoFieldValue[this.filedId][j].content === content){
-            this.$set(this.extInfoFieldValue[this.filedId],j,imageInfo)
+        imageData.urls.push({
+          name: file.name,
+          url: ossFileUrl(this.ossConfig, res.name),
+          status: 'success'
+        })
+        imageInfo.url = ossFileUrl(this.ossConfig, res.name)
+        imageInfo.status = 'success'
+        imageInfo.name = file.name
+        for (let j = 0; j < this.extInfoFieldValue[this.filedId].length; j++) {
+          if (this.extInfoFieldValue[this.filedId][j].content && this.extInfoFieldValue[this.filedId][j].content === content) {
+            this.$set(this.extInfoFieldValue[this.filedId], j, imageInfo)
             delete this.extInfoFieldValue[this.filedId][j].content
           }
         }
-        this.fileUpload=false
+        this.fileUpload = false
       }).catch((err) => {
         console.debug("upload err", err);
       });
@@ -2244,7 +2240,7 @@ export default {
             bool[this.formShow.form.formFieldRelation[i].fieldId] = this.formShow.form.formFieldRelation[i].value && this.formShow.form.formFieldRelation[i].value.includes('\n') && !strVal
           }
           if (this.formShow.form.formFieldRelation[i].relationDisplay && this.formShow.form.formFieldRelation[i].display && this.formShow.form.formFieldRelation[i].fieldId !== 'workorder_description') {
-            if(!this.formShow.form.formFieldRelation[i].value || bool[this.formShow.form.formFieldRelation[i].fieldId] || (Array.isArray(this.formShow.form.formFieldRelation[i].value) && !this.formShow.form.formFieldRelation[i].value.length)) {
+            if(!this.formShow.form.formFieldRelation[i].value || this.strIsNull(this.formShow.form.formFieldRelation[i].value) || bool[this.formShow.form.formFieldRelation[i].fieldId] || (Array.isArray(this.formShow.form.formFieldRelation[i].value) && !this.formShow.form.formFieldRelation[i].value.length)) {
               this.$message.error('请完善'+ this.formShow.form.formFieldRelation[i].formField.name)
               return
             }
@@ -2278,6 +2274,12 @@ export default {
         this.disableds = true
         this.submitValue = '已提交'
     },
+    strIsNull (str) {
+      if (str == "") return true;
+      let regu = "^[ ]+$";
+      let re = new RegExp(regu);
+      return re.test(str);
+    },
     //日期的点击事件
     dateClick(id) {
       if(this.disableds === false)
@@ -2551,7 +2553,7 @@ export default {
     onCancel() {
       this.showArea = false;
     },
-    aliyunOssRequest(data){
+    aliyunOssRequest (data) {
       this.loading = this.$loading({
         lock: true,
@@ -2562,9 +2564,9 @@ export default {
       let file = data.file;
       console.debug("upload file:", file);
       let imgInfo = {
-        status:'',
-        url:'',
-        name:''
+        status: '',
+        url: '',
+        name: ''
       }
       /* let imageData = {
          id:cid,
@@ -2575,14 +2577,13 @@ export default {
            progress: 0,
          },
        };*/
-      // let res = multipartUpload(
-      //         this.ossConfig,
-      //         file,
-      //         null,
-      //         imgInfo
-      // );
-      let ress = putObject(file)
-      ress.then((res) => {
+      let res = multipartUpload(
+        this.ossConfig,
+        file,
+        null,
+        imgInfo
+      );
+      res.then((res) => {
         console.debug("upload result:", res);
         // let filePath = res.name;
         /* imageData.content.progress = 1;
@@ -2590,14 +2591,14 @@ export default {
                  ossFileUrl(this.ossConfig, res.name)
          );
          console.log('imageData',imageData)*/
-        imgInfo.url = res.url
-        imgInfo.status='success'
-        if (data.file){
+        imgInfo.url = ossFileUrl(this.ossConfig, res.name)
+        imgInfo.status = 'success'
+        if (data.file) {
           imgInfo.name = data.file.name
           imgInfo.uid = data.file.uid
         }
-        if (!this.extInfoFieldValue[this.filedId]){
-          this.$set(this.extInfoFieldValue,this.filedId,[])
+        if (!this.extInfoFieldValue[this.filedId]) {
+          this.$set(this.extInfoFieldValue, this.filedId, [])
         }
         this.extInfoFieldValue[this.filedId].push(imgInfo)
         this.loading.close()

package/src/components/utils/AliyunIssUtil.js CHANGED Viewed

@@ -1,4 +1,5 @@
-const OSS = require('ali-oss');
+// const OSS = require('ali-oss');
+const OSS = window.OSS
 let IDX = 256, HEX = [], SIZE = 256, BUFFER;
 while (IDX--) HEX[IDX] = (IDX + 256).toString(16).substring(1);

package/src/components/utils/ckeditor.js CHANGED Viewed

@@ -1,15 +1,14 @@
 /* eslint-disable */
-// import {multipartUpload, ossFileUrl} from "./AliyunIssUtil";
+import {multipartUpload, ossFileUrl} from "./AliyunIssUtil";
 import { v4 as uuidv4 } from "uuid";
-import { putObject } from "../../assets/js/obsBrowser";
-// const ossConfig = {
-//         region: "oss-cn-zhangjiakou",
-//         //云账号AccessKey有所有API访问权限，建议遵循阿里云安全最佳实践，创建并使用STS方式来进行API访问
-//         accessKeyId: "LTAI4G3QtdEdwkEbihBngAsK",
-//         accessKeySecret: "OwgdVfc5PeCkIgqIdug660xmiSPchn",
-//         // stsToken: '<Your securityToken(STS)>',
-//         bucket: "guoranopen-zjk",
-//     }
+const ossConfig = {
+        region: "oss-ap-southeast-1",
+        //云账号AccessKey有所有API访问权限，建议遵循阿里云安全最佳实践，创建并使用STS方式来进行API访问
+        accessKeyId: "LTAI5tAusPLDNJJwkvUbqi2T",
+        accessKeySecret: "xqPVaunOIbvTe3g9qsXal2IZO6RftK",
+        // stsToken: '<Your securityToken(STS)>',
+        bucket: "askbotopen-ls",
+    }
 class MyUploadAdapter {
     constructor( loader , editor ) {
         // 要在上载期间使用的文件加载器实例
@@ -56,16 +55,14 @@ class MyUploadAdapter {
         let imgInfo = {
             url:'',
         }
-        // let res = multipartUpload(
-        //     ossConfig,
-        //     file,
-        //     null,
-        //     imgInfo
-        // );
-        let res = putObject(file);
+        let res = multipartUpload(
+            ossConfig,
+            file,
+            null,
+            imgInfo
+        );
         res.then(resp=>{
-            // imgInfo.url = ossFileUrl(ossConfig, resp.name)
-            imgInfo.url = resp.url;
+            imgInfo.url = ossFileUrl(ossConfig, resp.name)
             let root =  this.editor.model.document.getRoot()
             let children = root.getChildren()
             for(let child of children){