cnhis-design-vue 0.2.47-beta → 0.2.50-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "0.2.47-beta",
+  "version": "0.2.50-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.6.4",
     "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/big-table/src/components/player-vod/player.vue

@@ -160,6 +160,7 @@ export default {
 // scoped
 // 进度显示当前播放时间
 .video-js {
+  height: 512px;
   .vjs-time-control {
     display: block;
   }

package/packages/big-table/src/components/player-vod/video-modal.vue

@@ -1,5 +1,15 @@
 <template>
-  <a-modal :visible="previewVisible" :footer="null" @cancel="handleCancel" wrapClassName="image-modal" width="65vw" height="60vh">
+  <a-modal
+    :visible="previewVisible"
+    :footer="null"
+    @cancel="handleCancel"
+    wrapClassName="image-modal"
+    width="65vw"
+    :bodyStyle="{
+      height: '600px',
+      overflowY: 'auto'
+    }"
+  >
     <div class="preview-wrap">
       <div class="preview">
         <playerVod :playerOptions="playerOptions" v-if="fileList && fileList.length === 0"></playerVod>
@@ -91,6 +101,7 @@ export default {
   .preview {
     padding: 20px 0;
     width: 60vw;
+    height: 100%;
     // height: 60vh;
     // display: flex;
     // justify-content: center;

package/packages/checkbox/src/CheckboxImg/index.vue

@@ -23,7 +23,7 @@
 </template>
 
 <script>
-  import Viewer from "v-viewer/src/component.vue";
+  import { component as Viewer } from "v-viewer";
   import 'viewerjs/dist/viewer.css'
   import create from '@/core/create';
   import {

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

@@ -91,7 +91,7 @@
 import MsgDescribe from '../components/msg-describe';
 import MsgPicture from '../components/msg-picture';
 import MsgPrescription from '../components/msg-prescription';
-import Viewer from 'v-viewer/src/component.vue';
+import { component as Viewer } from "v-viewer";
 import 'viewerjs/dist/viewer.css';
 import InfiniteScroll from 'vue-infinite-scroll';
 import vexutils from '@/utils/vexutils';

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

@@ -226,7 +226,7 @@ import ReadStatus from '../components/read-status';
 import ReadRecord from '../components/read-record';
 import chatHeader from './chatHeader';
 import 'viewerjs/dist/viewer.css';
-import Viewer from 'v-viewer/src/component.vue';
+import { component as Viewer } from "v-viewer";
 import { getRecallText } from '../utils';
 import vexutils from '@/utils/vexutils';
 import ObserverScroll from '../utils/observer-scroll';

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

@@ -58,7 +58,7 @@
 <script>
 import InfiniteScroll from 'vue-infinite-scroll';
 import 'viewerjs/dist/viewer.css';
-import Viewer from 'v-viewer/src/component.vue';
+import { component as Viewer } from "v-viewer";
 import MsgDescribe from '../components/msg-describe';
 import MsgPicture from '../components/msg-picture';
 import MsgPrescription from '../components/msg-prescription';

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

@@ -59,7 +59,7 @@
 <script>
 import InfiniteScroll from 'vue-infinite-scroll';
 import 'viewerjs/dist/viewer.css';
-import Viewer from 'v-viewer/src/component.vue';
+import { component as Viewer } from "v-viewer";
 import MsgDescribe from '../../components/msg-describe';
 import MsgPicture from '../../components/msg-picture';
 import MsgPrescription from '../../components/msg-prescription';

package/packages/radio/src/RadioImg/index.vue

@@ -32,7 +32,7 @@
 </template>
 
 <script>
-  import Viewer from "v-viewer/src/component.vue";
+  import { component as Viewer } from "v-viewer";
   import 'viewerjs/dist/viewer.css'
   import create from '@/core/create';
   import {

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/component/player-vod/video-modal.vue

@@ -5,7 +5,10 @@
     @cancel="handleCancel"
     wrapClassName="image-modal"
     width="65vw"
-    height="60vh"
+    :bodyStyle="{
+      height: '600px',
+      overflowY: 'auto'
+    }"
   >
     <div class="preview-wrap">
       <div class="preview">
@@ -100,6 +103,7 @@ export default {
   .preview {
     padding: 20px 0;
     width: 60vw;
+    height: 100%;
     // height: 60vh;
     // display: flex;
     // justify-content: center;

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;