askbot-dragon 1.7.98-beta → 1.8.10-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "askbot-dragon",
-  "version": "1.7.98-beta",
+  "version": "1.8.10-beta",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",

package/src/components/interruptComponents/imageSelectionAnswer.vue

@@ -10,8 +10,9 @@
            :class="disabled || isDisabled ? 'disabledItem' : ''"
       >
         <el-image
-            style="width: 60px!important; height: 60px!important;"
+            style="width: 120px!important; height: 120px!important;"
             :src="item.url"
+            :preview-src-list="previewList(msg.content.options)"
             fit="cover">
         </el-image>
         <div class="checkIcon"
@@ -23,7 +24,7 @@
         </div>
       </div>
     </div>
-    <div class="answerButton" :class="disabled || isDisabled ? 'disabledButton' : ''">
+    <div class="answerButton" :class="disabled || isDisabled || !checkImage ? 'disabledButton' : ''">
       <div class="buttonText"
            v-for="(item,index) in msg.content.handleSettings"
            :key="index"
@@ -63,6 +64,11 @@ export default {
     },
   },
   methods:{
+    previewList(options){
+      let arr = [];
+      arr = options.map(item => item.url)
+      return arr
+    },
     selectImage(item){
       if (this.disabled || this.isDisabled){
         return
@@ -70,7 +76,7 @@ export default {
       this.checkImage = item;
     },
     imageSelectionConfirm(item){
-      if (this.disabled || this.isDisabled){
+      if (this.disabled || this.isDisabled || !this.checkImage){
         return
       }
       this.isDisabled = true;
@@ -135,6 +141,7 @@ export default {
     .buttonText{
       padding: 0 4px;
       cursor: pointer;
+      color: #366aff;
     }
   }
   .disabledItem{
@@ -144,9 +151,8 @@ export default {
   }
 }
 .disabledButton{
-
   .buttonText{
-    color: #A9B3C6;
+    color: #A9B3C6!important;
   }
 }
 </style>

package/src/components/interruptComponents/multipleChoiceAnswer.vue

@@ -11,12 +11,17 @@
             :key="item._metadata.id"
             :disabled="disabled || isDisabled"
         >
-          <el-avatar :size="16" :src="item.url" style="margin-right: 4px;flex: none" v-if="item.url"></el-avatar>
+          <el-image
+              style="width: 32px; height: 32px;margin-right: 4px;flex: none"
+              :src="item.url"
+              v-if="item.url"
+              :preview-src-list="previewList(msg.content.options)"
+              fit="cover" v-if="item.url"></el-image>
           {{ item.text }}
         </el-checkbox>
       </el-checkbox-group>
     </div>
-    <div class="answerButton" :class="disabled || isDisabled ? 'disabledButton' : ''">
+    <div class="answerButton" :class="disabled || isDisabled || checkList.length === 0 ? 'disabledButton' : ''">
       <div class="buttonText"
            v-for="(item,index) in msg.content.handleSettings"
            :key="index"
@@ -50,8 +55,13 @@ export default {
     },
   },
   methods:{
+    previewList(options){
+      let arr = [];
+      arr = options.map(item => item.url)
+      return arr
+    },
     multipleChoiceConfirm(item){
-      if (this.disabled || this.isDisabled){
+      if (this.disabled || this.isDisabled || this.checkList.length === 0){
         return
       }
       this.isDisabled = true;
@@ -69,13 +79,12 @@ export default {
   .multipleList{
     display: flex;
     justify-items: flex-start;
-    border-bottom: 1px solid #EEEEEE;
     padding: 8px 0;
     background-color: #ffffff;
     /deep/.el-checkbox-group{
-      display: flex;
-      align-items: center;
-      flex-direction: column;
+      //display: flex;
+      //align-items: center;
+      //flex-direction: column;
       .el-checkbox{
         margin-right: 0!important;
         margin-bottom: 10px;
@@ -99,6 +108,7 @@ export default {
     .buttonText{
       padding: 0 4px;
       cursor: pointer;
+      color: #366aff;
     }
   }
 }
@@ -112,7 +122,7 @@ export default {
 }
 .disabledButton{
   .buttonText{
-    color: #A9B3C6;
+    color: #A9B3C6!important;
   }
 }
 </style>

package/src/components/outputComponents/outputCom.vue

@@ -0,0 +1,149 @@
+<template>
+  <div class="outputComponents">
+    <div class="outputText" v-if="msg.content.prompt">
+      {{ msg.content.prompt }}
+    </div>
+    <el-table
+        :data="tableData"
+        style="width: 100%"
+        height="250"
+        @selection-change="handleSelectionChange"
+        v-if="msg.content.tableTemplate &&
+        (msg.content.tableTemplate == 1 || msg.content.tableTemplate == 2 || msg.content.tableTemplate == 3)"
+        :header-cell-style="{ backgroundColor: '#F6F8FD', height: '40px', color: '#000000', fontWeight: 400 }"
+        :row-style="{ height: '40px', color: '#000000' }"
+    >
+      <el-table-column
+          type="selection"
+          v-if="msg.content.tableTemplate == 2 || msg.content.tableTemplate == 3"
+          align="center"
+          :selectable="checkSelectable"
+          width="55">
+      </el-table-column>
+      <el-table-column
+          fixed
+          prop="name"
+          label="产品名称"
+          width="150">
+      </el-table-column>
+      <el-table-column
+          prop="number"
+          label="产品编号"
+          align="center"
+          width="120"
+      >
+      </el-table-column>
+      <el-table-column
+          prop="inventory"
+          label="产品库存"
+          align="center"
+          width="80">
+      </el-table-column>
+      <el-table-column
+          prop="consumption"
+          label="今日平均消耗量"
+          align="center"
+          width="120">
+      </el-table-column>
+    </el-table>
+    <div class="handleButton" :class="disabled || isDisabled || selection.length === 0 ? 'disabledButton' : ''">
+      <div class="buttonText"
+           v-for="(item,index) in msg.content.handleSettings"
+           :key="index"
+           @click="confirmFun(item)"
+      >
+        {{ item }}
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "outputCom",
+  data(){
+    return{
+      isDisabled:false,
+      selection:[],
+      tableData:[
+        {
+          name:"正新香辣大鸡排",
+          number:"ZX78OIJ867",
+          inventory:"88",
+          consumption:"24"
+        },
+        {
+          name:"正新香辣大鸡排",
+          number:"ZX78OIJ867",
+          inventory:"88",
+          consumption:"24"
+        },{
+          name:"正新香辣大鸡排",
+          number:"ZX78OIJ867",
+          inventory:"88",
+          consumption:"24"
+        }
+        ,{
+          name:"正新香辣大鸡排",
+          number:"ZX78OIJ867",
+          inventory:"88",
+          consumption:"24"
+        }
+      ]
+    }
+  },
+  props:{
+    msg:{
+      type:Object,
+      default(){
+        return {}
+      }
+    },
+    disabled:{
+      type:Boolean,
+      default:false
+    }
+  },
+  methods:{
+    checkSelectable(){
+      return !this.disabled && !this.isDisabled
+    },
+    handleSelectionChange(val){
+      this.selection = val;
+    },
+    confirmFun(item){
+      if (this.disabled || this.isDisabled || this.selection.length == 0){
+        return
+      }
+      this.isDisabled = true;
+      this.$emit('confirmFun',item,this.selection,this.msg)
+    }
+  }
+};
+</script>
+
+<style scoped lang="less">
+.outputComponents{
+  .outputText{
+    padding-bottom: 10px;
+  }
+  .handleButton{
+    padding-top: 10px;
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-top: 1px solid #EEEEEE;
+    .buttonText{
+      padding: 0 4px;
+      cursor: pointer;
+      color: #366aff;
+    }
+  }
+  .disabledButton {
+    .buttonText {
+      color: #A9B3C6 !important;
+    }
+  }
+}
+</style>