cnhis-design-vue 0.2.45-beta → 0.2.48-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "0.2.45-beta",
+  "version": "0.2.48-beta",
   "description": "基于 Ant Desgin Vue 的UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",
@@ -42,7 +42,7 @@
     "stompjs": "^2.3.3",
     "text-security": "^3.2.1",
     "trtc-js-sdk": "^4.11.4",
-    "v-viewer": "1.5.1",
+    "v-viewer": "^1.5.1",
     "video.js": "^7.8.4",
     "vue-dom-portal": "^0.1.6",
     "vue-highlightjs": "^1.3.3",
@@ -50,8 +50,8 @@
     "vue-resize-directive": "^1.2.0",
     "vue-simple-uploader": "^0.7.6",
     "vuedraggable": "^2.24.3",
-    "vxe-table-plugin-antd": "^1.11.3",
     "vxe-table": "^3.4.1",
+    "vxe-table-plugin-antd": "^1.11.3",
     "wangeditor": "^4.7.5",
     "xe-utils": "^3.4.0"
   },

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

@@ -248,6 +248,9 @@ export default {
     },
     isShowPortraitPanel: {
       type: Boolean
+    },
+    activatedTime: {
+      type: Number
     }
   },
   data() {
@@ -392,7 +395,7 @@ export default {
       if (!matchItem) return 3;
       if (!+matchItem.value) return 3;
       return +matchItem.value;
-    }
+    },
   },
   created() {
     this.attachEvent();
@@ -501,7 +504,7 @@ export default {
         if (!target) return;
         let top = target.scrollHeight;
         if (scrollTo === 'current') {
-          top = target.scrollHeight - this.scrollHeight;
+         top = target.scrollHeight - this.scrollHeight;
         }
         target.scrollTo({
           left: 0,
@@ -1043,6 +1046,9 @@ export default {
         }
       }
     },
+    activatedTime(value) {
+      this.setScrollTo('bottom');
+    },
     /**
      * 图片懒加载处理
      */

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

@@ -183,7 +183,7 @@
       <a-row style="width: 100%;height: 100%;overflow: hidden;">
         <a-col :span="mainSpan" style="height: 100%;position: relative">
           <a-layout>
-            <chat-main :isShowPortraitPanel="isShowPortraitPanel" :hideHeader="hideHeader">
+            <chat-main :isShowPortraitPanel="isShowPortraitPanel" :hideHeader="hideHeader" v-bind="$attrs">
               <a-alert v-if="reConnention >= 60" type="warning" message="网络质量不佳，请检查网络后重试！" show-icon>
                 <a-icon type="exclamation-circle" slot="icon" />
               </a-alert>

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

@@ -1041,15 +1041,18 @@ export default create({
               'div',
               {
                 directives: [
-                  {
-                    name: 'drag-move',
-                    value: {
-                      target: 'ant-modal-confirm-body'
+                    {
+                      name: 'drag-move',
+                      value: {
+                        target: 'ant-modal-confirm-body'
+                      }
                     }
-                  }
-                ]
+                  ],
+                  domProps: {
+                innerHTML: settingObj.tipsMsg || `是否确认${btn.name}`
+              }
               },
-              settingObj.tipsMsg || `是否确认${btn.name}`
+              // settingObj.tipsMsg || `是否确认${btn.name}`
             ),
             okText: '确定',
             cancelText: '取消',

package/packages/table-filter/src/components/search-condition/SearchCondition.vue

@@ -222,7 +222,7 @@
         </div>
       </div>
     </div>
-    <SearchFilter v-bind="$attrs" :visible="relationVisible" @saveAdd="relationSave" @cancelSaveAdd="relationCancel" :actionList_prop="relationAction" :searchFieldList="relationSearchFieldList" />
+    <SearchFilter v-bind="$attrs" :visible="relationVisible" openType="relationTable" @saveAdd="relationSave" @cancelSaveAdd="relationCancel" :actionList_prop="relationAction" :searchFieldList="relationSearchFieldList" />
   </div>
 </template>
 
@@ -299,6 +299,10 @@ export default create({
     hideAddBtn: {
       type: Boolean,
       default: false
+    },
+    openType:{
+      type: String,
+      default: ""
     }
   },
   data() {
@@ -446,7 +450,7 @@ export default create({
         }
       }
       let { relationTableList = [] } = this.$attrs;
-      this.relationTableList = relationTableList;
+      this.relationTableList = this.openType === 'relationTable' ? []:  relationTableList;
       this.init();
       this.backShow(this.actionList_prop);
       this.showItemName && this.getParentNames();
@@ -474,7 +478,7 @@ export default create({
       });
       this.parentNames = parentNames;
     },
-    init() {
+    init(config={}) {
       let mySearchFieldList = JSON.parse(JSON.stringify(this.searchFieldList)).filter(i => i.columnName !== 'operatorColumn' && i.isMerge != 1);
       if (mySearchFieldList && mySearchFieldList.length > 0) {
         if (this.isPersonalizedHome) {
@@ -513,6 +517,11 @@ export default create({
         this.actionList = [];
         this.className = '';
         this.teaValue = '';
+
+        let isInitNoAdd = 'initNoAdd'  == config?.type  || "";
+
+        if(isInitNoAdd) return;
+
         this.addAction();
       }
     },

package/src/utils/utils-map.js

@@ -1,6 +1,7 @@
 const _toString = Object.prototype.toString;
 import moment from 'moment';
 import { Message } from 'ant-design-vue';
+import XEUtils from 'xe-utils';
 export default {
   isJSON(str) {
     if (typeof str == 'string') {
@@ -309,7 +310,7 @@ export default {
         var plsList = pls.slice(1);
         var f = plsList.find(v => v || v == 0);
         var res = p[k][pls[0]];
-        res = that.$utils.notEmpty(res) ? res : '';
+        res = XEUtils.notEmpty(res) ? res : '';
         return res || f || noval;
       });
     };
@@ -329,6 +330,9 @@ export default {
     }
     return str;
   },
+  notEmpty(text) {
+    return XEUtils.isBoolean(text) || String(text) === "0" || !!text;
+  },
 
   paramsToPrintValue(item) {
     if (this.isEmpty(item)) return;