askbot-dragon 1.6.21-beta → 1.6.21

package/src/components/receiverMessagePlatform.vue

@@ -1,26 +1,27 @@
 <template>
     <div class="">
-        <span v-if="messagePlateform == 'IM'">
-            与
-            <span :class="payload.newSession.receiverId == userId ? '':'text_color'">
-                {{payload.newSession.receiverId == userId ? '您': payload.newSession.receiverDisplayInfo.name}}
-            </span>
-            建立对话
-        </span>
-        <span v-if="messagePlateform == 'BOT'">
-            与机器人【
-                <span class="text_color">{{payload.newSession.receiverDisplayInfo.name}}</span>
-            】建立对话
-        </span>
-        <span v-if="messagePlateform == 'oldTransfer'">
-            您将会话转接给&nbsp;&nbsp;<span class="text_color">{{payload.newSession.receiverDisplayInfo.name}}</span>
-        </span>
-        <span v-if="messagePlateform == 'newTransfer'">
-            <span class="text_color">{{payload.oldSession.receiverDisplayInfo.name}}</span>&nbsp;&nbsp;将会话转接给您
+      <span v-if="messagePlateform == 'IM'">
+        {{ $t('dragonCommon.establishConversationWith') }}
+        <span :class="payload.newSession.receiverId == userId ? '': 'text_color'">
+          {{ payload.newSession.receiverId == userId ? $t('dragonCommon.you') : payload.newSession.receiverDisplayInfo.name }}
         </span>
+        {{ $t('dragonCommon.establishConversationWith') }}
+      </span>
+      <span v-if="messagePlateform == 'BOT'">
+        {{ $t('dragonCommon.establishConversationWith') }}
+        <span class="text_color">{{ $t('dragonCommon.bot') }}【{{ payload.newSession.receiverDisplayInfo.name }}】</span>
+        {{ $t('dragonCommon.establishConversationWith') }}
+      </span>
+      <span v-if="messagePlateform == 'oldTransfer' && (isShow == true || isShow === null)">
+        {{ $t('dragonCommon.transferTo') }}
+        &nbsp;&nbsp;<span class="text_color">{{ payload.newSession.receiverDisplayInfo.name }}</span>
+      </span>
+      <span v-if="messagePlateform == 'newTransfer' && (isShow == true || isShow === null)">
+        <span class="text_color">{{ payload.oldSession.receiverDisplayInfo.name }}</span>
+        &nbsp;&nbsp;{{ $t('dragonCommon.transferFrom') }}
+      </span>
     </div>
-</template>
-
+  </template>
 <script>
 //  客服 的接入消息展示
 export default {
@@ -29,7 +30,7 @@ export default {
 
         }
     },
-    props:['source','payload','userId'],
+    props:['source','payload','userId', 'isShow'],
     computed: {
         messagePlateform() {
             if(this.payload) {
@@ -55,7 +56,10 @@ export default {
                 }
             }
         }
-    }
+    },
+    mounted() {
+      this.$i18n.locale = sessionStorage.getItem("systemLanguage") || 'cn';
+    },
 }
 </script>
 

package/src/components/recommend.vue

