@cloud-app-dev/vidc 1.0.35 → 1.0.36

package/.umirc.ts

@@ -2,7 +2,7 @@ import { defineConfig } from 'dumi';
 import path from 'path';
 
 const token =
-  'eyJhbGciOiJIUzI1NiJ9.eyJvcmdhbml6YXRpb25JZCI6IjEwMDEwMTAwMDQ0NiIsImV4dCI6MTYzNzQ4NTk5ODI0MiwidWlkIjoiMTAxMDAwMDAwMjQ5IiwidmFsaWRTdGF0ZSI6MTA0NDA2LCJyb2xlSWQiOlsxMDAwMDAxMTAzODddLCJ2YWxpZFRpbWUiOm51bGwsIm9wdENlbnRlcklkIjoiMTAwMTAwMDAwMjMzIiwidXNlclR5cGUiOjEwMDcwMiwiaWF0IjoxNjM3MjI2Nzk4MjQyfQ.6hGwhWJIfT3kU4P0YjaldFMhBOn-t6tPQykUcdnBNio';
+  'eyJhbGciOiJIUzI1NiJ9.eyJvcmdhbml6YXRpb25JZCI6IjEwMDEwMTAwMDQ0NiIsImV4dCI6MTYzNzgwNjQ5ODI3OSwidWlkIjoiMTAxMDAwMDAwMjQ5IiwidmFsaWRTdGF0ZSI6MTA0NDA2LCJyb2xlSWQiOlsxMDAwMDAxMTAzODddLCJ2YWxpZFRpbWUiOm51bGwsIm9wdENlbnRlcklkIjoiMTAwMTAwMDAwMjMzIiwidXNlclR5cGUiOjEwMDcwMiwiaWF0IjoxNjM3NTQ3Mjk4Mjc5fQ.FX6-kuuaituBjzuBxY0s51V_V_tVRVMuiWp8fIZI6YQ';
 
 export default defineConfig({
   title: '云应用-业务组件库',

package/es/Api/index.d.ts

@@ -1,10 +1,13 @@
 import { OrgItemType } from '@cloud-app-dev/basic-components/es/Store/org';
 import { UserInfo } from '@cloud-app-dev/basic-components/es/Store/app';
-import { PostItemType } from '../core';
+import { BzTreeItemType, PostItemType } from '../core';
 declare class Api {
     getOrgs(): Promise<OrgItemType[]>;
     getUsers(organizationId: string): Promise<UserInfo[]>;
     getPosts(orgId: string): Promise<PostItemType[]>;
+    getDeviceBzTree(): Promise<BzTreeItemType[]>;
+    getCustomDeviceGroup(): Promise<BzTreeItemType[]>;
+    getPlacesByHasDevice(): Promise<BzTreeItemType[]>;
 }
 declare const _default: Api;
 export default _default;

package/es/Api/index.js

@@ -112,6 +112,96 @@ var Api = /*#__PURE__*/function () {
         }, _callee3);
       }));
     }
+  }, {
+    key: "getDeviceBzTree",
+    value: function getDeviceBzTree() {
+      return __awaiter(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee4() {
+        var res;
+        return regeneratorRuntime.wrap(function _callee4$(_context4) {
+          while (1) {
+            switch (_context4.prev = _context4.next) {
+              case 0:
+                _context4.next = 2;
+                return _Service.$http({
+                  url: '/api/udm-api/DeviceBuzTree/queryList',
+                  method: 'post',
+                  requestId: 'getDeviceBzTree',
+                  data: {},
+                  headers: getHeader()
+                });
+
+              case 2:
+                res = _context4.sent;
+                return _context4.abrupt("return", res.data);
+
+              case 4:
+              case "end":
+                return _context4.stop();
+            }
+          }
+        }, _callee4);
+      }));
+    }
+  }, {
+    key: "getCustomDeviceGroup",
+    value: function getCustomDeviceGroup() {
+      return __awaiter(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee5() {
+        var res;
+        return regeneratorRuntime.wrap(function _callee5$(_context5) {
+          while (1) {
+            switch (_context5.prev = _context5.next) {
+              case 0:
+                _context5.next = 2;
+                return _Service.$http({
+                  url: '/api/udm-api/customDeviceGroup/queryList',
+                  method: 'post',
+                  requestId: 'customDeviceGroup',
+                  data: {},
+                  headers: getHeader()
+                });
+
+              case 2:
+                res = _context5.sent;
+                return _context5.abrupt("return", res.data);
+
+              case 4:
+              case "end":
+                return _context5.stop();
+            }
+          }
+        }, _callee5);
+      }));
+    }
+  }, {
+    key: "getPlacesByHasDevice",
+    value: function getPlacesByHasDevice() {
+      return __awaiter(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee6() {
+        var res;
+        return regeneratorRuntime.wrap(function _callee6$(_context6) {
+          while (1) {
+            switch (_context6.prev = _context6.next) {
+              case 0:
+                _context6.next = 2;
+                return _Service.$http({
+                  url: '/api/place/v1/getPlacesByHasDevice',
+                  method: 'post',
+                  requestId: 'getPlacesByHasDevice',
+                  data: {},
+                  headers: getHeader()
+                });
+
+              case 2:
+                res = _context6.sent;
+                return _context6.abrupt("return", res.data);
+
+              case 4:
+              case "end":
+                return _context6.stop();
+            }
+          }
+        }, _callee6);
+      }));
+    }
   }]);
 
   return Api;

