cnhis-design-vue 0.1.83-beta → 0.1.87-beta

package/packages/multi-chat/components/user-status.vue

@@ -0,0 +1,204 @@
+<template>
+  <div>
+    <a-dropdown
+      v-if="type === 'right-top'"
+      placement="bottomCenter"
+      :getPopupContainer="
+        triggerNode => {
+          return triggerNode.parentNode || document.body;
+        }
+      "
+    >
+      <a-button>
+        <svg-icon v-if="statusIcon" :icon-class="statusIcon" style="font-size: 16px"></svg-icon>
+        <img v-else :src="getImg(status)" height="16" />
+        {{ statusDesc }}
+        <a-icon type="down" />
+      </a-button>
+      <a-menu slot="overlay">
+        <a-menu-item v-for="{ title, status, description, icon } in statusList" :key="status" @click="handleStatusChange(status)">
+          <template v-if="description">
+            <a-tooltip placement="right">
+              <template slot="title">
+                <span>{{ description }}</span>
+              </template>
+              <a>
+                <svg-icon v-if="icon" :icon-class="icon" style="font-size: 16px"></svg-icon>
+
+                <img v-else :src="getImg(status)" height="16" />
+                {{ title }}
+              </a>
+            </a-tooltip>
+          </template>
+          <template v-else
+            ><a>
+              <svg-icon v-if="icon" :icon-class="icon" style="font-size: 16px"></svg-icon>
+
+              <img v-else :src="getImg(status)" height="16" />
+              {{ title }}
+            </a></template
+          >
+        </a-menu-item>
+      </a-menu>
+    </a-dropdown>
+    <template v-else>
+      <div class="status-btn">
+        <svg-icon v-if="statusIcon" :icon-class="statusIcon" style="font-size: 16px"></svg-icon>
+        <img v-else :src="getImg(status)" height="16" />
+        {{ statusDesc }}
+        <a-icon type="right" />
+        <ul class="status-list">
+          <li v-for="{ title, status, description, icon } in statusList" :key="status" @click="handleStatusChange(status)">
+            <template v-if="description">
+              <a-tooltip placement="right">
+                <template slot="title">
+                  <span>{{ description }}</span>
+                </template>
+                <a>
+                  <svg-icon v-if="icon" :icon-class="icon" style="font-size: 16px"></svg-icon>
+
+                  <img v-else :src="getImg(status)" height="16" />
+                  {{ title }}
+                </a>
+              </a-tooltip>
+            </template>
+            <template v-else
+              ><a>
+                <svg-icon v-if="icon" :icon-class="icon" style="font-size: 16px"></svg-icon>
+
+                <img v-else :src="getImg(status)" height="16" />
+                {{ title }}
+              </a></template
+            >
+          </li>
+        </ul>
+      </div>
+    </template>
+  </div>
+</template>
+<script>
+import { Tooltip, Dropdown, Icon, Menu } from 'ant-design-vue';
+import SvgIcon from '@/component/svg/index.vue';
+import fetch, { qs } from '@/utils/chatFetch';
+
+export default {
+  inject: ['i18nText'],
+  components: {
+    [Tooltip.name]: Tooltip,
+    [Dropdown.name]: Dropdown,
+    [Icon.name]: Icon,
+    [Menu.name]: Menu,
+    [Menu.Item.name]: Menu.Item,
+    SvgIcon
+  },
+  props: {
+    type: {
+      type: String,
+      default: 'right-top'
+    },
+    assemblyId: {
+      type: String,
+      require: true
+    },
+    statusList: {
+      type: Array,
+      default: () => []
+    },
+    curStatus: {
+      type: String,
+      default: 'ON-LINE'
+    }
+  },
+  computed: {
+    statusObj() {
+      return this.statusList.find(item => item.status === this.status);
+    },
+    statusIcon() {
+      return this.statusObj?.icon || '';
+    },
+    statusDesc() {
+      return this.statusObj?.title;
+    }
+  },
+  data() {
+    return {
+      status: 'ON-LINE' // 客服状态
+    };
+  },
+  watch: {
+    curStatus(val) {
+      val && (this.status = val);
+    }
+  },
+  methods: {
+    getImg(name) {
+      try {
+        return require(`../img/${name}.png`);
+      } catch {
+        return '';
+      }
+    },
+    handleStatusChange(status) {
+      this.status = status;
+      let params = {
+        assemblyId: this.assemblyId,
+        status
+      };
+      fetch.post('/chat/service/updateServiceState', qs.stringify(params)).then(({ data }) => {
+        if (data.result === 'SUCCESS') {
+          this.$emit('changeStatus', status);
+          this.$message.success(`${this.i18nText('1.9.334')}!`);
+        }
+      });
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+.status-btn {
+  position: relative;
+  padding-right: 10px;
+  height: 26px;
+  line-height: 26px;
+  cursor: pointer;
+  .status-list {
+    position: absolute;
+    right: -85px;
+    bottom: 8px;
+    z-index: 1;
+    display: none;
+    padding: 4px 0;
+    outline: none;
+    list-style-type: none;
+    border-radius: 4px;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, .15);
+    background-color: #fff;
+    transition: all .5s;
+    li {
+      height: 32px;
+      line-height: 32px;
+      padding: 0 16px;
+      display: flex;
+      align-items: center;
+      cursor: pointer;
+      background: #fff;
+      a {
+        padding-right: 8px;
+        color: rgba(0, 0, 0, 0.65);
+      }
+      &:hover {
+        background: #f2f2f2;
+      }
+    }
+  }
+  &:hover {
+    .status-list {
+      display: block;
+    }
+  }
+}
+.dropdown-status {
+  left: 92px !important;
+  top: 706px !important;
+}
+</style>

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

@@ -337,5 +337,8 @@ export default {
   },
   isRecorderVoice(state) {
     return state.isRecorderVoice;
+  },
+  status(state) {
+    return state.status;
   }
 };

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

@@ -262,5 +262,8 @@ export default {
   },
   setUserInfo(state, userInfo) {
     state.userInfo = userInfo;
-  }
+  },
+  setStatus(state, status) {
+    state.status = status;
+  },
 };

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

