@cloud-app-dev/vidc 1.0.34 → 1.0.38

package/es/WorkerFlow/Form/GroupSelectModalContent.js

@@ -21,8 +21,8 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useCallback, useMemo, useState, useImperativeHandle } from 'react';
-import api from '../api';
-import OrgTree from '../../OrgTree';
+import api from '../../Api';
+import TreeMode from '../../TreeMode';
 import List from '../../List';
 import { uniq, intersectionWith } from 'lodash';
 import { treeHelper } from '@cloud-app-dev/utils';
@@ -66,10 +66,10 @@ function GroupSelectModalContent(_ref, ref) {
     return id ? api.getPosts(id) : Promise.resolve();
   }),
       _useHttp3$data = _useHttp3.data,
-      userList = _useHttp3$data === void 0 ? [] : _useHttp3$data;
+      groupList = _useHttp3$data === void 0 ? [] : _useHttp3$data;
 
   var onUserChecked1 = useCallback(function (ids) {
-    var items = userList.filter(function (v) {
+    var items = groupList.filter(function (v) {
       return ids.includes(v.id);
     });
     var arr = [];
@@ -90,7 +90,7 @@ function GroupSelectModalContent(_ref, ref) {
         selectIds: uniq([].concat(_toConsumableArray(old.selectIds), _toConsumableArray(ids)))
       });
     });
-  }, [userList, orgList]);
+  }, [groupList, orgList]);
   var onUserChecked2 = useCallback(function (ids) {
     return setState(function (old) {
       return Object.assign(Object.assign({}, old), {
@@ -99,12 +99,12 @@ function GroupSelectModalContent(_ref, ref) {
     });
   }, []);
   var list1CheckedKeys = useMemo(function () {
-    return intersectionWith(userList, state.selectUsers, function (a, b) {
+    return intersectionWith(groupList, state.selectUsers, function (a, b) {
       return a.id === b.value;
     }).map(function (v) {
       return v.id;
     });
-  }, [userList, state.selectUsers]);
+  }, [groupList, state.selectUsers]);
   useImperativeHandle(ref, function () {
     return {
       userList: state.selectUsers.filter(function (v) {
@@ -117,8 +117,9 @@ function GroupSelectModalContent(_ref, ref) {
   }, [state.selectUsers]);
   return /*#__PURE__*/React.createElement("div", {
     className: "user-select-modal-content"
-  }, /*#__PURE__*/React.createElement(OrgTree, {
+  }, /*#__PURE__*/React.createElement(TreeMode, {
     treeData: treeData,
+    mode: "Org",
     title: "\u7EC4\u7EC7\u673A\u6784",
     onSelect: function onSelect(ids) {
       return setState(function (old) {
@@ -127,11 +128,11 @@ function GroupSelectModalContent(_ref, ref) {
         });
       });
     },
-    activeKey: selectId
+    selectedKeys: [selectId]
   }), /*#__PURE__*/React.createElement(List, {
     onChecked: onUserChecked1,
-    list: userList,
-    key: userList.length,
+    list: groupList,
+    key: groupList.length,
     checkedKeys: list1CheckedKeys,
     itemKey: "id",
     itemNameKey: "postName",

package/es/WorkerFlow/Form/LevelGroupSelect.js

@@ -26,7 +26,7 @@ import _ from 'lodash';
 import chroma from 'chroma-js';
 import GroupSelectModalContent from './GroupSelectModalContent';
 import { formatRenderGroup } from './utils';
-import RefModal from '../RefModal';
+import RefModal from '../../RefModal';
 
 function LevelGroupSelect(_ref) {
   var _this = this;

package/es/WorkerFlow/Form/Notifier.js

@@ -7,7 +7,8 @@ function NotifierForm(_ref) {
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(UserSet, {
     userType: item.userType,
     nodeUserList: item.nodeUserList,
-    onChange: onChange
+    onChange: onChange,
+    includeUserTypes: [1]
   }));
 }
 

package/es/WorkerFlow/Form/UserAndGroupSelect.js

@@ -26,7 +26,7 @@ import _ from 'lodash';
 import chroma from 'chroma-js';
 import UserSelectModalContent from './UserSelectModalContent';
 import GroupSelectModalContent from './GroupSelectModalContent';
-import RefModal from '../RefModal';
+import RefModal from '../../RefModal';
 
 function UserAndGroupSelect(_ref) {
   var _this = this;

package/es/WorkerFlow/Form/UserSelect.js

@@ -23,7 +23,7 @@ import React, { useCallback, useMemo, useRef, useState, useEffect } from 'react'
 import _ from 'lodash';
 import chroma from 'chroma-js';
 import UserSelectModalContent from './UserSelectModalContent';
-import RefModal from '../RefModal';
+import RefModal from '../../RefModal';
 
 function UserSelect(_ref) {
   var _this = this;

package/es/WorkerFlow/Form/UserSelectModalContent.js

@@ -21,11 +21,10 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useCallback, useMemo, useState, forwardRef, useImperativeHandle } from 'react';
-import api from '../api';
-import OrgTree from '../../OrgTree';
-import { treeHelper } from '@cloud-app-dev/utils';
+import api from '../../Api';
+import TreeMode from '../../TreeMode';
 import List from '../../List';
-import { uniq, intersectionWith } from 'lodash';
+import { uniq, intersectionWith, uniqBy, differenceWith } from 'lodash';
 var UserSelectModalContent = /*#__PURE__*/forwardRef(function UserSelectModalContent(_ref, ref) {
   var selectUsers = _ref.selectUsers;
 
@@ -34,6 +33,9 @@ var UserSelectModalContent = /*#__PURE__*/forwardRef(function UserSelectModalCon
     keyword2: '',
     orgId: '',
     selectUsers: selectUsers,
+    list1CheckedKeys: selectUsers.map(function (v) {
+      return v.value;
+    }),
     selectIds: selectUsers.map(function (v) {
       return v.value;
     })
@@ -42,33 +44,23 @@ var UserSelectModalContent = /*#__PURE__*/forwardRef(function UserSelectModalCon
       state = _useState2[0],
       setState = _useState2[1];
 
-  var _useHttp = _useHttp2('QueryOrgList', function () {
-    return api.getOrgs();
-  }),
-      _useHttp$data = _useHttp.data,
-      orgList = _useHttp$data === void 0 ? [] : _useHttp$data;
-
-  var treeData = useMemo(function () {
-    return treeHelper.computTreeList(orgList);
-  }, [orgList]);
-  var selectId = useMemo(function () {
-    return state.orgId ? state.orgId : treeData[0] ? treeData[0].id : undefined;
-  }, [treeData, state.orgId]);
-
-  var _useHttp3 = _useHttp2(['QueryUserList', selectId], function (_ref2) {
+  var _useHttp = _useHttp2(['QueryUserList', state.orgId], function (_ref2) {
     var _ref3 = _slicedToArray(_ref2, 2),
         _ = _ref3[0],
         id = _ref3[1];
 
     return id ? api.getUsers(id) : Promise.resolve();
   }),
-      _useHttp3$data = _useHttp3.data,
-      userList = _useHttp3$data === void 0 ? [] : _useHttp3$data;
+      _useHttp$data = _useHttp.data,
+      userList = _useHttp$data === void 0 ? [] : _useHttp$data;
 
   var onUserChecked1 = useCallback(function (ids) {
     var items = userList.filter(function (v) {
       return ids.includes(v.id);
     });
+    var notInList = differenceWith(state.selectUsers, userList, function (a, b) {
+      return a.value === b.id;
+    });
     var arr = [];
     items.forEach(function (item) {
       arr.push({
@@ -79,11 +71,12 @@ var UserSelectModalContent = /*#__PURE__*/forwardRef(function UserSelectModalCon
     });
     setState(function (old) {
       return Object.assign(Object.assign({}, old), {
-        selectUsers: arr,
+        selectUsers: uniqBy([].concat(_toConsumableArray(notInList), arr), 'value'),
+        list1CheckedKeys: ids,
         selectIds: uniq([].concat(_toConsumableArray(old.selectIds), _toConsumableArray(ids)))
       });
     });
-  }, [userList]);
+  }, [userList, state.selectUsers]);
   var onUserChecked2 = useCallback(function (ids) {
     return setState(function (old) {
       return Object.assign(Object.assign({}, old), {
@@ -107,9 +100,16 @@ var UserSelectModalContent = /*#__PURE__*/forwardRef(function UserSelectModalCon
   }, [state.selectUsers, state.selectIds]);
   return /*#__PURE__*/React.createElement("div", {
     className: "user-select-modal-content"
-  }, /*#__PURE__*/React.createElement(OrgTree, {
-    treeData: treeData,
+  }, /*#__PURE__*/React.createElement(TreeMode, {
     title: "\u7EC4\u7EC7\u673A\u6784",
+    onDefailtSelect: function onDefailtSelect(orgId) {
+      return setState(function (old) {
+        return Object.assign(Object.assign({}, old), {
+          orgId: orgId
+        });
+      });
+    },
+    inputPlaceholder: "\u8BF7\u8F93\u5165\u540D\u79F0",
     onSelect: function onSelect(ids) {
       return setState(function (old) {
         return Object.assign(Object.assign({}, old), {
@@ -117,7 +117,8 @@ var UserSelectModalContent = /*#__PURE__*/forwardRef(function UserSelectModalCon
         });
       });
     },
-    activeKey: selectId
+    selectedKeys: [state.orgId],
+    mode: "Org"
   }), /*#__PURE__*/React.createElement(List, {
     onChecked: onUserChecked1,
     list: userList,

package/es/WorkerFlow/Form/UserSet.js

@@ -73,6 +73,9 @@ function UserSet(_ref) {
       return cloneDeep(Object.assign(Object.assign({}, old), options));
     });
   }, []);
+  var users = useMemo(function () {
+    return state[state.type];
+  }, [state]);
   var data = useMemo(function () {
     return {
       userType: state.type,
@@ -106,7 +109,7 @@ function UserSet(_ref) {
   })), /*#__PURE__*/React.createElement(Content, {
     type: state.type,
     emptyUsers: state.emptyUsers,
-    users: state[state.type],
+    users: users,
     chargeLevel: state.chargeLevel,
     usersHandType: state.usersHandType,
     onChange: function onChange(options) {
@@ -205,7 +208,7 @@ function UserSelectType3(_ref4) {
       emptyUsers = _ref4.emptyUsers;
   var userList = useMemo(function () {
     return users.filter(function (v) {
-      return v.key === 'userId';
+      return v.key === 'groupId';
     });
   }, [users]);
   return /*#__PURE__*/React.createElement("div", {

package/es/WorkerFlow/index.css

@@ -695,7 +695,7 @@
 .user-select-modal-content > div {
   flex: 1;
 }
-.user-select-modal-content .lm-organization-tree {
+.user-select-modal-content .bc-org-user-tree-layout {
   border-right: none;
 }
 .user-select-modal-content .user-source-list {

package/es/WorkerFlow/index.js

@@ -1,5 +1,6 @@
 import _useChangeEffect from "@cloud-app-dev/basic-components/es/useChangeEffect";
-import _Modal from "@cloud-app-dev/basic-components/es/Modal";
+import "antd/lib/modal/style";
+import _Modal from "antd/lib/modal";
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
@@ -37,7 +38,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 RefDrawer from '../RefDrawer';
 import "./index.css";
 var FormMap = {
   1: ApproverForm,
@@ -61,6 +62,11 @@ function WorkerFlow(_ref, ref) {
 
   var drawerRef = useRef(null);
 
+  var _Modal$useModal = _Modal.useModal(),
+      _Modal$useModal2 = _slicedToArray(_Modal$useModal, 2),
+      modal = _Modal$useModal2[0],
+      contextHolder = _Modal$useModal2[1];
+
   var updateNode = function updateNode() {
     return setConfig(Object.assign({}, config));
   }; // 链表操作: 几种行为， 添加行为，删除行为，点击行为     pRef.childNode -> node.childNode -> 后继
@@ -117,8 +123,9 @@ function WorkerFlow(_ref, ref) {
       return;
     }
 
+    var title = "\u662F\u5426\u5220\u9664\u8282\u70B9\"".concat(type === NodeTypes.BRANCH ? node.conditionNodes[index].nodeName : node.nodeName, "\"\uFF1F");
     var options = {
-      title: "\u662F\u5426\u5220\u9664\u8282\u70B9\"".concat(type === NodeTypes.BRANCH ? node.conditionNodes[index].nodeName : node.nodeName, "\"\uFF1F"),
+      title: title,
       okText: '确定',
       cancelText: '取消'
     };
@@ -153,7 +160,7 @@ function WorkerFlow(_ref, ref) {
       }));
     };
 
-    _Modal.confirm(Object.assign(Object.assign({}, options), {
+    modal.confirm(Object.assign(Object.assign({}, options), {
       onOk: onOk
     }));
   } // 获取节点
@@ -182,7 +189,7 @@ function WorkerFlow(_ref, ref) {
         node.form = data.form || [];
         node.userType = data.userType;
         node.usersHandType = data.usersHandType;
-        node.owner = data.nodeUserList.map(function (v) {
+        node.owner = data.userType === 4 ? '直属主管' : data.nodeUserList.map(function (v) {
           return v.name;
         }).join('，');
         node.emptyUserList = data.emptyUserList;
@@ -231,7 +238,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: {
@@ -279,7 +286,7 @@ function WorkerFlow(_ref, ref) {
   }), /*#__PURE__*/React.createElement(EndNode, {
     nodeName: "\u6D41\u7A0B\u7ED3\u675F",
     id: endId
-  })))), /*#__PURE__*/React.createElement(RefDrawer, {
+  }))), contextHolder), /*#__PURE__*/React.createElement(RefDrawer, {
     ref: drawerRef
   }));
 }

package/es/WorkerFlow/utils.js

@@ -15,7 +15,7 @@ export function getJAVATaskData(data) {
   var arr = [];
 
   var fn = function fn(node) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
 
     if (node.bpmnType === 'userTask') {
       var item = {
@@ -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) {
@@ -51,12 +51,12 @@ export function getJAVATaskData(data) {
         item.multiVariableName = "assigneeList_".concat(node.id);
       }
 
-      if (((_b = node.childNode) === null || _b === void 0 ? void 0 : _b.bpmnType) === 'userTask') {
+      if (((_b = node.childNode) === null || _b === void 0 ? void 0 : _b.bpmnType) === 'userTask' && ((_c = node.childNode) === null || _c === void 0 ? void 0 : _c.type) !== 2) {
         item.nextTaskId = node.childNode.id;
       }
 
       if (node.form) {
-        item.formAuthority = JSON.stringify((_c = node.form) === null || _c === void 0 ? void 0 : _c.map(function (v) {
+        item.formAuthority = JSON.stringify((_d = node.form) === null || _d === void 0 ? void 0 : _d.map(function (v) {
           return {
             formAuth: v.auth,
             formVariableName: v.name
@@ -64,7 +64,7 @@ export function getJAVATaskData(data) {
         }));
       }
 
-      if (((_d = node.childNode) === null || _d === void 0 ? void 0 : _d.type) === 2) {
+      if (((_e = node.childNode) === null || _e === void 0 ? void 0 : _e.type) === 2) {
         item.copyUserIds = node.childNode.nodeUserList.map(function (v) {
           return v.value;
         });
@@ -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.34",
+  "version": "1.0.38",
   "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.47",
+    "@cloud-app-dev/basic-components": "^1.0.51",
     "@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/*"]
     },