cnhis-design-vue 2.0.13 → 2.0.14

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

@@ -157,20 +157,20 @@
               <a-row>
                 <a-col>
                   <span style="display: inline-block;width: 70px;">PC:</span>
-                  <a-checkbox :value="item.value" v-for="(item, index) in toolbarList.filter(item => item.source === 'PC')" :key="index">
+                  <a-checkbox @change="toolbarChange(item, $event)" :value="item.value" v-for="(item, index) in toolbarList.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 toolbarList.filter(item => item.source === 'MOBILE')" :key="index">
+                  <a-checkbox @change="toolbarChange(item, $event)" :value="item.value" v-for="(item, index) in toolbarList.filter(item => item.source === 'MOBILE')" :key="index">
                     {{ item.label }}
                   </a-checkbox>
                 </a-col>
               </a-row>
             </a-checkbox-group>
           </a-form-item>
-          <a-form-item :label="i18nText('1.9.699')" v-if="closedToolbarList.length > 0">
+          <a-form-item :label="i18nText('1.9.699')" v-if="toolbarList.length > 0">
             <a-checkbox-group v-decorator="[`closedToolbar`]">
               <a-row>
                 <a-col>
@@ -401,7 +401,6 @@ export default {
       functionList: [], // 服务端功能下拉列表
       clientFunctionList: [], // 客户端功能下拉列表
       toolbar: [],
-      closedToolbar: [],
       toolbarList: [],
       closedToolbarList: [],
       queryTimeSetting: [],
@@ -547,7 +546,6 @@ export default {
         robotObj,
         robotSetting,
         toolbar = [],
-        closedToolbar = [],
         isListClassify,
         listClassify = [],
         rightClickSetting = [],
@@ -577,7 +575,6 @@ export default {
       });
       this.fillClientSetting(clientSetting);
       this.fillToolbar(toolbar);
-      this.fillClosedToolbar(closedToolbar);
       this.fillQueryTimeSetting(queryTimeSetting);
       this.fillBroadcast(broadcast);
       this.fillTabBar(setting.tabBarSetting);
@@ -642,7 +639,19 @@ export default {
       this.toolbarList = toolbar.map(item => ({
         label: item.name,
         value: item.name + '-' + item.source,
-        source: item.source
+        source: item.source,
+        isClosedAble: item.isClosedAble,
+        isChecked: item.isChecked,
+        isCloseChecked: item.isCloseChecked
+      }));
+      const btwList = toolbar.filter(item => item.isClosedAble == "Y" && item.isChecked == "Y");
+      this.closedToolbarList = btwList.map(item => ({
+        label: item.name,
+        value: item.name + '-' + item.source,
+        source: item.source,
+        isClosedAble: item.isClosedAble,
+        isChecked: item.isChecked,
+        isCloseChecked: item.isCloseChecked
       }));
       this.toolbar = toolbar;
       let toolbarChecked = toolbar.reduce((result, item) => {
@@ -654,17 +663,9 @@ export default {
       this.$nextTick(() => {
         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);
+      let closedToolbarChecked = this.closedToolbarList.reduce((result, item) => {
+        if (item.isCloseChecked === 'Y') {
+          result.push(item.label + '-' + item.source);
         }
         return result;
       }, []);
@@ -672,6 +673,20 @@ export default {
         this.form.setFieldsValue({ closedToolbar: closedToolbarChecked });
       });
     },
+    toolbarChange(item, e) {
+      const checked = e.target.checked;
+      let checkedItemIndex = -1;
+      this.closedToolbarList.forEach((itm, index) => {
+        if (item.source == itm.source && item.value == itm.value) {
+          checkedItemIndex = index;
+        }
+      })
+      if (checked && checkedItemIndex == -1 && (item.isClosedAble == "Y" && item.isChecked == "Y")) {
+        this.closedToolbarList.push(item);
+      } else if (!checked && checkedItemIndex != -1) {
+        this.closedToolbarList.splice(checkedItemIndex, 1);
+      }
+    },
     fillTabBar(data) {
       const mobileSetting = {
         isChecked: 'N',
@@ -850,7 +865,6 @@ 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);
@@ -941,7 +955,7 @@ export default {
     },
     handleToolbar(setting, values) {
       if (this.toolbarList.length === 0) return;
-      let { toolbar } = values;
+      let { toolbar, closedToolbar } = values;
       let clone = JSON.parse(JSON.stringify(this.toolbar));
       setting.toolbar = clone.reduce((result, item) => {
         if (toolbar.includes(item.name + '-' + item.source)) {
@@ -949,19 +963,10 @@ export default {
         } else {
           item.isChecked = 'N';
         }
-        result.push(item);
-        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';
+          item.isCloseChecked = 'Y';
         } else {
-          item.isChecked = 'N';
+          item.isCloseChecked = 'N';
         }
         result.push(item);
         return result;