@@ -102,6 +102,7 @@ export default () => {
     curScrollItem: null,
     isQuickReply: false,
     isRecorderVoice: false,
-    msgRecordCache: {} // 消息已读记录缓存
+    msgRecordCache: {}, // 消息已读记录缓存
+    status: ''
   };
 };

package/packages/table-filter/src/base-search-com/BaseSearch.vue

@@ -8,17 +8,28 @@
               设置
               <!-- {{ $t("1.1.5.3") }} -->
             </a-button>
-            <a-dropdown overlayClassName="viewList-dropdown" v-if="showViewList">
-              <a-button class="viewList-button">
-                <svg-icon :icon-class="'anniuqiehuanmoshi'" style="font-size: 22px"></svg-icon>
-              </a-button>
-              <a-menu slot="overlay">
-                <a-menu-item v-for="(item, index) in viewList" :value="item.id" :key="index" @click="handlerSelectTemp(item.id)" :class="{ 'menu-active': currentTempId === item.id }">
-                  <span>{{ item.name }}</span>
-                  <!-- <a-icon v-if="currentTempId === item.id" type="check" /> -->
-                </a-menu-item>
-              </a-menu>
-            </a-dropdown>
+            <template v-if="showViewList">
+              <a-popover v-model="viewListVisible" placement="bottom" overlayClassName="product-line-popover viewList-popover" >
+                <a-button class="viewList-button">
+                  <svg-icon :icon-class="'anniuqiehuanmoshi'" style="font-size: 22px"></svg-icon>
+                </a-button>
+                <template slot="content">
+                  <ul class="product-line-list">
+                    <li
+                      v-for="(item, index) in viewList"
+                      :value="item.id"
+                      :key="index"
+                      @click="handlerSelectTemp(item.id)"
+                      class="product-line-list-item"
+                      :class="{ 'active': currentTempId === item.id }"
+                    >
+                      <span>{{ item.name }}</span>
+                      <a-icon v-if="currentTempId === item.id" type="check" class="check-icon product-line-check-icon" />
+                    </li>
+                  </ul>
+                </template>
+              </a-popover>
+            </template>
           </div>
           <slot name="classification"></slot>
           <li v-if="isShowSetting('hideQuickSearch') && isRelatedSearchFold" ref="quickSearchLi">
