@cloud-app-dev/vidc 1.0.32 → 1.0.36

package/es/WorkerFlow/index.js

@@ -1,6 +1,5 @@
 import _useChangeEffect from "@cloud-app-dev/basic-components/es/useChangeEffect";
 import _Modal from "@cloud-app-dev/basic-components/es/Modal";
-import _useDrawer from "@cloud-app-dev/basic-components/es/useDrawer";
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
@@ -23,7 +22,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { __awaiter } from "tslib";
-import React, { useCallback, useImperativeHandle, useMemo, useState } from 'react';
+import React, { useCallback, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { OptionTypes, NodeTemplates, NodeTypes, createVNodeApprover } from './Nodes/Constants';
 import { downloadBpmnFile, exportBpmnFile as _exportBpmnFile } from './XML';
 import { createId, getEndEventId } from './XML/utils';
@@ -38,6 +37,7 @@ import Render from './Nodes/Render';
 import Tools from './Tools';
 import WFC from './OperatorContext';
 import { filterNoticeNode, getJAVATaskData, getUserFormKeys } from './utils';
+import RefDrawer from '../RefDrawer';
 import "./index.css";
 var FormMap = {
   1: ApproverForm,
@@ -59,7 +59,7 @@ function WorkerFlow(_ref, ref) {
       config = _useState2[0],
       setConfig = _useState2[1];
 
-  var drawer = _useDrawer();
+  var drawerRef = useRef(null);
 
   var updateNode = function updateNode() {
     return setConfig(Object.assign({}, config));
@@ -164,6 +164,7 @@ function WorkerFlow(_ref, ref) {
       return;
     }
 
+    var drawer = drawerRef.current;
     var data = {};
     var formKeys = Object.keys(FormMap);
 
@@ -230,7 +231,7 @@ function WorkerFlow(_ref, ref) {
 
     var blob = _exportBpmnFile(newConfig, id, name);
 
-    var taskList = getJAVATaskData(newConfig);
+    var taskList = getJAVATaskData(cloneDeep(config));
     var useFormKeys = getUserFormKeys(newConfig);
     return {
       config: {
@@ -278,7 +279,9 @@ function WorkerFlow(_ref, ref) {
   }), /*#__PURE__*/React.createElement(EndNode, {
     nodeName: "\u6D41\u7A0B\u7ED3\u675F",
     id: endId
-  })))));
+  })))), /*#__PURE__*/React.createElement(RefDrawer, {
+    ref: drawerRef
+  }));
 }
 
 export default /*#__PURE__*/React.forwardRef(WorkerFlow);

package/es/WorkerFlow/utils.js

@@ -29,7 +29,7 @@ export function getJAVATaskData(data) {
         taskType: node.type === 5 ? 0 : 1
       };
 