package/es/DeviceList/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { DeviceItemType } from '../DynamicDeviceList/interface';
+import { DeviceItemType } from '../core';
 import { CheckListProps } from '@cloud-app-dev/basic-components/es/CheckList';
 import './index.less';
 interface DeviceListProps extends CheckListProps<DeviceItemType> {
@@ -10,5 +10,5 @@ interface DeviceListProps extends CheckListProps<DeviceItemType> {
     title?: string;
     onKeywordChange?: (v: string) => void;
 }
-declare function DeviceList({ getIconStyle, className, deleteItem, deviceList, onMouseOverItem, renderItemExt, title, onKeywordChange, ...props }: DeviceListProps): JSX.Element;
+declare function DeviceList({ getIconStyle, className, deleteItem, deviceList, onMouseOverItem, renderItemExt, title, onKeywordChange, itemKey, ...props }: DeviceListProps): JSX.Element;
 export default DeviceList;

package/es/DeviceList/index.js

@@ -15,7 +15,8 @@ function DeviceList(_a) {
       _renderItemExt = _a.renderItemExt,
       title = _a.title,
       onKeywordChange = _a.onKeywordChange,
-      props = __rest(_a, ["getIconStyle", "className", "deleteItem", "deviceList", "onMouseOverItem", "renderItemExt", "title", "onKeywordChange"]);
+      itemKey = _a.itemKey,
+      props = __rest(_a, ["getIconStyle", "className", "deleteItem", "deviceList", "onMouseOverItem", "renderItemExt", "title", "onKeywordChange", "itemKey"]);
 
   var whatIcon = useCallback(function (item) {
     return /*#__PURE__*/React.createElement(DeviceIcon, {
@@ -33,6 +34,7 @@ function DeviceList(_a) {
     className: "lm-c-device-list-wrapper ".concat(className),
     list: deviceList,
     itemNameKey: "deviceName",
+    itemKey: itemKey,
     rowHeight: 30,
     renderHeader: function renderHeader() {
       return /*#__PURE__*/React.createElement(TreeTitle, {
@@ -44,7 +46,7 @@ function DeviceList(_a) {
     whatIcon: whatIcon,
     onMouseOverItem: onMouseOverItem,
     renderItemExt: function renderItemExt(item) {
-      return _renderItemExt ? _renderItemExt(item) : deleteItem && /*#__PURE__*/React.createElement("span", {
+      return _renderItemExt ? _renderItemExt(item) : deleteItem ? /*#__PURE__*/React.createElement("span", {
         className: "clear-item",
         onClick: function onClick(e) {
           return deleteItemAction(item, e);
@@ -52,7 +54,7 @@ function DeviceList(_a) {
       }, /*#__PURE__*/React.createElement(_IconFont, {
         type: "icon-S_Edit_LineClose",
         title: "\u5220\u9664"
-      }));
+      })) : undefined;
     }
   }));
 }

package/es/DeviceSelect/demo.d.ts

@@ -0,0 +1,2 @@
+declare function App(): JSX.Element;
+export default App;

package/es/DeviceSelect/demo.js

@@ -0,0 +1,22 @@
+import "antd/lib/config-provider/style";
+import _ConfigProvider from "antd/lib/config-provider";
+import React from 'react';
+import DeviceSelect from './index';
+
+function App() {
+  return /*#__PURE__*/React.createElement(_ConfigProvider, {
+    prefixCls: "cloudapp"
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      padding: 20,
+      width: 1000,
+      height: 500
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      height: 400
+    }
+  }, /*#__PURE__*/React.createElement(DeviceSelect, null))));
+}
+
+export default App;

package/es/DeviceSelect/index.css

@@ -0,0 +1,6 @@
+.vidc-device-select-layout {
+  height: 100%;
+}
+.vidc-device-select-layout > .cloudapp-col {
+  height: 100%;
+}

package/es/DeviceSelect/index.d.ts

@@ -0,0 +1,7 @@
+import { DeviceItemType } from '../core';
+import './index.less';
+interface IDeviceSelectProps {
+    selectDevices?: DeviceItemType[];
+}
+declare function DeviceSelect({ selectDevices }: IDeviceSelectProps): JSX.Element;
+export default DeviceSelect;

package/es/DeviceSelect/index.js

@@ -0,0 +1,222 @@
+import _IconFont from "@cloud-app-dev/basic-components/es/IconFont";
+import "antd/lib/menu/style";
+import _Menu from "antd/lib/menu";
+import "antd/lib/dropdown/style";
+import _Dropdown from "antd/lib/dropdown";
+import "antd/lib/col/style";
+import _Col from "antd/lib/col";
+import "antd/lib/row/style";
+import _Row from "antd/lib/row";
+
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import TreeMode from '../TreeMode';
+import DynamicDeviceList from '../DynamicDeviceList';
+import DeviceList from '../DeviceList';
+import { uniq, uniqBy } from 'lodash';
+import "./index.css";
+
+function DeviceSelect(_ref) {
+  var selectDevices = _ref.selectDevices;
+
+  var _useState = useState({
+    tempSelectIds: selectDevices === null || selectDevices === void 0 ? void 0 : selectDevices.map(function (v) {
+      return v.cid;
+    }),
+    selectDevices: selectDevices,
+    selectIds: selectDevices === null || selectDevices === void 0 ? void 0 : selectDevices.map(function (v) {
+      return v.cid;
+    }),
+    keyword1: '',
+    keyword2: '',
+    focusKey: Date.now(),
+    buzGroupId: '',
+    placeId: '',
+    areaCode: '',
+    mode: 'Bz'
+  }),
+      _useState2 = _slicedToArray(_useState, 2),
+      state = _useState2[0],
+      setState = _useState2[1];
+
+  useEffect(function () {
+    if (state.selectDevices || !selectDevices) {
+      return null;
+    }
+
+    var ids = selectDevices === null || selectDevices === void 0 ? void 0 : selectDevices.map(function (v) {
+      return v.cid;
+    });
+
+    if (ids) {
+      setState(function (old) {
+        return Object.assign(Object.assign({}, old), {
+          selectDevices: selectDevices,
+          selectIds: ids,
+          tempSelectIds: ids
+        });
+      });
+    }
+  }, [state.selectDevices, selectDevices]);
+  var onCheked1 = useCallback(function (ids, items, checked) {
+    var changIds = items.map(function (v) {
+      return v.cid;
+    });
+    var devices = state.selectDevices || [];
+    var selectIds = state.selectIds || [];
+    var list = !checked ? devices.filter(function (v) {
+      return !changIds.includes(v.cid);
+    }) : uniqBy([].concat(_toConsumableArray(devices), _toConsumableArray(items)), 'cid');
+    var selectIds2 = !checked ? selectIds.filter(function (v) {
+      return !changIds.includes(v);
+    }) : uniq([].concat(_toConsumableArray(selectIds), _toConsumableArray(changIds)));
+    setState(function (old) {
+      return Object.assign(Object.assign({}, old), {
+        selectDevices: _toConsumableArray(list),
+        tempSelectIds: ids,
+        selectIds: _toConsumableArray(selectIds2),
+        focusKey: Date.now()
+      });
+    });
+  }, [state.selectDevices, state.selectIds]);
+  var onCheked2 = useCallback(function (ids) {
+    return setState(function (old) {
+      return Object.assign(Object.assign({}, old), {
+        selectIds: ids,
+        focusKey: Date.now()
+      });
+    });
+  }, []);
+  var onSelectTree = useCallback(function (keys, _ref2) {
+    var node = _ref2.node;
+
+    if (state.mode === 'Bz') {
+      var buzGroupId = keys[0];
+
+      if (state.buzGroupId === buzGroupId) {
+        setState(function (old) {
+          return Object.assign(Object.assign({}, old), {
+            buzGroupId: ''
+          });
+        });
+      } else {
+        setState(function (old) {
+          return Object.assign(Object.assign({}, old), {
+            buzGroupId: buzGroupId
+          });
+        });
+      }
+    }
+
+    if (state.mode === 'Place') {
+      var id = node.id;
+
+      if (state.placeId === id) {
+        setState(function (old) {
+          return Object.assign(Object.assign({}, old), {
+            placeId: '',
+            areaCode: ''
+          });
+        });
+      } else {
+        setState(function (old) {
+          return Object.assign(Object.assign({}, old), {
+            placeId: id,
+            areaCode: node.areaCode
+          });
+        });
+      }
+    }
+  }, [state.buzGroupId, state.placeId, state.mode]);
+  var listParams = useMemo(function () {
+    return state.mode === 'Bz' ? {
+      buzGroupId: state.buzGroupId,
+      includeSubOrganizations: 1,
+      isPagination: true
+    } : {
+      includeSceneType: 'place',
+      includeSubOrganizations: 1,
+      isPagination: true,
+      placeIds: state.placeId ? [state.placeId] : []
+    };
+  }, [state.buzGroupId, state.mode, state.placeId]);
+  var treeSelectedKeys = useMemo(function () {
+    return state.mode === 'Bz' ? [state.buzGroupId] : [state.areaCode];
+  }, [state.mode, state.buzGroupId, state.areaCode]);
+  return /*#__PURE__*/React.createElement(_Row, {
+    className: "vidc-device-select-layout"
+  }, /*#__PURE__*/React.createElement(_Col, {
+    span: 7
+  }, /*#__PURE__*/React.createElement(TreeMode, {
+    key: state.mode,
+    mode: state.mode,
+    inputPlaceholder: "\u8BF7\u8F93\u5165\u540D\u79F0",
+    onSelect: onSelectTree,
+    selectedKeys: treeSelectedKeys,
+    title: /*#__PURE__*/React.createElement(_Dropdown, {
+      overlay: /*#__PURE__*/React.createElement(_Menu, {
+        onClick: function onClick(info) {
+          return setState(function (old) {
+            return Object.assign(Object.assign({}, old), {
+              mode: info.key
+            });
+          });
+        }
+      }, /*#__PURE__*/React.createElement(_Menu.Item, {
+        style: {
+          fontSize: 12
+        },
+        key: "Bz"
+      }, "\u8BBE\u5907\u4E1A\u52A1\u6811"), /*#__PURE__*/React.createElement(_Menu.Item, {
+        style: {
+          fontSize: 12
+        },
+        key: "Place"
+      }, "\u884C\u653F\u533A\u5212"))
+    }, /*#__PURE__*/React.createElement("span", null, state.mode === 'Place' ? '行政区划' : '设备业务树', " ", /*#__PURE__*/React.createElement(_IconFont, {
+      style: {
+        position: 'relative',
+        top: 1
+      },
+      type: "icon-S_Arrow_BigDown"
+    })))
+  })), /*#__PURE__*/React.createElement(_Col, {
+    span: 8
+  }, /*#__PURE__*/React.createElement(DynamicDeviceList, {
+    title: "\u8BBE\u5907\u5217\u8868",
+    onChecked: onCheked1,
+    checkedKeys: state.tempSelectIds,
+    params: listParams
+  })), /*#__PURE__*/React.createElement(_Col, {
+    span: 1
+  }), /*#__PURE__*/React.createElement(_Col, {
+    span: 8
+  }, /*#__PURE__*/React.createElement(DeviceList, {
+    itemKey: "cid",
+    deviceList: state.selectDevices || [],
+    onChecked: onCheked2,
+    checkedKeys: state.selectIds,
+    title: "\u5DF2\u9009\u8BBE\u5907\u5217\u8868"
+  })));
+}
+
+export default DeviceSelect;

package/es/DynamicDeviceList/CheckExt.d.ts

@@ -0,0 +1,8 @@
+interface ICheckExtProps {
+    selectCount: number;
+    count: number;
+    onCheck: () => void;
+    onCancel: () => void;
+}
+declare function CheckExt({ selectCount, onCheck, count, onCancel }: ICheckExtProps): JSX.Element;
+export default CheckExt;

package/es/DynamicDeviceList/CheckExt.js

@@ -0,0 +1,36 @@
+import _IconFont from "@cloud-app-dev/basic-components/es/IconFont";
+import "antd/lib/tooltip/style";
+import _Tooltip from "antd/lib/tooltip";
+import React from 'react';
+
+function CheckExt(_ref) {
+  var selectCount = _ref.selectCount,
+      onCheck = _ref.onCheck,
+      count = _ref.count,
+      onCancel = _ref.onCancel;
+  return /*#__PURE__*/React.createElement("div", {
+    className: "c-check-list-checkext"
+  }, /*#__PURE__*/React.createElement("span", {
+    className: "select-group"
+  }, /*#__PURE__*/React.createElement(_Tooltip, {
+    title: "\u9009\u4E2D\u6240\u6709\u5DF2\u52A0\u8F7D"
+  }, /*#__PURE__*/React.createElement(_IconFont, {
+    type: "icon-S_Photo_MarkYes",
+    onClick: onCheck
+  })), /*#__PURE__*/React.createElement(_Tooltip, {
+    title: "\u53D6\u6D88\u9009\u4E2D\u6240\u6709\u5DF2\u52A0\u8F7D\u9879"
+  }, /*#__PURE__*/React.createElement(_IconFont, {
+    type: "icon-MarkNo",
+    onClick: onCancel
+  }))), /*#__PURE__*/React.createElement("span", null, "\u5DF2\u9009 ", /*#__PURE__*/React.createElement("span", {
+    style: {
+      color: 'var(--success)'
+    }
+  }, selectCount), " / \u603B\u6570 ", /*#__PURE__*/React.createElement("span", {
+    style: {
+      color: 'var(--primary)'
+    }
+  }, count)));
+}
+
+export default CheckExt;

package/es/DynamicDeviceList/Demo.js

@@ -11,11 +11,7 @@ function App() {
       height: 400,
       width: 300
     }
-  }, /*#__PURE__*/React.createElement(DynamicDeviceList, {
-    onSelect: function onSelect(item) {
-      return console.log(item);
-    }
-  })));
+  }, /*#__PURE__*/React.createElement(DynamicDeviceList, null)));
 }
 
 export default App;