@@ -760,7 +771,8 @@ export default create({
       groupBtnObj: {},
       btnObj: BTNOBJ,
       printBtnStrategys: [], // 打印按钮组策略list
-      outRelationQuickSearch: [] // 关联表 筛选外显
+      outRelationQuickSearch: [], // 关联表 筛选外显
+      viewListVisible: false
     };
   },
   created() {
@@ -1183,6 +1195,7 @@ export default create({
     },
     handlerSelectTemp(e) {
       if (this.currentTempId === e) return;
+      this.viewListVisible = false;
       this.currentTempId = e;
       const tab = e == 0 ? 'bigTable' : null;
       this.$emit('handlerChangeView', e, tab);
@@ -1565,7 +1578,7 @@ export default create({
 
       if (editTableWrapper.options && utils.isPlainObject(editTableWrapper.options.extendParams)) {
         // 有额外的参数
-        this.options?.extendParams && Object.assign(tableParams.form, this.options.extendParams);
+        editTableWrapper.options?.extendParams && Object.assign(tableParams.form, editTableWrapper.options.extendParams);
       }
       const paramsData = Object.assign(tableParams, {
         table: btn
@@ -1773,7 +1786,7 @@ export default create({
       try {
         const print = { formatId, number };
         // 执行打印后置条件
-        const result = await this.postStepRule(printBtn.settingObj, {
+        const result = await this.printConfig.postStepRule(printBtn.settingObj, {
           result: res,
           print: print
         });
@@ -2281,27 +2294,7 @@ export default create({
     }
   }
 }
-.viewList-dropdown {
+.viewList-popover {
   min-width: 120px;
-  .ant-dropdown-menu-item {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    color: #2e2e2e;
-    margin: 1px 0;
-    &:hover {
-      background: #f2f2f2;
-    }
-    > span {
-      display: inline;
-      width: 85%;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      overflow: hidden;
-    }
-  }
-  .ant-dropdown-menu-item.menu-active {
-    color: #2d7aff;
-  }
 }
 </style>

package/packages/table-filter/src/components/table-modal/TableModal.vue

@@ -39,11 +39,11 @@
       <div class="list-title">
         <span class="list-title-item" style="width:6%"></span>
         <span class="list-title-item">
-          父类名称
+          名称
           <!-- {{ $t("1.9.362") }} -->
         </span>
         <span class="list-title-item">
-          名称
+          父类名称
           <!-- {{ $t("1.1.3.1.1") }} -->
         </span>
         <span class="list-title-item">
@@ -73,10 +73,10 @@
               </a-tooltip>
             </span>
             <span :title="item.displayCategory" class="list-content-item">
-              {{ item.displayCategory }}
+              {{ item.name }}
             </span>
             <span :title="item.name" class="list-content-item">
-              {{ item.name }}
+              {{ item.displayCategory }}
             </span>
             <!-- <span v-show="item.type == 'line'" class="list-content-line"
               ><span class="text">{{ item.name }}</span></span

package/packages/table-filter/src/quick-search/QuickSearch.vue

@@ -975,7 +975,7 @@ export default create({
         if (el.setting) {
           // el.seting 可能是 string / object
           el.setting = typeof el.setting == "string" ? JSON.parse(el.setting) : el.setting;
-          if (!this.$utils.isEmpty(el.setting.wordbook)) {
+          if (!vexutils.isEmpty(el.setting.wordbook)) {
             this.$set(el, "con", "QUOTE");
             this.$set(el, "dataSource", []);
             this.$set(el, "QUOTE", []);
@@ -1261,12 +1261,12 @@ export default create({
           if (item.EVALUATEAttr) {
             value = item.selecteds.join("|#|");
           }
-        } else if (item.con == "QUOTE" && !this.$utils.isEmpty(item.value)) {
+        } else if (item.con == "QUOTE" && !vexutils.isEmpty(item.value)) {
           // value = item.QUOTE.join("|#|");
           value = item.value.join("|#|");
-        } else if (!this.$utils.isEmpty(item.CONVERT)) {
+        } else if (!vexutils.isEmpty(item.CONVERT)) {
           value = item.CONVERT.map(item => {
-            if (item && this.$utils.isJSON(item)) {
+            if (item && vexutils.isJSON(item)) {
               return JSON.parse(item);
             }
             return item;
@@ -1301,7 +1301,7 @@ export default create({
 
           // 校验
           if (item.BIRTHDAY.start_val) {
-            let res = this.$utils.validateBirthday(
+            let res = vexutils.validateBirthday(
               item.BIRTHDAY.start_val,
               item.title,
               item.BIRTHDAY.unit
@@ -1309,7 +1309,7 @@ export default create({
             if (!res) return;
           }
           if (item.BIRTHDAY.end_val) {
-            let res = this.$utils.validateBirthday(
+            let res = vexutils.validateBirthday(
               item.BIRTHDAY.end_val,
               item.title,
               item.BIRTHDAY.unit
@@ -1349,7 +1349,7 @@ export default create({
           }
         }
         // 删除字符串前后空格
-        if (value && this.$utils.isString(value)) {
+        if (value && vexutils.isString(value)) {
           value = value.trim();
         }
         let temp = {
@@ -1519,10 +1519,10 @@ export default create({
         if (item.EQ || item.CL) {
           item.EQ = "";
           item.CL = "";
-        } else if (item.con == "QUOTE" && !this.$utils.isEmpty(item.value)) {
+        } else if (item.con == "QUOTE" && !vexutils.isEmpty(item.value)) {
           item.QUOTE = [];
           item.value = [];
-        } else if (!this.$utils.isEmpty(item.CONVERT)) {
+        } else if (!vexutils.isEmpty(item.CONVERT)) {
           item.CONVERT = [];
         } else if (item.DATE) {
           item.showDate = false;