cnhis-design-vue 2.0.2 → 2.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "2.0.2",
+  "version": "2.0.5",
   "description": "前端业务UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",
@@ -52,6 +52,7 @@
     "vue-infinite-scroll": "^2.0.2",
     "vue-resize-directive": "^1.2.0",
     "vue-simple-uploader": "^0.7.6",
+    "vue-xss": "^1.0.4",
     "vuedraggable": "^2.24.3",
     "vxe-table": "^3.4.1",
     "vxe-table-plugin-antd": "^1.11.3",
@@ -85,7 +86,8 @@
     "vue": "^2.6.14",
     "vue-router": "^3.5.1",
     "vue-template-compiler": "^2.6.14",
-    "webpack-node-externals": "^3.0.0"
+    "webpack-node-externals": "^3.0.0",
+    "webpack-ssh-deploy": "^1.2.3"
   },
   "browserslist": [
     "> 1%",

package/packages/big-table/src/BigTable.vue

@@ -147,6 +147,7 @@
 
 <script>
 import Vue from 'vue';
+import VueXss from "vue-xss";
 import TextOverTooltip from './components/TextOverTooltip.vue';
 import { Icon, Tooltip, Progress, Switch, Popover, Button, Dropdown, Menu, Checkbox, Input, Popconfirm } from 'ant-design-vue';
 import format from './utils/format';
@@ -197,6 +198,7 @@ export default create({
       .use(Checkbox)
       .use(Input)
       .use(DomPortal);
+    !this.$xss && Vue.use(VueXss);
   },
   mounted() {
     this.bindDocumentClick();
@@ -375,7 +377,17 @@ export default create({
       this.loadColumn(config);
     },
     data(value) {
-      this.loadData(value);
+      const list = value.map(v => {
+        const newV = {};
+        for (let i in v) {
+          newV[i] = JSON.parse(JSON.stringify(v[i] || ""));
+          if (newV[i] && typeof v[i] === "string") {
+            newV[i] = this.$xss(v[i]);
+          }
+        }
+        return newV;
+      });
+      this.loadData(list);
     },
     quickSearchConfig: {
       handler: function() {

package/packages/editor/src/Editor.vue

@@ -10,6 +10,8 @@
  */
 import create from '@/core/create';
 import E from 'wangeditor';
+import Vue from 'vue';
+import VueXss from "vue-xss";
 
 const colors = ['#ff0000'];
 export default create({
@@ -41,6 +43,9 @@ export default create({
       newHtml: ''
     };
   },
+  beforeCreate() {
+    !this.$xss && Vue.use(VueXss);
+  },
   mounted() {
     // 每次实例都生成唯一的id
     this.editorWrapId = this.randomId();
@@ -126,7 +131,7 @@ export default create({
       this.$emit('input', res);
     },
     setContent(content) {
-      this.editor.txt.html(content);
+      this.editor.txt.html((content && this.$xss(content)) || '');
     },
     appendContent(content) {
       this.editor.txt.append(content);

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

@@ -21,7 +21,7 @@
                 <span class="right-time">
                   {{ formatDate(item.createdTime || item.sendTime, true) }}
                 </span>
-                <p class="content" v-html="item.content.content"></p>
+                <p class="content" v-html="$xss(item.content.content)"></p>
               </div>
               <div v-else-if="item.content.type === 1" style="margin-bottom: 20px;" class="upload-image content-wrap">
                 <span class="right-time">

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

@@ -93,7 +93,7 @@
                       'has-intention': item.intentionList && item.intentionList.length
                     }"
                   >
-                    <p v-html="item.content.content"></p>
+                    <p v-html="$xss(item.content.content)"></p>
                     <template v-if="item.content.attachments && item.content.attachments.length > 0">
                       <div v-for="(v, index) in item.content.attachments" :key="index" class="robot-item">
                         <a v-if="v.type == 1" :href="v.url" target="_blank"> {{ v.desc }}(超链) </a>

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

@@ -26,7 +26,7 @@
                 <span class="name">{{ getName(item) }}</span>
                 <span class="time">{{ formatDate(item.sendTime || item.createdTime, true) }}</span>
               </div>
-              <div class="content" v-if="item.content.type === 0" v-html="item.content.content"></div>
+              <div class="content" v-if="item.content.type === 0" v-html="$xss(item.content.content)"></div>
               <MsgPicture v-if="item.content.type === 1" :image="item.content.content" style="width:160px;" @click="show(item.content.content)" />
               <template v-else-if="item.content.type === 4">
                 <div v-if="isSystemMsg(item)" class="system-msg">

package/packages/multi-chat/chat/mixins/base.js

@@ -1,5 +1,7 @@
 import ChatStore from '../../store';
 import { mapMutations } from '../../store/helper';
+import VueXss from "vue-xss";
+import Vue from 'vue'
 
 export default {
   provide() {
@@ -12,6 +14,9 @@ export default {
       i18nText: this.i18nText
     };
   },
+  beforeCreate() {
+    !this.$xss && Vue.use(VueXss);
+  },
   props: {
     getI18nText: {
       type: Function

package/packages/multi-chat/setting/sessionList/messageRecord.vue

@@ -17,7 +17,7 @@
                 {{ formatDate(item.sendTime || item.createdTime, true) }}
               </span>
             </div>
-            <div class="content" v-if="item.content.type === 0" v-html="item.content.content"></div>
+            <div class="content" v-if="item.content.type === 0" v-html="$xss(item.content.content)"></div>
             <MsgPicture v-if="item.content.type === 1" :image="item.content.content" style="width:160px;" @click="show(item.content.content)" />
             <p class="content" v-else-if="item.content.type === 2">
               <img style="width:16px;" src="../../img/video_consult.png" />

package/packages/select-person/select-person.vue

@@ -44,7 +44,7 @@
             checkable
             :expandedKeys="expandedKeys"
             :autoExpandParent="autoExpandParent"
-            :checkStrictly="true"
+            :checkStrictly="false"
             :selectable="false"
             :treeData="treeData.temp"
             :load-data="getLoadChildData"
@@ -326,17 +326,12 @@ export default create({
         return checked && item.type == 2;
       });
       let deptItems = this.dataList.dept.filter(item => {
-        let { isLeaf, key } = item;
-        let parentId = this.getParentId(item);
+        let { key } = item;
         let showKeys = [...this.checkedKeys.dept, ...otherItems];
         let checked = showKeys.includes(key);
-        // 父级全选，子级不展示
-        /** String(parentId) 类型不相等 */
-        if (isLeaf && parentId && this.checkedKeys.dept.some(v => v == parentId)) {
-          checked = false;
-        }
+        // 只展示最后一级的科室
         item.itemType = 'dept';
-        return checked && item.type == 1;
+        return checked && item.type == 1 && (!item.children || (item.children && !item.children.length));
       });
       let roleItems = this.dataList.role.filter(item => {
         let showKeys = [...this.checkedKeys.role, ...otherItems];
@@ -347,12 +342,12 @@ export default create({
       if (this.selectType === 'multiple') {
         deptItems.forEach(item => {
           if (item.title) {
-            item.title = item.title.includes('科室') ? item.title : `${item.title}（科室）`;
+            item.title = item.title.includes('（科室）') ? item.title : `${item.title}（科室）`;
           }
         });
         roleItems.map(item => {
           if (item.title) {
-            item.title = item.title.includes('角色') ? item.title : `${item.title}（角色）`;
+            item.title = item.title.includes('（角色）') ? item.title : `${item.title}（角色）`;
           }
           return item;
         });
@@ -381,13 +376,13 @@ export default create({
     }
   },
   watch: {
-    defaultList: {
-      immediate: true,
-      handler(val) {
-        if (!val) return;
-        this.initDefault();
-      }
-    },
+    // defaultList: {
+    //   immediate: true,
+    //   handler(val) {
+    //     if (!val) return;
+    //     this.initDefault();
+    //   }
+    // },
     selectType: {
       immediate: true,
       handler(val) {
@@ -400,9 +395,7 @@ export default create({
       immediate: true,
       handler() {
         this.staticDataInit();
-        if (['dept'].includes(this.selectType)) {
-          this.staticDeptAndRoleDataInit();
-        }
+        this.staticDeptAndRoleDataInit();
         const key = { person: 'main', dept: 'dept', role: 'role', multiple: 'main' }[this.selectType];
         this.treeData.temp = this.treeData[key];
       }
@@ -410,20 +403,16 @@ export default create({
     roleData: {
       immediate: true,
       handler() {
-        if (['multiple', 'role'].includes(this.selectType)) {
-          this.staticDeptAndRoleDataInit();
-          const key = { person: 'main', dept: 'dept', role: 'role', multiple: 'main' }[this.selectType];
-          this.treeData.temp = this.treeData[key];
-        }
+        this.staticDeptAndRoleDataInit();
+        const key = { person: 'main', dept: 'dept', role: 'role', multiple: 'main' }[this.selectType];
+        this.treeData.temp = this.treeData[key];
       }
-    },
-    checkedTreeItem(val) {
-      this.$emit('check', [...val, ...this.defaultShowList]);
     }
   },
   created() {},
   mounted() {
     this.getUsers();
+    this.initDefault();
   },
   methods: {
     initDefault() {
@@ -431,7 +420,14 @@ export default create({
         this.getDefaultList();
       } else {
         this.$nextTick(() => {
-          this.checkedKeys.main = [...this.defaultList];
+          const userIds = this.defaultList.filter(item => item.itemType === 'person').map(item => item.id);
+          const deptIds = this.defaultList.filter(item => item.itemType === 'dept').map(item => item.id);
+          const roleIds = this.defaultList.filter(item => item.itemType === 'role').map(item => item.id);
+          const key = ['main', 'dept', 'role'][this.typeActiveIndex];
+          this.checkedKeys.main = userIds;
+          this.checkedKeys.dept = deptIds;
+          this.checkedKeys.role = roleIds;
+          this.checkedKeys.temp = this.checkedKeys[key];
         });
       }
     },
@@ -844,13 +840,13 @@ export default create({
         this.searchChecked = checked;
       }
       this.checkAll(checked ? 1 : 2);
+      this.handleOk();
     },
     // type 1 全选 2 反选(清空)
     checkAll(type) {
       if (this.checkAllSearchTree(type)) return false;
       const key = ['main', 'dept', 'role'][this.typeActiveIndex];
       if (type == 1) {
-        console.log(key, this[`dataList${key.slice(0, 1).toUpperCase()}${key.slice(1)}Keys`], 'dqee2');
         this.expandedKeys = [];
         this.checkedKeys[key] = this[`dataList${key.slice(0, 1).toUpperCase()}${key.slice(1)}Keys`]; // dataListMainKeys dataListDeptKeys dataListRoleKeys;
         this.checkedKeys.temp = this.checkedKeys[key];
@@ -1036,8 +1032,12 @@ export default create({
       this.removedCheckedkeysDept(removedTag);
       this.removedCheckedkeysRole(removedTag);
       this.removedCheckedkeysOther(removedTag);
-
+      const propStr = ['person', 'dept', 'role'][this.typeActiveIndex];
+      const checkedKeys = this.checkedTreeItem.filter(item => item.itemType === propStr).map(item => item.key);
+      this.checkedKeys.temp = checkedKeys;
+      this.handleEmitValue();
       this.refreshSearchTree();
+      this.isAllCheck(checkedKeys);
     },
 
     removeCheckedkeysIncludeChildren(parentKey) {
@@ -1068,12 +1068,27 @@ export default create({
         }
       }
     },
+    removeCheckedkeysIncludeChildrenDept(parentKey) {
+      let needRemoveChildKeys = this.dataList.dept
+        .filter(i => {
+          let parentId = this.getParentId(i);
+          return parentId == parentKey || i.key == parentKey;
+        })
+        .map(i => {
+          return i.key;
+        });
+      const checkedKeys = this.checkedKeys.dept.filter(i => {
+        return !needRemoveChildKeys.includes(i);
+      });
+      this.checkedKeys.dept = checkedKeys;
+    },
     removedCheckedkeysDept(tag) {
       let checkedKeys = this.checkedKeys.dept;
       let parentId = this.getParentId(tag);
       for (let i = 0; i < checkedKeys.length; i++) {
+        console.log(tag, checkedKeys[i], parentId, 'forfor');
         if (tag.key == checkedKeys[i] && tag.key == parentId) {
-          this.removeCheckedkeysIncludeChildren(tag.key);
+          this.removeCheckedkeysIncludeChildrenDept(tag.key);
           return false;
         } else if (tag.key == checkedKeys[i]) {
           checkedKeys.splice(i, 1);
@@ -1171,6 +1186,7 @@ export default create({
       // let subList = [...submitData, ...this.defaultShowList];
 
       this.$emit('pubCheckedTreeItem', [...this.checkedTreeItem, ...this.defaultShowList]);
+      this.$emit('check', [...this.checkedTreeItem, ...this.defaultShowList]);
       this.$emit('handleOk', this.checkedLeafKeys);
       this.$emit('change', this.checkedLeafKeys, [...submitData, ...this.defaultShowList]);
       this.$emit('submitData', [...submitData, ...this.defaultShowList]);
@@ -1293,33 +1309,34 @@ export default create({
       // 处理全选框
       this.isAllCheck(checkedKeys);
     },
-    onTreeCheck({ checked: checkedKeys }, { checked, node }) {
-      // 断掉了父子关系 要不然当存在一二级科室的时候 搜索二级科室 再选中会把一级也选中
+    onTreeCheck(checkedKeys, { checked, node }) {
+      // 断掉了父子关系 要不然当存在一二级科室的时候 搜索二级科室 再选中会把一级也选中 ； 后续与产品沟通 不需要断 只取最后一级科室
       const propStr = ['main', 'dept', 'role'][this.typeActiveIndex];
       let totalCheckedKeys = [];
       const childKeys = [];
       // const keyData = this.dataList[propStr].find(item => item.key === node.eventKey);
-      let keyData = {};
-      vexutils.searchTree(this.treeData[propStr], item => {
-        if (item.key === node.eventKey) {
-          keyData = item;
-        }
-      });
-      vexutils.searchTree(keyData.children, item => {
-        childKeys.push(item.key);
-      });
-      if (checked) {
-        const singleCheckedKeys = this.getSingleCheckedKeys(propStr, this.treeData[propStr], keyData);
-        totalCheckedKeys = this.isSingleCheck ? singleCheckedKeys : [...new Set(checkedKeys.concat(childKeys))];
-      } else {
-        // totalCheckedKeys = checkedKeys;
-        totalCheckedKeys = this.isSingleCheck ? [] : checkedKeys.filter(key => !childKeys.includes(key));
-      }
-      this.checkedKeys.temp = totalCheckedKeys;
-      this.checkedKeys[propStr] = totalCheckedKeys;
-      this.isAllCheck(totalCheckedKeys);
-      this.isSearchAllCheck(totalCheckedKeys);
-      this.handleEmitValue();
+      // let keyData = {};
+      // vexutils.searchTree(this.treeData[propStr], item => {
+      //   if (item.key === node.eventKey) {
+      //     keyData = item;
+      //   }
+      // });
+      // vexutils.searchTree(keyData.children, item => {
+      //   childKeys.push(item.key);
+      // });
+      // if (checked) {
+      //   const singleCheckedKeys = this.getSingleCheckedKeys(propStr, this.treeData[propStr], keyData);
+      //   totalCheckedKeys = this.isSingleCheck ? singleCheckedKeys : [...new Set(checkedKeys.concat(childKeys))];
+      // } else {
+      //   // totalCheckedKeys = checkedKeys;
+      //   totalCheckedKeys = this.isSingleCheck ? [] : checkedKeys.filter(key => !childKeys.includes(key));
+      // }
+      this.checkedKeys.temp = checkedKeys;
+      this.checkedKeys[propStr] = checkedKeys;
+      this.isAllCheck(checkedKeys);
+      this.isSearchAllCheck(checkedKeys);
+      this.$emit('pubCheckedTreeItem', [...this.checkedTreeItem, ...this.defaultShowList]);
+      this.$emit('check', [...this.checkedTreeItem, ...this.defaultShowList]);
     },
     getSingleCheckedKeys(propStr, treeData, keyData) {
       const firstTreeData = deepTraversalFirst(keyData) || [];