package/es/DynamicDeviceList/index.css

@@ -1,11 +1,15 @@
 .zenview-c-dynamic-device-list-layout {
   display: flex;
+  flex-direction: column;
   width: 100%;
   height: 100%;
 }
 .zenview-c-dynamic-device-list-layout .dynamic-list-item {
   padding: 0 10px;
 }
+.zenview-c-dynamic-device-list-layout .lm-c-dynamiclist {
+  flex: 1;
+}
 .zenview-c-dynamic-device-list-layout .device-item-box {
   height: 40px;
   line-height: 40px;
@@ -29,3 +33,19 @@
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+.zenview-c-dynamic-device-list-layout .c-check-list-checkext {
+  font-size: var(--fs-small);
+  padding: 5px 12px;
+  display: flex;
+  justify-content: space-between;
+  border-bottom: 1px solid var(--bd-color);
+}
+.zenview-c-dynamic-device-list-layout .c-check-list-checkext .select-group .anticon {
+  font-size: 16px;
+  cursor: pointer;
+  padding-right: 8px;
+  color: var(--icon);
+}
+.zenview-c-dynamic-device-list-layout .c-check-list-checkext .select-group .anticon:hover {
+  color: var(--primary);
+}

package/es/DynamicDeviceList/index.d.ts

@@ -1,4 +1,4 @@
-import { DeviceItemType } from './interface';
+import { DeviceItemType } from '../core';
 import './index.less';
 interface IDynamicDeviceListProps {
     /**
@@ -8,11 +8,11 @@ interface IDynamicDeviceListProps {
     /**
      * @description 选中设备cid集合
      */
-    selectKeys?: string[];
+    checkedKeys?: string[];
     /**
      * @description 传入onSelect列表默认渲染为checkbox模式
      */
-    onSelect?: (item: DeviceItemType) => void;
+    onChecked?: (ids: string[], list: DeviceItemType[], checked: boolean) => void;
     /**
      * @description 传入queryList需要的参数，例如业务树ID，场所id等，分页参数除外
      */
@@ -27,6 +27,9 @@ interface IDynamicDeviceListProps {
      * @description 列表高度
      */
     itemHeight?: number;
+    title?: string;
+    onKeywordChange?: (v: string) => void;
+    defaultCheckedIds?: string[];
 }
-declare function DynamicDeviceList({ onClick, selectKeys, onSelect, params, renderItem, itemHeight }: IDynamicDeviceListProps): JSX.Element;
+declare function DynamicDeviceList({ onClick, checkedKeys, defaultCheckedIds, onChecked, params, renderItem, itemHeight, title, onKeywordChange }: IDynamicDeviceListProps): JSX.Element;
 export default DynamicDeviceList;