cnhis-design-vue 0.2.47-beta → 0.2.48-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "0.2.47-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"
   },
@@ -95,4 +95,4 @@
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
     }
   }
-}
+}

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/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;