cnhis-design-vue 0.2.49-beta → 0.2.52-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "0.2.49-beta",
+  "version": "0.2.52-beta",
   "description": "基于 Ant Desgin Vue 的UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",
@@ -95,4 +95,4 @@
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
     }
   }
-}
+}

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/fabric-chart/src/fabric-chart/FabricPolylines.vue

@@ -366,14 +366,15 @@ export default {
       const getTime = new Date(time).getTime();
       return getTime >= minMinute && getTime <= maxMinute;
     },
-    // 创建危急值
-    createCritical(polyline, polylineIndex, polylineType, polylineTypeId) {
-      const { critical = null, list } = polyline;
-      if (!critical?.max && !critical?.min) return;
+    // 创建危急值和差异值
+    createAttrVaule(attr, polyline, polylineIndex, polylineType, polylineTypeId) {
+      const { list } = polyline;
+      const valueObj = polyline[attr] || {};
+      if (!valueObj.max && !valueObj.min) return;
 
       const { originX, endX } = this.propItems;
-      const isMax = critical?.max?.value && list.some(v => +v.value >= +critical.max.value && this.isLimit(v.time));
-      const isMin = critical?.min?.value && list.some(v => +v.value <= +critical.min.value && this.isLimit(v.time));
+      const isMax = valueObj.max?.show && valueObj.max?.value && list.some(v => +v.value >= +valueObj.max.value && this.isLimit(v.time));
+      const isMin = valueObj.min?.show && valueObj.min?.value && list.some(v => +v.value <= +valueObj.min.value && this.isLimit(v.time));
       const lines = [];
       
       const drawLine = ({ value, lineStyle }) => {
@@ -392,14 +393,14 @@ export default {
       };
 
       if (isMax) {
-        const line = drawLine(critical.max);
-        const text = drawText(critical.max, line.top);
+        const line = drawLine(valueObj.max);
+        const text = drawText(valueObj.max, line.top);
         line.text = text;
         lines.push(line, text);
       }
       if (isMin) {
-        const line = drawLine(critical.min);
-        const text = drawText(critical.min, line.top);
+        const line = drawLine(valueObj.min);
+        const text = drawText(valueObj.min, line.top);
         line.text = text;
         lines.push(line, text);
       }
@@ -471,7 +472,8 @@ export default {
         this.canvas.requestRenderAll();
       });
 
-      this.createCritical(polyline, polylineIndex, polylineType, polylineTypeId);
+      this.createAttrVaule('critical', polyline, polylineIndex, polylineType, polylineTypeId);
+      this.createAttrVaule('diffValue', polyline, polylineIndex, polylineType, polylineTypeId);
     },
     // 计算y轴坐标
     cumputedY(polylineType, linePointY) {

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

@@ -24,7 +24,7 @@
           <a-radio-button :value="item.id + '-' + item.fromId" v-for="item in sessionHistoryList" :key="item.id + item.fromId">{{ item.fromName }}</a-radio-button>
         </a-radio-group>
       </div>
-      <div class="online-message" ref="message-wrapper" v-infinite-scroll="handleInfiniteOnLoad">
+      <div class="online-message" ref="message-wrapper" v-infinite-scroll="handleInfiniteOnLoad" @scroll="scrollEvent">
         <template v-for="(item, index) in msgList">
           <div :key="index" v-if="item">
             <p v-if="isNeedShowTime(item, index)" class="message-time">
@@ -227,6 +227,7 @@ import ReadRecord from '../components/read-record';
 import chatHeader from './chatHeader';
 import 'viewerjs/dist/viewer.css';
 import { component as Viewer } from "v-viewer";
+// import Viewer from 'v-viewer/src/component.vue';
 import { getRecallText } from '../utils';
 import vexutils from '@/utils/vexutils';
 import ObserverScroll from '../utils/observer-scroll';
@@ -506,6 +507,9 @@ export default {
         if (scrollTo === 'current') {
          top = target.scrollHeight - this.scrollHeight;
         }
+        if(typeof scrollTo === 'number') {
+          top = scrollTo;
+        }
         target.scrollTo({
           left: 0,
           top,
@@ -895,8 +899,13 @@ export default {
       });
       this.contextMenuShow = true;
     },
+    scrollEvent(e) {
+      console.log("e.target.scrollTop->", e.target.scrollTop);
+      this._scrollTop = e.target.scrollTop;
+    },
     /* 事件绑定 */
     attachEvent() {
+      this.scrollEvent = vexutils.debounce(this.scrollEvent, 800);
       const handleClick = () => {
         this.contextMenuShow = false;
       };
@@ -1046,8 +1055,11 @@ export default {
         }
       }
     },
-    activatedTime(value) {
-      this.setScrollTo('bottom');
+    activatedTime: {
+      immediate: true,
+      handler(value) {
+        this.handleScrollTo(this._scrollTop);
+      }
     },
     /**
      * 图片懒加载处理

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

@@ -1133,16 +1133,19 @@ export default create({
         });
       }
       let paramsData = utils.setParamsValue(params, this.paramsData);
+      Object.assign(btn, {
+        _index_: j
+      })
       let btnData = {
         btnData: Object.assign(setData, {
           paramsData: paramsData,
           btnName: btn.name,
-          _params_data: this.paramsData
+          _params_data: this.paramsData,
         }),
         indexList: indexList,
         btnConfig: JSON.parse(JSON.stringify(btn)),
         _params_data: this.paramsData,
-        _type_: btn.type
+        
       };
       this.$emit('btnEvent', btnData);
     },
@@ -1192,6 +1195,9 @@ export default create({
         this.$message.info('请点击要操作的数据' || this.$t('1.9.140'));
         return;
       }
+      Object.assign(item, {
+        _index_: j,
+      })
       this.$emit('clickBtn', data, item, index);
     },
     clickGroupBtn(btn, j) {

package/packages/table-filter/src/components/table-modal/TableModal.vue

@@ -58,7 +58,7 @@
           设置为默认
           <!-- {{ $t("1.1.3.2.3") }} -->
         </span>
-        <span v-show="isAdmin" class="list-title-item">
+        <span v-show="isAdmin && type=='mananger'" class="list-title-item">
           设置公共首页
           <!-- {{ $t("1.9.113") }} -->
         </span>
@@ -95,7 +95,7 @@
                 :checked="item.isDefault"
               /> -->
             </span>
-            <span class="list-content-item" v-show="isAdmin">
+            <span class="list-content-item" v-show="isAdmin && type=='mananger'">
               <!-- isHead == 2 -->
 
               <a-switch @change="changecommonSwitch(item)" :checked="item.isCommon" />

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;