@@ -67,10 +67,10 @@ export default {
       }
     }
     .recommend-item{
-      padding: 8px 0;
+      padding: 4px 0;
     }
     .last-item{
-      padding-top: 8px;
+      padding-top: 4px;
     }
     .end{
       border-bottom-left-radius: 25px !important;

package/src/components/senderMessagePlatform.vue

@@ -1,26 +1,31 @@
 <template>
     <div class="">
-        <span v-if="messagePlateform == 'IM'">
-            IM人工&nbsp;&nbsp;<span class="text_color">{{payload.newSession.receiverDisplayInfo.name}}</span>&nbsp;&nbsp;将为您服务
-        </span>
-        <span v-if="messagePlateform == 'BOT'">
-            <span class="text_color">{{payload.newSession.receiverDisplayInfo.name}}</span>&nbsp;&nbsp;将为您服务
-        </span>
-        <span v-if="messagePlateform == 'Transfer'">
-            <span class="text_color">{{payload.oldSession.receiverDisplayInfo.name}}</span>&nbsp;&nbsp;将会话转接给&nbsp;&nbsp;<span class="text_color">{{payload.newSession.receiverDisplayInfo.name}}</span>
-        </span>
+      <span v-if="messagePlateform == 'IM'">
+        {{ $t('dragonCommon.imService') }}&nbsp;&nbsp;
+        <span class="text_color">{{ payload.newSession.receiverDisplayInfo.name }}</span>&nbsp;&nbsp;
+        {{ $t('dragonCommon.willServeYou') }}
+      </span>
+      <span v-if="messagePlateform == 'BOT'">
+        <span class="text_color">{{ payload.newSession.receiverDisplayInfo.name }}</span>&nbsp;&nbsp;
+        {{ $t('dragonCommon.willServeYou') }}
+      </span>
+      <span v-if="messagePlateform == 'Transfer' && (isShow === true || isShow === null)">
+        <span class="text_color">{{ payload.oldSession.receiverDisplayInfo.name }}</span>&nbsp;&nbsp;
+        {{ $t('dragonCommon.transferTo') }}&nbsp;&nbsp;
+        <span class="text_color">{{ payload.newSession.receiverDisplayInfo.name }}</span>
+      </span>
     </div>
-</template>
+  </template>
 
 <script>
 //  咨询者的接入消息展示
 export default {
     data() {
         return {
-
+            
         }
     },
-    props:['source','payload'],
+    props:['source','payload', 'isShow'],
     computed: {
         messagePlateform() {
             if(this.payload) {
@@ -40,7 +45,10 @@ export default {
                 }
             }
         }
-    }
+    },
+    mounted() {
+      this.$i18n.locale = sessionStorage.getItem("systemLanguage") || 'cn';
+    },
 }
 </script>
 

package/src/components/tree.vue

@@ -1,34 +1,34 @@
 <template>
   <div id="tree">
     <div class="tree-header">
-      <span class="cacel" @click="cancelBtn">取消</span>
-      <span class="primary" @click="saveData">确认</span>
+      <span class="cacel" @click="cancelBtn">{{$t('dragonCommon.cancel')}}</span>
+      <span class="primary" @click="saveData">{{$t('dragonCommon.confirm')}}</span>
     </div>
     <div class="tree-input" v-if="setCascadeOption && setCascadeOption.length > 0">
-      <el-input
-          placeholder="请搜索"
-          v-model="filterText"
-      >
+      <el-input placeholder="请搜索" v-model="filterText">
       </el-input>
     </div>
     <div class="tree-container">
-      <el-tree :data="setCascadeOption"
-               :props="defaultProps"
-               ref="dataTree"
-               node-key="value"
-               :expand-on-click-node="false"
-               :filter-node-method="filterNode"
-      >
-       <span class="custom-tree-node" slot-scope="{ node,data}" @click="nodeClick(data)">
-        <span class="tree-label">{{ node.label }}</span>
-        <span>
-           <el-checkbox v-model="data.checked" v-if="dataOptions.extInfo.selectType ==='多选'"></el-checkbox>
-          <el-radio v-model="checked" v-else :label="data.value"></el-radio>
+      <el-tree :data="setCascadeOption" :props="defaultProps" ref="dataTree" node-key="value"
+        :expand-on-click-node="false" :filter-node-method="filterNode">
+        <span class="custom-tree-node" slot-scope="{ node,data}" @click="nodeClick(data)">
+          <span class="tree-label">{{ node.label }}</span>
+          <span>
+            <template v-if="webHookCascader">
+              <el-checkbox :disabled="data.children && data.children.length !== 0" v-model="data.checked"
+                v-if="dataOptions.extInfo.selectType === '多选'"></el-checkbox>
+              <el-radio :disabled="data.children && data.children.length !== 0" v-model="checked" v-else
+                :label="data.value"></el-radio>
+            </template>
+            <template v-else>
+              <el-checkbox v-model="data.checked" v-if="dataOptions.extInfo.selectType === '多选'"></el-checkbox>
+              <el-radio v-model="checked" v-else :label="data.value"></el-radio>
+            </template>
+          </span>
         </span>
