Merge branch 'dev' of https://g.civnet.cn:8443/ReactWeb5/wisdom-components into dev

config/config.js

@@ -107,6 +107,7 @@ export default {
           'AlarmScrollAssembly',
           'DataCarousel',
           'VmsVideo',
+          'VideoSliderModal',
         ],
       },
       {

package.json

@@ -152,6 +152,8 @@
     "@wisdom-components/exportexcel": "^1.1.2",
     "@wisdom-components/loadbox": "1.1.4",
     "@wisdom-components/timerangepicker": "^1.3.4",
+    "@wisdom-components/videoslidermodal": "1.1.2",
+    "@wisdom-components/VmsVideo": "1.1.13",
     "@wisdom-utils/utils": "0.0.46",
     "classnames": "^2.2.6",
     "cross-spawn": "^7.0.3",

packages/base-components/AlarmScrollAssembly/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.12.0](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/alarmscrollassembly@1.11.2...@wisdom-components/alarmscrollassembly@1.12.0) (2023-05-12)
+
+### Features
+
+- 调整滚动组件时间显示 ([ce718cd](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/ce718cdd9a6b1e974848e0ce069286b64acacdaa))
+
+## [1.11.2](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/alarmscrollassembly@1.11.1...@wisdom-components/alarmscrollassembly@1.11.2) (2023-05-08)
+
+### Bug Fixes
+
+- AlarmScrollAssembly 添加权限参数 ([1b62441](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/1b62441f3bc2af17465791956a37ab8473cd76a5))
+
 ## [1.11.1](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/alarmscrollassembly@1.11.0...@wisdom-components/alarmscrollassembly@1.11.1) (2023-04-13)
 
 **Note:** Version bump only for package @wisdom-components/alarmscrollassembly

packages/base-components/AlarmScrollAssembly/package.json

 {
   "name": "@wisdom-components/alarmscrollassembly",
-  "version": "1.11.1",
+  "version": "1.12.0",
   "description": "滚动组件",
   "author": "chenlong <857265978@qq.com>",
   "homepage": "",

packages/base-components/AlarmScrollAssembly/src/demos/index.js

@@ -11,6 +11,7 @@ export default () => {
       prefix={'报警信息：'}
       showTotal={false}
       interval={1}
+      userAccess={true}
     />
   ); // 最小宽度930px
 };

packages/base-components/AlarmScrollAssembly/src/index.js

@@ -190,11 +190,13 @@ AlarmScrollAssembly.defaultProps = {
   prefix: '',
   showTotal: true,
   interval: 5,
+  userAccess:false
 };
 AlarmScrollAssembly.propTypes = {
   deviceType: PropTypes.string,
   prefix: PropTypes.string,
   showTotal: PropTypes.bool,
   interval: PropTypes.number,
+  userAccess: PropTypes.bool,
 };
 export default AlarmScrollAssembly;

packages/base-components/AlarmScrollAssembly/src/index.less

@@ -127,6 +127,10 @@
       .time {
         display: inline-block;
         width: 120px;
+        max-width: 120px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
         color: #333333;
       }
 
@@ -153,6 +157,10 @@
         .period {
           display: inline-block;
           width: 120px;
+          max-width: 120px;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
           margin-left: 10px;
           color: #333333;
         }

packages/base-components/BasicChart/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.5.6](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/basicchart@1.5.5...@wisdom-components/basicchart@1.5.6) (2023-05-12)
+
+### Bug Fixes
+
+- 图表重渲染 ([407e89f](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/407e89f017e1d5221e522bc20cba93a316b1aef2))
+
 ## [1.5.5](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/basicchart@1.5.4...@wisdom-components/basicchart@1.5.5) (2023-04-13)
 
 **Note:** Version bump only for package @wisdom-components/basicchart

packages/base-components/BasicChart/package.json

 {
   "name": "@wisdom-components/basicchart",
-  "version": "1.5.5",
+  "version": "1.5.6",
   "description": "> TODO: description",
   "author": "tuqian <webtuqian@163.com>",
   "homepage": "",

packages/base-components/BasicChart/src/ECharts.js

@@ -16,7 +16,11 @@ const ECharts = memo(
     }, [props.option]);
 
     // const chartProps = pick(props, ['option', 'notMerge', 'lazyUpdate', 'style', 'className', 'theme', 'onChartReady', 'loadingOption', 'showLoading', 'onEvents', 'opts']);
-
+    if (ref.current) {
+      ref.current.getEchartsInstance().clear();
+      ref.current.getEchartsInstance().setOption(option);
+      ref.current.getEchartsInstance().resize();
+    }
     return (
       <ReactEcharts
         ref={ref}

packages/base-components/VideoSliderModal/CHANGELOG.md

+# Change Log
+
+All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [1.1.3](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/videoslidermodal@1.1.2...@wisdom-components/videoslidermodal@1.1.3) (2023-05-12)
+
+**Note:** Version bump only for package @wisdom-components/videoslidermodal
+
+## [1.1.2](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/videoslidermodal@1.1.1...@wisdom-components/videoslidermodal@1.1.2) (2023-05-12)
+
+### Bug Fixes
+
+- 轮播交互修改 ([f2d0e76](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/f2d0e769ae840d8c103e973cd3e052f37764f56d))
+
+## [1.1.1](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/videoslidermodal@1.1.0...@wisdom-components/videoslidermodal@1.1.1) (2023-05-11)
+
+### Bug Fixes
+
+- 视频弹窗组件修改 ([dc55354](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/dc553545e3fa34d5e983aa6e1e9a97586f615077))
+
+# 1.1.0 (2023-05-11)
+
+### Features
+
+- 新增视频轮组组件 ([c1290bb](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/c1290bb85a7e55e70337d3af2b0103199b9eff41))

packages/base-components/VideoSliderModal/README.md

+# `@wisdom-components/VideoSliderModal`
+
+> TODO: description
+
+## Usage
+
+```
+const videoslidermodal = require('@wisdom-components/VideoSliderModal');
+
+// TODO: DEMONSTRATE API
+```

packages/base-components/VideoSliderModal/package.json

+{
+  "name": "@wisdom-components/videoslidermodal",
+  "version": "1.1.3",
+  "description": "> TODO: description",
+  "author": "Liumh <liumh564@163.com>",
+  "homepage": "",
+  "license": "ISC",
+  "module": "es/index.js",
+  "main": "lib/index.js",
+  "sideEffects": [
+    "*.less"
+  ],
+  "directories": {
+    "lib": "lib",
+    "test": "__tests__"
+  },
+  "files": [
+    "lib",
+    "es",
+    "dist"
+  ],
+  "publishConfig": {
+    "registry": "https://g.civnet.cn:4873/"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://g.civnet.cn:8443/ReactWeb5/wisdom-components.git"
+  },
+  "scripts": {
+    "test": "node ./__tests__/@wisdom-components/VideoSliderModal.test.js"
+  },
+  "dependencies": {
+    "@babel/runtime": "^7.17.9",
+    "@wisdom-components/VmsVideo": "1.2.0",
+    "swiper": "^6.8.1"
+  }
+}