cnhis-design-vue 2.0.10 → 2.0.13

package/packages/multi-chat/chat/scrollList.vue

@@ -224,7 +224,8 @@ export default {
       'setCurScrollItem',
       'setDisableOperate',
       'setClassify',
-      'setOfflineSessionStatistic'
+      'setOfflineSessionStatistic',
+      'setClosedSession'
     ]),
     ...mapMutations({
       clearMsgList: 'setMsgList'
@@ -449,6 +450,7 @@ export default {
       this.setLastClassify(this.classify);
       this.setLastCurrentTab(this.currentTab);
       this.setCurScrollItem(item);
+      this.setClosedSession(this.type === 'end');
       switch (this.type) {
         case 'queue':
           this.accessChat(item);

package/packages/multi-chat/setting/baseInfo/index.vue

@@ -148,7 +148,7 @@
               </template>
             </a-table>
           </a-form-item>
-          <a-form-item :label="i18nText('1.9.423')" v-if="toolbarList.length > 0">
+          <a-form-item :label="i18nText('1.9.698')" v-if="toolbarList.length > 0">
             <!-- <a-checkbox-group
               :options="toolbarList"
               v-decorator="[`toolbar`]"
@@ -170,6 +170,24 @@
               </a-row>
             </a-checkbox-group>
           </a-form-item>
+          <a-form-item :label="i18nText('1.9.699')" v-if="closedToolbarList.length > 0">
+            <a-checkbox-group v-decorator="[`closedToolbar`]">
+              <a-row>
+                <a-col>
+                  <span style="display: inline-block;width: 70px;">PC:</span>
+                  <a-checkbox :value="item.value" v-for="(item, index) in closedToolbarList.filter(item => item.source === 'PC')" :key="index">
+                    {{ item.label }}
+                  </a-checkbox>
+                </a-col>
+                <a-col>
+                  <span style="display: inline-block;width: 70px;">MOBILE:</span>
+                  <a-checkbox :value="item.value" v-for="(item, index) in closedToolbarList.filter(item => item.source === 'MOBILE')" :key="index">
+                    {{ item.label }}
+                  </a-checkbox>
+                </a-col>
+              </a-row>
+            </a-checkbox-group>
+          </a-form-item>
         </div>
         <div class="functional-module" v-if="isListClassify !== 'Y' && !isStaff">
           <span class="title">{{ i18nText('1.9.424') }}</span>
@@ -383,7 +401,9 @@ export default {
       functionList: [], // 服务端功能下拉列表
       clientFunctionList: [], // 客户端功能下拉列表
       toolbar: [],
+      closedToolbar: [],
       toolbarList: [],
+      closedToolbarList: [],
       queryTimeSetting: [],
       queryTimeSettingList: [],
       serviceState: [],
@@ -527,6 +547,7 @@ export default {
         robotObj,
         robotSetting,
         toolbar = [],
+        closedToolbar = [],
         isListClassify,
         listClassify = [],
         rightClickSetting = [],
@@ -556,6 +577,7 @@ export default {
       });
       this.fillClientSetting(clientSetting);
       this.fillToolbar(toolbar);
+      this.fillClosedToolbar(closedToolbar);
       this.fillQueryTimeSetting(queryTimeSetting);
       this.fillBroadcast(broadcast);
       this.fillTabBar(setting.tabBarSetting);
@@ -633,6 +655,23 @@ export default {
         this.form.setFieldsValue({ toolbar: toolbarChecked });
       });
     },
+    fillClosedToolbar(closedToolbar) {
+      this.closedToolbarList = closedToolbar.map(item => ({
+        label: item.name,
+        value: item.name + '-' + item.source,
+        source: item.source
+      }));
+      this.closedToolbar = closedToolbar;
+      let closedToolbarChecked = closedToolbar.reduce((result, item) => {
+        if (item.isChecked === 'Y') {
+          result.push(item.name + '-' + item.source);
+        }
+        return result;
+      }, []);
+      this.$nextTick(() => {
+        this.form.setFieldsValue({ closedToolbar: closedToolbarChecked });
+      });
+    },
     fillTabBar(data) {
       const mobileSetting = {
         isChecked: 'N',
@@ -811,6 +850,7 @@ export default {
         let setting = {};
         this.handleTimeSetting(setting, values);
         this.handleToolbar(setting, values);
+        this.handleClosedToolbar(setting, values);
         this.handleQueryTimeSetting(setting, values);
         this.handleClassify(setting);
         let validate = this.handleServiceSetting(setting, values);
@@ -913,6 +953,20 @@ export default {
         return result;
       }, []);
     },
+    handleClosedToolbar(setting, values) {
+      if (this.closedToolbarList.length === 0) return;
+      let { closedToolbar } = values;
+      let clone = JSON.parse(JSON.stringify(this.closedToolbar));
+      setting.closedToolbar = clone.reduce((result, item) => {
+        if (closedToolbar.includes(item.name + '-' + item.source)) {
+          item.isChecked = 'Y';
+        } else {
+          item.isChecked = 'N';
+        }
+        result.push(item);
+        return result;
+      }, []);
+    },
     /* 客户端设置 */
     handleClientSetting(setting, values) {
       if (this.isListClassify === 'Y') return;

package/packages/multi-chat/store/getters.js

@@ -230,6 +230,9 @@ export default {
   isServer(state) {
     return state.isServer;
   },
+  closedSession(state) {
+    return state.closedSession;
+  },
   clientParams(state, getters) {
     return Object.assign({}, getters.accessParams, state.clientParams);
   },

package/packages/multi-chat/store/mutation.js

@@ -170,6 +170,9 @@ export default {
   setIsServer(state, isServer) {
     state.isServer = isServer;
   },
+  setClosedSession(state, closedSession) {
+    state.closedSession = closedSession;
+  },
   setClientParams(state, clientParams) {
     state.clientParams = clientParams;
   },

package/packages/multi-chat/store/state.js

@@ -76,6 +76,7 @@ export default () => {
     statusTitle: '',
     sessionEnd: false,
     isServer: false,
+    closedSession: false,
 
     // 客户端参数
     clientParams: {},

package/packages/scale-view/formitem/r-choice.vue

@@ -11,7 +11,7 @@
         v-for="(o, i) in curOptions"
         class="choice-radio"
         :value="o[choiceUseKey]"
-        :key="o.key + i"
+        :key="o.key + i + o.label"
         :class="{ 'block-radio': !item.setting.isHorizontal }"
         :disabled="isLock"
         :style="{ color: choiceColor(o) }"
@@ -24,18 +24,26 @@
             </div>
           </span>
         </template>
-         <template>
-            <template v-if="isRadioItem && showPreSuffix(o)">
-              <span v-if="o.prefix" class="prefix-span" :style="{ color: choiceColor(o) }">{{ o.prefix }}</span>
-              <a-input
-                v-model="optionsPreSuffixObj[o.key]"
-                :disabled="isLock || inputLock"
-                @change="inputPreSuffixChange(o, i)"
-                :style="{ color: choiceColor(o) }"
-                placeholder="请输入"
-              />
-              <span v-if="o.suffix" class="suffix-span"  :style="{ color: choiceColor(o) }">{{ o.suffix }}</span>
-            </template>
+        <template>
+          <template v-if="isRadioItem && showPreSuffix(o)">
+            <span
+              v-if="o.prefix"
+              class="prefix-span"
+              :style="{ color: choiceColor(o) }"
+            >{{ o.prefix }}</span>
+            <a-input
+              v-model="optionsPreSuffixObj[o.key]"
+              :disabled="isLock || inputLock"
+              @change="inputPreSuffixChange(o, i)"
+              :style="{ color: choiceColor(o) }"
+              placeholder="请输入"
+            />
+            <span
+              v-if="o.suffix"
+              class="suffix-span"
+              :style="{ color: choiceColor(o) }"
+            >{{ o.suffix }}</span>
+          </template>
           <span v-else :style="{ color: choiceColor(o) }">{{ o.label }}</span>
           <a-input
             v-if="o.importability"
@@ -58,7 +66,7 @@
       <a-checkbox
         class="choice-checkbox"
         v-for="(o, i) in curOptions"
-        :key="o.key + i"
+        :key="o.key + i + o.label"
         :value="o[choiceUseKey]"
         :class="{ 'block-checkbox': !item.setting.isHorizontal }"
         :disabled="isLock"
@@ -74,7 +82,11 @@
         </template>
         <template>
           <template v-if="isCheckboxItem && showPreSuffix(o)">
-            <span v-if="o.prefix" class="prefix-span" :style="{ color: choiceColor(o) }">{{ o.prefix }}</span>
+            <span
+              v-if="o.prefix"
+              class="prefix-span"
+              :style="{ color: choiceColor(o) }"
+            >{{ o.prefix }}</span>
             <a-input
               v-model="optionsPreSuffixObj[o.key]"
               :disabled="isLock || inputLock"
@@ -82,11 +94,17 @@
               :style="{ color: choiceColor(o) }"
               placeholder="请输入"
             />
-            <span v-if="o.suffix" class="suffix-span" :style="{ color: choiceColor(o) }">{{ o.suffix }}</span>
+            <span
+              v-if="o.suffix"
+              class="suffix-span"
+              :style="{ color: choiceColor(o) }"
+            >{{ o.suffix }}</span>
           </template>
-          <span v-else style="white-space: initial;" :style="{ color: choiceColor(o) }">
-            {{ o.label }}
-          </span>
+          <span
+            v-else
+            style="white-space: initial;"
+            :style="{ color: choiceColor(o) }"
+          >{{ o.label }}</span>
           <a-input
             v-if="o.importability"
             v-model="othersText"
@@ -95,7 +113,7 @@
             @change="inputCheckboxChange"
             placeholder="请输入"
           />
-      </template>
+        </template>
       </a-checkbox>
     </a-checkbox-group>
     <a-select
@@ -111,10 +129,8 @@
       :filterOption="filterOption"
       :notFoundContent="fetching ? undefined : '暂无数据'"
     >
-    <a-spin v-if="fetching" slot="notFoundContent" size="small" />
-      <a-select-option v-for="(v, i) in curOptions" :key="i" :value="v.value">
-        {{ v[showField] }}
-      </a-select-option>
+      <a-spin v-if="fetching" slot="notFoundContent" size="small" />
+      <a-select-option v-for="(v, i) in curOptions" :key="i" :value="v.value">{{ v[showField] }}</a-select-option>
     </a-select>
     <a-cascader
       v-else-if="cloneItem.type == 'SEARCH_CASCADE'"
@@ -147,14 +163,14 @@
  *  getSearchOptions 关键字检索的 function
  *  getCascadeOptions 获取级联数据的 furnction
  */
-import { Select, Input, Radio, Checkbox, Cascader } from "ant-design-vue";
-import { judgeTypes } from "../mixin/judgeTypes";
+import { Select, Input, Radio, Checkbox, Cascader } from 'ant-design-vue';
+import { judgeTypes } from '../mixin/judgeTypes';
 // import format from "@/components/table/mixins/format";
 // import TextOverTooltip from "./text-over-tooltip/TextOverTooltip.vue";
-import utils from "@/utils/utils-map";
+import utils from '@/utils/utils-map';
 import axios from 'axios';
 import 'viewerjs/dist/viewer.css';
-import { component as Viewer } from "v-viewer";
+import { component as Viewer } from 'v-viewer';
 export default {
   mixins: [judgeTypes],
   props: {
@@ -175,7 +191,7 @@ export default {
       type: Function,
       default: () => Promise.resolve([])
     },
-    openType: { type: String, default: "" }
+    openType: { type: String, default: '' }
   },
   components: {
     Viewer,
@@ -186,7 +202,7 @@ export default {
     [Radio.name]: Radio,
     [Radio.Group.name]: Radio.Group,
     [Select.name]: Select,
-    [Select.Option.name]: Select.Option,
+    [Select.Option.name]: Select.Option
   },
   computed: {
     choiceValue: {
@@ -194,32 +210,32 @@ export default {
         return this.value ? this.value : undefined;
       },
       set(val) {
-        this.$emit("input", val);
+        this.$emit('input', val);
       }
     },
     choiceUseKey() {
-      if (this.item.type === "RADIO_BLOCK" || this.item.type === "CHECKBOX_BLOCK") return "key";
-      return "value";
+      if (this.item.type === 'RADIO_BLOCK' || this.item.type === 'CHECKBOX_BLOCK') return 'key';
+      return 'value';
     },
     choiceColor() {
-      return function(p) {
-        let color = p.color || "rgba(0, 0, 0, 0.65)";
+      return function (p) {
+        let color = p.color || 'rgba(0, 0, 0, 0.65)';
         return `${color} !important`;
       };
     },
     showImgWrap() {
-      return function(o) {
+      return function (o) {
         return !o.prefix && !o.suffix && o.imageUrl;
       };
     },
     isRadioItem() {
-      return this.item.type === "RADIO_BLOCK";
+      return this.item.type === 'RADIO_BLOCK';
     },
     isCheckboxItem() {
-      return this.item.type === "CHECKBOX_BLOCK";
+      return this.item.type === 'CHECKBOX_BLOCK';
     },
     showPreSuffix() {
-      return function(o) {
+      return function (o) {
         return o.prefix || o.suffix;
       };
     }
@@ -234,12 +250,12 @@ export default {
         if (this.isEvaluation(value.type)) {
           options = value.scoreConfigs?.scoreRules || [];
         }
-        if (value.type === "RADIO_BLOCK" || value.type === "EVALUATE_RADIO_BLOCK") {
+        if (value.type === 'RADIO_BLOCK' || value.type === 'EVALUATE_RADIO_BLOCK') {
           const defVal = value.dbValue || value.setting.defaultValue || this.value;
           this.handleRadioDef(value, defVal, options);
           return;
         }
-        if (value.type === "CHECKBOX_BLOCK" || value.type === "EVALUATE_CHECKBOX_BLOCK") {
+        if (value.type === 'CHECKBOX_BLOCK' || value.type === 'EVALUATE_CHECKBOX_BLOCK') {
           let defVal = [];
           if (utils.isJSON(value.setting.defaultValue)) {
             defVal = JSON.parse(value.setting.defaultValue);
@@ -249,11 +265,7 @@ export default {
           this.handleCheckboxDef(value, value.dbValue || defVal, options);
           return;
         }
-        if (
-          value.type == "SELECT" ||
-          value.type == "SEARCH_CASCADE" ||
-          value.type === "EVALUATE_SELECT"
-        ) {
+        if (value.type == 'SELECT' || value.type == 'SEARCH_CASCADE' || value.type === 'EVALUATE_SELECT') {
           this.cloneItem = JSON.parse(JSON.stringify(value));
           let options = this.cloneItem.options || [];
           if (this.isEvaluation(value.type)) {
@@ -267,18 +279,18 @@ export default {
   },
   data() {
     return {
-      selectParams: { tableType: "TABLE_LIST", pageSize: 20, page: 1 },
-      cascaderParams: { tableType: "TABLE_LIST" },
+      selectParams: { tableType: 'TABLE_LIST', pageSize: 20, page: 1 },
+      cascaderParams: { tableType: 'TABLE_LIST' },
       cloneItem: {},
-      columnName: "", // 取值字段
-      showField: "", // 显示字段
-      curvalue: "",
+      columnName: '', // 取值字段
+      showField: '', // 显示字段
+      curvalue: '',
       curCheckboxValue: [],
-      othersText: "",
+      othersText: '',
       curOptions: [],
       fieldList: [],
       buttonList: [],
-      source: "guageChoice",
+      source: 'guageChoice',
       fetching: false,
       previewImages: [],
       optionsPreSuffixObj: {}
@@ -289,7 +301,7 @@ export default {
       this.curOptions = this.handleOptions(options, item.type);
       if (!options.length || !curValue) return;
       // 测评单选回显
-      if (item.type === "EVALUATE_RADIO_BLOCK") {
+      if (item.type === 'EVALUATE_RADIO_BLOCK') {
         this.curvalue = curValue;
         this.radioChange();
         return;
@@ -310,7 +322,7 @@ export default {
       });
       if (!preSuffixItem) {
         this.othersText = curValue;
-        this.curvalue = "other";
+        this.curvalue = 'other';
       }
       this.radioChange();
     },
@@ -340,14 +352,14 @@ export default {
       if (curValue === v.value) return v.key;
       if (isCheckbox && hasOther) {
         this.othersText = curValue;
-        return "other";
+        return 'other';
       }
     },
     async handleCheckboxDef(item, curValue, options) {
       this.curOptions = this.handleOptions(options, item.type);
       if (!options.length || !curValue || !curValue.length) return;
       // 测评多选回显
-      if (item.type === "EVALUATE_CHECKBOX_BLOCK") {
+      if (item.type === 'EVALUATE_CHECKBOX_BLOCK') {
         this.curCheckboxValue = curValue;
         this.handleCheckboxOther();
         return;
@@ -357,13 +369,13 @@ export default {
         i = 0,
         x,
         len = curValue.length;
-      let hasOther = options.some(v => v.importability || v.key === "other");
+      let hasOther = options.some(v => v.importability || v.key === 'other');
       for (; i < len; i++) {
         x = curValue[i];
-        if (x === "其他") {
+        if (x === '其他') {
           this.othersText = x;
-          this.curvalue = "other";
-          !resArr.includes("other") && resArr.push("other");
+          this.curvalue = 'other';
+          !resArr.includes('other') && resArr.push('other');
           continue;
         }
         let matchIndex = options.findIndex(v => v.value === x);
@@ -399,7 +411,7 @@ export default {
         othersText: this.othersText,
         optionsPreSuffixObj: this.optionsPreSuffixObj
       };
-      this.$emit("radioChange", this.curvalue, this.item, choiceObj);
+      this.$emit('radioChange', this.curvalue, this.item, choiceObj);
     },
     checkboxChange() {
       this.handleCheckboxOther();
@@ -409,8 +421,8 @@ export default {
         othersText: this.othersText,
         optionsPreSuffixObj: this.optionsPreSuffixObj
       };
-      this.curvalue = "other";
-      this.$emit("radioChange", "other", this.item, choiceObj);
+      this.curvalue = 'other';
+      this.$emit('radioChange', 'other', this.item, choiceObj);
     },
     inputPreSuffixChange(o, i) {
       this.curvalue = o.key;
@@ -418,7 +430,7 @@ export default {
         othersText: this.othersText,
         optionsPreSuffixObj: this.optionsPreSuffixObj
       };
-      this.$emit("radioChange", this.curvalue, this.item, choiceObj);
+      this.$emit('radioChange', this.curvalue, this.item, choiceObj);
     },
     inputPreSuffixCheckboxChange(o, i) {
       let choiceObj = {
@@ -429,7 +441,7 @@ export default {
         this.curCheckboxValue.push(o.key);
       }
       let curCheckboxValue = JSON.parse(JSON.stringify(this.curCheckboxValue));
-      this.$emit("checkboxChange", curCheckboxValue, this.item, choiceObj);
+      this.$emit('checkboxChange', curCheckboxValue, this.item, choiceObj);
     },
     inputCheckboxChange() {
       this.handleCheckboxOther(true);
@@ -439,23 +451,23 @@ export default {
         othersText: this.othersText,
         optionsPreSuffixObj: this.optionsPreSuffixObj
       };
-      if (isOtherInput && !this.curCheckboxValue.includes("other")) {
-        this.curCheckboxValue.push("other");
+      if (isOtherInput && !this.curCheckboxValue.includes('other')) {
+        this.curCheckboxValue.push('other');
       }
       let curCheckboxValue = JSON.parse(JSON.stringify(this.curCheckboxValue));
-      this.$emit("checkboxChange", curCheckboxValue, this.item, choiceObj);
+      this.$emit('checkboxChange', curCheckboxValue, this.item, choiceObj);
     },
     async initSelectOptions() {
       // 分享链接的量表用 optionType 1：静态，2：动态，3：动态转静态
       const { targetSource, type, options = [], optionType = 1 } = this.cloneItem;
-      this.showField = "label";
+      this.showField = 'label';
       if (!targetSource?.target_id) return;
       // 动态数据源转静态数据
-      if (type == "SELECT" && (options.length || optionType == 3)) {
+      if (type == 'SELECT' && (options.length || optionType == 3)) {
         this.curOptions = options;
         return;
       }
-      if(type === "SELECT") {
+      if (type === 'SELECT') {
         this.fetching = true;
         this.curOptions = await this.getSelectOptions(this.cloneItem);
         this.fetching = false;
@@ -474,10 +486,10 @@ export default {
     },
     // 下拉组件查询列表数据配置
     findDetails({ target_id, values, primaryField, relationField, showField }) {
-      const url = "/tableList/getDetail";
+      const url = '/tableList/getDetail';
       const params = {
         tableId: target_id,
-        tableType: "TABLE_LIST"
+        tableType: 'TABLE_LIST'
       };
       this.columnName = values;
       this.showField = showField || values;
@@ -485,16 +497,16 @@ export default {
         const { detailAutograph, tableId, fieldList = [], buttonList = [] } = data.map;
         const { type } = this.cloneItem;
         fieldList.forEach(item => {
-          item.attrType = (item.settingObj && item.settingObj.attr) || "";
+          item.attrType = (item.settingObj && item.settingObj.attr) || '';
         });
         this.fieldList = fieldList;
         this.buttonList = buttonList;
-        if (type == "SELECT") {
+        if (type == 'SELECT') {
           Object.assign(this.selectParams, {
             autograph: detailAutograph,
             tableId
           });
-        } else if (type == "SEARCH_CASCADE") {
+        } else if (type == 'SEARCH_CASCADE') {
           Object.assign(this.cascaderParams, {
             autograph: detailAutograph,
             tableId,
@@ -507,7 +519,7 @@ export default {
     },
     // 下拉组件查询列表字段值
     findTableData({ values, keyword }) {
-      const url = "/tableReader/getTableData";
+      const url = '/tableReader/getTableData';
       delete this.selectParams.keyword;
       if (keyword) {
         Object.assign(this.selectParams, { keyword });
@@ -520,7 +532,7 @@ export default {
             value: row[values]
           });
         });
-        let optionsList = this.uniqArrObj(options, "value");
+        let optionsList = this.uniqArrObj(options, 'value');
         optionsList = this.formatData({
           tableList: optionsList,
           fieldList: this.fieldList,
@@ -533,7 +545,7 @@ export default {
     },
     // 级联组件查询列表数据
     findCascader({ values }) {
-      const url = "/tableReader/getTableData";
+      const url = '/tableReader/getTableData';
       return axios.post(url, this.$qs.stringify(this.cascaderParams)).then(({ data }) => {
         const { rows } = data.map;
         this.curOptions = this.initTreeData(rows, values);
@@ -558,27 +570,30 @@ export default {
     uniqArrObj(arr, name) {
       let obj = {};
       return arr.reduce((cur, next) => {
-        obj[next[name]] ? "" : (obj[next[name]] = true && cur.push(next));
+        obj[next[name]] ? '' : (obj[next[name]] = true && cur.push(next));
         return cur;
       }, []);
     },
     // 下拉组件搜索
-   async handleSearch(value) {
-     try {
-      this.curOptions = await this.getSearchOptions({
-        values: this.columnName,
-        showField: this.showField,
-        keyword: value
-      }, this.cloneItem);
-      console.log(this.curOptions,'curOptions')
-     } catch (error) {
-       console.log(error)
-     }
+    async handleSearch(value) {
+      try {
+        this.curOptions = await this.getSearchOptions(
+          {
+            values: this.columnName,
+            showField: this.showField,
+            keyword: value
+          },
+          this.cloneItem
+        );
+        console.log(this.curOptions, 'curOptions');
+      } catch (error) {
+        console.log(error);
+      }
     },
     // 下拉组件选值
     handleSelectChange(value) {
       let res = {
-        value: "",
+        value: '',
         list: []
       };
       let matchItem;
@@ -601,13 +616,13 @@ export default {
           res.list.push(matchItem);
         }
       }
-      this.$emit("change", res);
+      this.$emit('change', res);
     },
     filterOption(input, option) {
       return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0;
     },
     getPopupContainer(triggerNode) {
-      if(this.openType == 'formIframe') {
+      if (this.openType == 'formIframe') {
         return document.body;
       }
       return triggerNode.parentNode;