-      </span>
       </el-tree>
     </div>
-<!--    <div class="footer">
+    <!--    <div class="footer">
       <el-button>取 消</el-button>
       <el-button type="primary" @click="saveData">确 认</el-button>
     </div>-->
@@ -39,67 +39,67 @@
 /* eslint-disable */
 export default {
   name: "tree",
-  data(){
-    return{
-      defaultProps:{
-        label:"label",
-        value:"value"
+  data () {
+    return {
+      defaultProps: {
+        label: "label",
+        value: "value"
       },
-      checked:'',
+      checked: '',
       // dataTree:[],
-      checkList:[],
-      checkDatas:[],
-      filterText:""
+      checkList: [],
+      checkDatas: [],
+      filterText: ""
     }
   },
-  props:["dataOptions","fieldValue"],
-  methods:{
-    saveData(){
+  props: ["dataOptions", "fieldValue", "webHookCascader"],
+  methods: {
+    saveData () {
       this.checkList = []
-       this.checkDatas = []
-       this.ergodicData(this.setCascadeOption,this.checkList)
-      this.$emit('saveData',this.checkList,this.checkDatas)
+      this.checkDatas = []
+      this.ergodicData(this.setCascadeOption, this.checkList)
+      this.$emit('saveData', this.checkList, this.checkDatas)
     },
-    cancelBtn(){
-       this.$emit('cancelBtn')
+    cancelBtn () {
+      this.$emit('cancelBtn')
     },
-    ergodicData(list){
-      list.forEach(item=>{
-        if (this.dataOptions.extInfo.selectType === '多选'){
-          if (item.checked){
+    ergodicData (list) {
+      list.forEach(item => {
+        if (this.dataOptions.extInfo.selectType === '多选') {
+          if (item.checked) {
             let data = this.$refs.dataTree.getNode(item)
             let checkList = []
-            let arr = this.serchParent(data,checkList)
+            let arr = this.serchParent(data, checkList)
             this.checkList.push(arr)
             this.checkDatas.push(item)
           }
         }
-       else {
-          if (item.value === this.checked){
+        else {
+          if (item.value === this.checked) {
             let data = this.$refs.dataTree.getNode(item)
             let checkList = []
-            let arr = this.serchParent(data,checkList)
+            let arr = this.serchParent(data, checkList)
             this.checkList = arr
             this.checkDatas = [item]
           }
         }
-        if (item.children){
+        if (item.children) {
           this.ergodicData(item.children)
         }
       })
     },
-    serchParent(node,list) {
-      if(node) {
-        if(Object.prototype.toString.call(node.data) == '[object Object]') {
+    serchParent (node, list) {
+      if (node) {
+        if (Object.prototype.toString.call(node.data) == '[object Object]') {
           list.unshift(node.data.value)
         }
-        if(node.parent) {
-          list = this.serchParent(node.parent,list)
+        if (node.parent) {
+          list = this.serchParent(node.parent, list)
         }
       }
       return list
     },
-    filterNode(value, data, node) {
+    filterNode (value, data, node) {
       if (!value) return true;
       let upperCase = value.toUpperCase()
       let lowerCase = value.toLowerCase()
@@ -109,55 +109,58 @@ export default {
       }
       return data.label.indexOf(value) !== -1 || data.label.indexOf(upperCase) !== -1 || data.label.indexOf(lowerCase) !== -1 || serchFlag;
     },
-    nodeClick(data,node){
-      if (this.dataOptions.extInfo.selectType !== '多选'){
+    nodeClick (data, node) {
+      if(this.webHookCascader && data.children && data.children.length != 0) {
+        return
+      }
+      if (this.dataOptions.extInfo.selectType !== '多选') {
         this.ergodicCascade(this.setCascadeOption)
       } else {
-        this.$set(data,'checked',!data.checked)
+        this.$set(data, 'checked', !data.checked)
       }
-      if (this.dataOptions.extInfo.selectType !== '多选'){
+      if (this.dataOptions.extInfo.selectType !== '多选') {
         this.checked = data.value;
       }
     },
-    ergodicCascade(list){
-      list.forEach(item=>{
+    ergodicCascade (list) {
+      list.forEach(item => {
         item.checked = false;
-        if (item.children){
+        if (item.children) {
           this.ergodicCascade(item.children)
         }
       })
     },
   },
   computed: {
-    dataTree() {
+    dataTree () {
       let arr = []
-      if (this.dataOptions.extInfo.cascadeDown && this.dataOptions.extInfo.cascadeDown.options){
+      if (this.dataOptions.extInfo.cascadeDown && this.dataOptions.extInfo.cascadeDown.options) {
         arr = this.dataOptions.extInfo.cascadeDown.options
       }
-      else if (this.dataOptions.extInfo.cascade){
+      else if (this.dataOptions.extInfo.cascade) {
         arr = this.dataOptions.extInfo.cascade
       }
-      else if (this.dataOptions.extInfo.cascadeDown && this.dataOptions.extInfo.cascadeDown[0]){
+      else if (this.dataOptions.extInfo.cascadeDown && this.dataOptions.extInfo.cascadeDown[0]) {
         arr = this.dataOptions.extInfo.cascadeDown[0].options
       }
       return arr
     },
     //规则中限制极限的选项
-    setCascadeOption(){
+    setCascadeOption () {
       let options = [];
-      let  arr = []
-      if (this.dataOptions.extInfo && (this.dataOptions.extInfo.cascadeDown || this.dataOptions.extInfo.cascade)){
+      let arr = []
+      if (this.dataOptions.extInfo && (this.dataOptions.extInfo.cascadeDown || this.dataOptions.extInfo.cascade)) {
         arr = this.dataOptions.extInfo.cascadeDown && this.dataOptions.extInfo.cascadeDown.options ? this.dataOptions.extInfo.cascadeDown.options :
-            (this.dataOptions.extInfo.cascadeDown && this.dataOptions.extInfo.cascadeDown[0] ? this.dataOptions.extInfo.cascadeDown[0].options :
-                (this.dataOptions.extInfo.cascade ?  this.dataOptions.extInfo.cascade: []));
+          (this.dataOptions.extInfo.cascadeDown && this.dataOptions.extInfo.cascadeDown[0] ? this.dataOptions.extInfo.cascadeDown[0].options :
+            (this.dataOptions.extInfo.cascade ? this.dataOptions.extInfo.cascade : []));
       }
-      if (this.dataOptions.extInfo && this.dataOptions.extInfo.dependent && JSON.stringify(this.dataOptions.extInfo.dependent)!=='{}'){
-        for (let k in this.dataOptions.extInfo.dependent){
-          if (Array.isArray(this.fieldValue[k]) && Array.isArray(this.fieldValue[k][0])){
-            this.fieldValue[k].forEach(item=>{
-              this.dataOptions.extInfo.dependent[k].filterStruct.forEach(filter=>{
-                if (filter.input === item || item[item.length - 1] == filter.input){
-                  if (!options){
+      if (this.dataOptions.extInfo && this.dataOptions.extInfo.dependent && JSON.stringify(this.dataOptions.extInfo.dependent) !== '{}') {
+        for (let k in this.dataOptions.extInfo.dependent) {
+          if (Array.isArray(this.fieldValue[k]) && Array.isArray(this.fieldValue[k][0])) {
+            this.fieldValue[k].forEach(item => {
+              this.dataOptions.extInfo.dependent[k].filterStruct.forEach(filter => {
+                if (filter.input === item || item[item.length - 1] == filter.input) {
+                  if (!options) {
                     options = []
                   }
                   options = options.concat(filter.output)
@@ -167,28 +170,28 @@ export default {
           }
           else {
             console.log(this.dataOptions.extInfo.dependent[k].filterStruct);
-            this.dataOptions.extInfo.dependent[k].filterStruct.forEach(filter=>{
-              if (this.fieldValue[k] && (filter.input === this.fieldValue[k] || this.fieldValue[k][this.fieldValue[k].length - 1] == filter.input)){
+            this.dataOptions.extInfo.dependent[k].filterStruct.forEach(filter => {
+              if (this.fieldValue[k] && (filter.input === this.fieldValue[k] || this.fieldValue[k][this.fieldValue[k].length - 1] == filter.input)) {
                 options = filter.output;
 
               }
             })
           }
         }
-        const initCascade = (arr, parent)=>{
-          return JSON.parse(JSON.stringify(arr)).filter(item =>{
-            if (item.children){
+        const initCascade = (arr, parent) => {
+          return JSON.parse(JSON.stringify(arr)).filter(item => {
+            if (item.children) {
               item.children = initCascade(item.children, item)
             }
             let flag = null
             for (let i = 0; i < options.length; i++) {
               const optArr = options[i];
               item.checked = false;
-              if(optArr.indexOf(item.value) !== -1) {
-                if(parent === null || item.children && item.children.length != 0) {
+              if (optArr.indexOf(item.value) !== -1) {
+                if (parent === null || item.children && item.children.length != 0) {
                   flag = true
-                } else if(parent && optArr.indexOf(parent.value) !== -1 &&
-                    (Math.abs(optArr.indexOf(parent.value) - optArr.indexOf(item.value)) === 1 )) {
+                } else if (parent && optArr.indexOf(parent.value) !== -1 &&
+                  (Math.abs(optArr.indexOf(parent.value) - optArr.indexOf(item.value)) === 1)) {
                   flag = true
                 }
               }
@@ -196,17 +199,17 @@ export default {
             return flag && item
           })
         }
-        arr = initCascade(arr,null)
+        arr = initCascade(arr, null)
       }
       else {
         return arr
       }
-      console.debug('options',arr)
+      console.debug('options', arr)
       return arr
     },
   },
-  watch:{
-    filterText(val) {
+  watch: {
+    filterText (val) {
       this.$refs.dataTree.filter(val);
     }
   }
@@ -227,14 +230,16 @@ export default {
 </script>
 
 <style scoped lang="less">
-#tree{
+#tree {
   height: 100%;
   overflow: hidden;
-  /deep/.el-tree-node__content{
+
+  /deep/.el-tree-node__content {
     height: 38px;
     line-height: 38px;
   }
-  .tree-header{
+
+  .tree-header {
     height: 30px;
     display: flex;
     align-items: center;
@@ -243,41 +248,49 @@ export default {
     width: calc(100% - 40px);
     /*font-size: 14px;*/
     padding-bottom: 20px;
-    .primary{
+
+    .primary {
       color: #366aff;
       cursor: pointer;
     }
-    .cacel{
+
+    .cacel {
       color: #969799;
       cursor: pointer;
     }
   }
-  .tree-input{
+
+  .tree-input {
     width: calc(100% - 20px);
     margin: 0 10px 10px 10px;
   }
-  .tree-container{
-    height:260px;
+
+  .tree-container {
+    height: 260px;
     overflow-y: scroll;
     overflow-x: hidden;
   }
-  .custom-tree-node{
+
+  .custom-tree-node {
     display: flex;
     align-items: center;
     justify-content: space-between;
     width: calc(100% - 40px);
     font-size: 14px;
-    .tree-label{
+
+    .tree-label {
       max-width: 100%;
       overflow: hidden;
       text-overflow: ellipsis;
       white-space: nowrap;
     }
-    /deep/.el-radio__label{
+
+    /deep/.el-radio__label {
       display: none;
     }
   }
-  .footer{
+
+  .footer {
     position: absolute;
     bottom: 0;
     height: 60px;
@@ -286,10 +299,10 @@ export default {
     justify-content: space-between;
     width: calc(100% - 40px);
     margin: 0 20px;
-    .el-button{
+
+    .el-button {
       flex: 1;
       border-radius: 9px;
     }
   }
-}
-</style>
+}</style>

package/src/components/utils/AliyunIssUtil.js

@@ -1,4 +1,25 @@
-const OSS = require('ali-oss');
+// const OSS = require('ali-oss');
+const OSS = window.OSS
+
+const getPrivateOssConfig = () => {
+  let mainSource = sessionStorage.getItem('_mainSource') ? sessionStorage.getItem('_mainSource') : "askbot";
+  switch (mainSource) {
+    case "askbot":
+      return {
+        region: "oss-cn-zhangjiakou",
+        accessKeyId: "LTAI4G3QtdEdwkEbihBngAsK",
+        accessKeySecret: "OwgdVfc5PeCkIgqIdug660xmiSPchn",
+        bucket: "guoranopen-zjk",
+      }
+    case "lishi":
+      return {
+        region: "oss-ap-southeast-1",
+        accessKeyId: "LTAI5tAusPLDNJJwkvUbqi2T",
+        accessKeySecret: "xqPVaunOIbvTe3g9qsXal2IZO6RftK",
+        bucket: "askbotopen-ls",
+      };
+  }
+}
 
 let IDX = 256, HEX = [], SIZE = 256, BUFFER;
 while (IDX--) HEX[IDX] = (IDX + 256).toString(16).substring(1);
@@ -35,12 +56,12 @@ function pathGenerate(filename) {
 }
 
 
- function upload(ossConfig, data) {
-  let ossClient = new OSS(ossConfig);
+function upload(data) {
+  let ossClient = new OSS(getPrivateOssConfig());
   // object-key可以自定义为文件名（例如file.txt）或目录（例如abc/test/file.txt）的形式，实现将文件上传至当前Bucket或Bucket下的指定目录。
   let objectKey = pathGenerate(data.name);
-  let result =  ossClient.put(objectKey, data,  {
-    headers:{
+  let result = ossClient.put(objectKey, data, {
+    headers: {
       // 通过文件URL访问文件时，指定以附件形式下载文件，下载后的文件名称定义为example.jpg。
       'Content-Disposition': `attachment; filename="${encodeURIComponent(data.name)}"`
     },
@@ -49,13 +70,13 @@ function pathGenerate(filename) {
   return result;
 }
 
- function multipartUpload(ossConfig, data, callback,extCallback) {
-  let ossClient = new OSS(ossConfig);
+function multipartUpload(data, callback, extCallback) {
+  let ossClient = new OSS(getPrivateOssConfig());
   // object-key可以自定义为文件名（例如file.txt）或目录（例如abc/test/file.txt）的形式，实现将文件上传至当前Bucket或Bucket下的指定目录。
   let objectKey = pathGenerate(data.name);
 
-  let res =  ossClient.multipartUpload(objectKey, data,  {
-    headers:{
+  let res = ossClient.multipartUpload(objectKey, data, {
+    headers: {
       // 通过文件URL访问文件时，指定以附件形式下载文件，下载后的文件名称定义为example.jpg。
       'Content-Disposition': `attachment; filename="${encodeURIComponent(data.name)}"`
     },
@@ -63,14 +84,15 @@ function pathGenerate(filename) {
       console.debug('progress callback', p, checkpoint);
       // 断点记录点。浏览器重启后无法直接继续上传，您需要手动触发上传操作。
       if (callback && callback instanceof Function) {
-        callback(p, checkpoint,data,extCallback);
+        callback(p, checkpoint, data, extCallback);
       }
     }
   })
-   return res;
+  return res;
 }
 
-function ossFileUrl(ossConfig, path, cname) {
+function ossFileUrl(path, cname) {
+  let ossConfig = getPrivateOssConfig();
   if (cname == null) {
     return 'https://' + ossConfig.bucket + '.' + ossConfig.region + '.aliyuncs.com/' + path;
   } else {
@@ -78,4 +100,4 @@ function ossFileUrl(ossConfig, path, cname) {
   }
 }
 
-export {upload, multipartUpload, ossFileUrl}
+export { upload, multipartUpload, ossFileUrl }