-      if (node.userType === 1 || node.userType === 2) {
+      if (node.userType === 1 || node.userType === 2 || node.userType === 3 || node.userType === 5) {
         item.assignPersonIds = node.nodeUserList.filter(function (v) {
           return v.key === 'userId';
         }).map(function (v) {
@@ -80,7 +80,11 @@ export function getJAVATaskData(data) {
     }
 
     if (node.childNode) {
-      fn(node.childNode);
+      if (node.childNode.type === 2 && node.childNode.childNode) {
+        fn(node.childNode.childNode);
+      } else {
+        fn(node.childNode);
+      }
     }
   };
 

package/es/core.d.ts

@@ -29,3 +29,94 @@ export interface PostItemType {
   postName: string;
   orgId: string;
 }
+
+export type BzTreeItemType = {
+  appSysId: string;
+  createTime: number;
+  creator: number;
+  customType: number;
+  description: string;
+  groupName: string;
+  id: string;
+  level: number;
+  orderNo: number;
+  parentId: string;
+  treeDescription: string;
+  treeId: string;
+};
+
+export interface DeviceItemType {
+  ability: any;
+  accessType: null;
+  aliasBrand: null;
+  appSystemId: string;
+  areaLevel: number;
+  bindUserid: string;
+  boxNum: string;
+  buzGroupId: string;
+  buzGroupIds: string[];
+  buzGroupName: string;
+  cameraType: string;
+  capDirection: string;
+  cid: string;
+  createTime: string;
+  deleteFlag: number;
+  detailLiftBuild: number;
+  detailLiftUnit: number;
+  deviceBrand: number;
+  deviceIp: string;
+  deviceModel: string;
+  deviceName: string;
+  devicePlace: string;
+  deviceStatus: 0 | 1;
+  deviceType: string;
+  extJson: any;
+  fullPy: string;
+  gbId: string;
+  geoCoordinateSystem: string;
+  groupId: string;
+  groupIds: string[];
+  groupName: string;
+  hadLocaltion: boolean;
+  hasFrontEnd: boolean;
+  hasStorage: boolean;
+  id: string;
+  inOutDirection: any;
+  industry: any;
+  industry1: string;
+  industry2: string;
+  installationLocationDetail: any;
+  installationMethod: any;
+  installationSite: any;
+  ipAddr: any;
+  ipV6Addr: any;
+  isBind: any;
+  isIdleDeal: any;
+  latitude: number;
+  longitude: number;
+  maintenancePerson: any;
+  maintenancePhone: any;
+  maintenanceUnit: any;
+  manufacturerDeviceType: string;
+  monitorAreaDesc: any;
+  monitorDirection: any;
+  operationCenterIds: any;
+  orgCode: any;
+  parentId: any;
+  pathId: string[];
+  place: string;
+  placeCode: string;
+  placeId: string;
+  placeIds: string[];
+  placeName: null;
+  placeTags: string[];
+  port: string;
+  ptzControl: string;
+  simpPy: string;
+  sn: string;
+  snapshotMode: string;
+  sourceFrom: string;
+  superiorGbcode: string;
+  tags: string;
+  villageLocationType: string;
+}

package/es/index.d.ts

@@ -1,16 +1,23 @@
+export { default as Api } from './Api';
 export { default as AppLayout } from './AppLayout';
 export { default as AutoExit } from './AutoExit';
 export { default as DagInitialConfig } from './DagInitialConfig';
 export { default as DagInitialRequest } from './DagInitialRequest';
 export { default as DeviceIcon } from './DeviceIcon';
 export { default as DeviceList } from './DeviceList';
+export { default as DeviceSelect } from './DeviceSelect';
 export { default as DynamicDeviceList } from './DynamicDeviceList';
 export { default as FormContent } from './FormContent';
 export { default as InitialConfig } from './InitialConfig';
 export { default as InitialRequest } from './InitialRequest';
 export { default as List } from './List';
 export { default as OrgTree } from './OrgTree';
+export { default as OrgUserTree } from './OrgUserTree';
 export { default as PlaceTree } from './PlaceTree';
+export { default as RefDrawer } from './RefDrawer';
+export { default as RefModal } from './RefModal';
+export { default as TreeMode } from './TreeMode';
 export { default as TreeTitle } from './TreeTitle';
 export { default as Upload } from './Upload';
+export { default as UserSelect } from './UserSelect';
 export { default as WorkerFlow } from './WorkerFlow';

package/es/index.js

@@ -1,16 +1,23 @@
+export { default as Api } from './Api';
 export { default as AppLayout } from './AppLayout';
 export { default as AutoExit } from './AutoExit';
 export { default as DagInitialConfig } from './DagInitialConfig';
 export { default as DagInitialRequest } from './DagInitialRequest';
 export { default as DeviceIcon } from './DeviceIcon';
 export { default as DeviceList } from './DeviceList';
+export { default as DeviceSelect } from './DeviceSelect';
 export { default as DynamicDeviceList } from './DynamicDeviceList';
 export { default as FormContent } from './FormContent';
 export { default as InitialConfig } from './InitialConfig';
 export { default as InitialRequest } from './InitialRequest';
 export { default as List } from './List';
 export { default as OrgTree } from './OrgTree';
+export { default as OrgUserTree } from './OrgUserTree';
 export { default as PlaceTree } from './PlaceTree';
+export { default as RefDrawer } from './RefDrawer';
+export { default as RefModal } from './RefModal';
+export { default as TreeMode } from './TreeMode';
 export { default as TreeTitle } from './TreeTitle';
 export { default as Upload } from './Upload';
+export { default as UserSelect } from './UserSelect';
 export { default as WorkerFlow } from './WorkerFlow';

package/es/utils.d.ts

@@ -1,3 +1,13 @@
 export declare const getHeader: () => {
     Authorization: any;
 };
+/**
+ * @desc 根据id获取所有父级
+ */
+export declare function getParentListById(id: string, orgList?: any[], list?: any[], key?: string, pkey?: string): any[];
+/**
+ * 获取场所下的所有场所codes
+ * @param {string} orgId
+ * @param {Array} ids = []
+ */
+export declare function getPlaceCodesWithParent(areaCode: string, list?: any[], areaCodes?: string[], key?: string, pkey?: string): any;

package/es/utils.js

@@ -3,4 +3,57 @@ export var getHeader = function getHeader() {
   return {
     Authorization: cache.getCache('token', 'session')
   };
-};
+};
+/**
+ * @desc 根据id获取所有父级
+ */
+
+export function getParentListById(id) {
+  var orgList = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var list = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+  var key = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'id';
+  var pkey = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'parentId';
+
+  for (var i = 0, len = orgList.length; i < len; i++) {
+    var item = orgList[i];
+
+    if (item[key] === id) {
+      list.push(item);
+
+      if (item[pkey]) {
+        getParentListById(item[pkey], orgList, list, key, pkey);
+      }
+    }
+  }
+
+  return list;
+}
+/**
+ * 获取场所下的所有场所codes
+ * @param {string} orgId
+ * @param {Array} ids = []
+ */
+
+export function getPlaceCodesWithParent(areaCode) {
+  var list = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var areaCodes = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+  var key = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'areaCode';
+  var pkey = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'parentCode';
+  var info = list.find(function (v) {
+    return v[key] === areaCode;
+  });
+
+  if (info && info.pcodes) {
+    return info.pcodes.reverse();
+  }
+
+  if (info) {
+    areaCodes.push(areaCode);
+
+    if (info[pkey] && info[pkey] * 1 !== 0) {
+      getPlaceCodesWithParent(info.parentCode, areaCodes, list, key, pkey);
+    }
+  }
+
+  return areaCodes;
+}

package/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "name": "@cloud-app-dev/vidc",
   "description": "Video Image Data Componennts",
-  "version": "1.0.32",
+  "version": "1.0.36",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -30,19 +30,19 @@
     ]
   },
   "dependencies": {
+    "@cloud-app-dev/utils": "^1.0.2",
     "chroma-js": "^2.1.2",
     "jsencrypt": "^3.2.1",
     "lodash": "^4.17.21",
     "mobx": "^6.3.2",
-    "rc-queue-anim": "^2.0.0",
-    "@cloud-app-dev/utils": "^1.0.1"
+    "rc-queue-anim": "^2.0.0"
   },
   "devDependencies": {
-    "antd": "^4.17.0",
-    "@cloud-app-dev/basic-components": "^1.0.46",
+    "@cloud-app-dev/basic-components": "^1.0.49",
     "@types/chroma-js": "^2.1.3",
     "@types/lodash": "^4.14.172",
     "@umijs/test": "^3.0.5",
+    "antd": "^4.17.0",
     "babel-plugin-import": "^1.13.3",
     "dumi": "^1.1.25",
     "father-build": "^1.19.8",

package/tsconfig.json

@@ -26,7 +26,6 @@
     "skipLibCheck": true,
     "resolveJsonModule": true,
     "paths": {
-      "@/*": ["src/*"],
       "@@/*": ["src/.umi/*"],
       "@@@/*": ["docs/*"]
     },

package/es/DynamicDeviceList/interface.d.ts

@@ -1,75 +0,0 @@
-export interface DeviceItemType {
-  ability: any;
-  accessType: null;
-  aliasBrand: null;
-  appSystemId: string;
-  areaLevel: number;
-  bindUserid: string;
-  boxNum: string;
-  buzGroupId: string;
-  buzGroupIds: string[];
-  buzGroupName: string;
-  cameraType: string;
-  capDirection: string;
-  cid: string;
-  createTime: string;
-  deleteFlag: number;
-  detailLiftBuild: number;
-  detailLiftUnit: number;
-  deviceBrand: number;
-  deviceIp: string;
-  deviceModel: string;
-  deviceName: string;
-  devicePlace: string;
-  deviceStatus: 0 | 1;
-  deviceType: string;
-  extJson: any;
-  fullPy: string;
-  gbId: string;
-  geoCoordinateSystem: string;
-  groupId: string;
-  groupIds: string[];
-  groupName: string;
-  hadLocaltion: boolean;
-  hasFrontEnd: boolean;
-  hasStorage: boolean;
-  id: string;
-  inOutDirection: any;
-  industry: any;
-  industry1: string;
-  industry2: string;
-  installationLocationDetail: any;
-  installationMethod: any;
-  installationSite: any;
-  ipAddr: any;
-  ipV6Addr: any;
-  isBind: any;
-  isIdleDeal: any;
-  latitude: number;
-  longitude: number;
-  maintenancePerson: any;
-  maintenancePhone: any;
-  maintenanceUnit: any;
-  manufacturerDeviceType: string;
-  monitorAreaDesc: any;
-  monitorDirection: any;
-  operationCenterIds: any;
-  orgCode: any;
-  parentId: any;
-  pathId: string[];
-  place: string;
-  placeCode: string;
-  placeId: string;
-  placeIds: string[];
-  placeName: null;
-  placeTags: string[];
-  port: string;
-  ptzControl: string;
-  simpPy: string;
-  sn: string;
-  snapshotMode: string;
-  sourceFrom: string;
-  superiorGbcode: string;
-  tags: string;
-  villageLocationType: string;
-}