@cloud-app-dev/vidc 1.0.47 → 1.0.51

package/.umirc.ts

@@ -2,7 +2,7 @@ import { defineConfig } from 'dumi';
 import path from 'path';
 
 const token =
-  'eyJhbGciOiJIUzI1NiJ9.eyJvcmdhbml6YXRpb25JZCI6IjEwMDEwMTAwMDQ0NiIsImV4dCI6MTYzODA3ODM3NjE0NSwidWlkIjoiMTAxMDAwMDAwMjQ5IiwidmFsaWRTdGF0ZSI6MTA0NDA2LCJyb2xlSWQiOlsxMDAwMDAxMTAzODddLCJ2YWxpZFRpbWUiOm51bGwsIm9wdENlbnRlcklkIjoiMTAwMTAwMDAwMjMzIiwidXNlclR5cGUiOjEwMDcwMiwiaWF0IjoxNjM3ODE5MTc2MTQ1fQ.x9o6vi8T5YW7P05AkeQh1Sse8sp6tGs7zxUWgB_rxtk';
+  'eyJhbGciOiJIUzI1NiJ9.eyJvcmdhbml6YXRpb25JZCI6IjEwMDEwMTAwMDQ0NiIsImV4dCI6MTYzODY4NzgyNzEwNywidWlkIjoiMTAxMDAwMDAwMjQ5IiwidmFsaWRTdGF0ZSI6MTA0NDA2LCJyb2xlSWQiOlsxMDAwMDAxMTAzODddLCJ2YWxpZFRpbWUiOm51bGwsIm9wdENlbnRlcklkIjoiMTAwMTAwMDAwMjMzIiwidXNlclR5cGUiOjEwMDcwMiwiaWF0IjoxNjM4NDI4NjI3MTA3fQ.eEvUc9_eGBdUi2QCMDNjOYgTzTKwiLX-7DEQ_O9kjhs';
 
 export default defineConfig({
   title: '云应用-业务组件库',

package/README.md

@@ -25,3 +25,7 @@ Build library via `father-build`,
 ```bash
 $ npm run build
 ```
+
+### Changlog
+
+- 1.0.48 修复工作流 bug

package/es/AppLayout/Header/ModifyUserAvatar/index.css

@@ -19,3 +19,7 @@
   display: flex;
   align-items: flex-end;
 }
+.lm-c-modify-user-avatar-box .lm-upload-content {
+  width: 100%;
+  height: 100%;
+}

package/es/AppLayout/Header/ModifyUserAvatar/index.js

@@ -1,6 +1,5 @@
 import _IconFont from "@cloud-app-dev/basic-components/es/IconFont";
 import _ImageView from "@cloud-app-dev/basic-components/es/ImageView";
-import _CBox from "@cloud-app-dev/basic-components/es/CBox";
 import _ContentBox from "@cloud-app-dev/basic-components/es/ContentBox";
 import _Drawer from "@cloud-app-dev/basic-components/es/Drawer";
 import "antd/lib/message/style";
@@ -82,11 +81,11 @@ function ModifyUserAvatar(_ref) {
     className: "user-avatar-upload"
   }, /*#__PURE__*/React.createElement(FormUpload, {
     customUpload: uploadImg
-  }, userAvatarUrl ? /*#__PURE__*/React.createElement(_CBox, {
+  }, userAvatarUrl ? /*#__PURE__*/React.createElement("div", {
     className: "lm-upload-content"
   }, /*#__PURE__*/React.createElement(_ImageView, {
     src: userAvatarUrl
-  })) : /*#__PURE__*/React.createElement(_CBox, {
+  })) : /*#__PURE__*/React.createElement("div", {
     className: "lm-upload-content lm-c-normol-box"
   }, /*#__PURE__*/React.createElement(_IconFont, {
     type: "icon-L_Bar_AddImg"

package/es/AutoExit/index.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 export interface IAutoExitProps {
-    children: React.ReactNode;
+    children?: React.ReactNode;
 }
 declare function AutoExit({ children }: IAutoExitProps): JSX.Element;
 export default AutoExit;

package/es/OrgTree/index.js

@@ -1,6 +1,5 @@
 function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
-import _CBox from "@cloud-app-dev/basic-components/es/CBox";
 import _Tree from "@cloud-app-dev/basic-components/es/Tree";
 import _IconFont from "@cloud-app-dev/basic-components/es/IconFont";
 import _Store from "@cloud-app-dev/basic-components/es/Store";
@@ -133,7 +132,7 @@ var OrgTree = /*#__PURE__*/function (_React$Component) {
           props = _objectWithoutProperties(_this$props3, _excluded);
 
       var expandedKeys = this.state.expandedKeys;
-      return /*#__PURE__*/React.createElement(_CBox, {
+      return /*#__PURE__*/React.createElement("div", {
         className: "lm-organization-tree ".concat(className)
       }, title ? /*#__PURE__*/React.createElement(TreeTitle, {
         title: title,

package/es/OrgUserTree/index.js

@@ -1,6 +1,5 @@
 import _IconFont from "@cloud-app-dev/basic-components/es/IconFont";
 import _Tree from "@cloud-app-dev/basic-components/es/Tree";
-import _CBox from "@cloud-app-dev/basic-components/es/CBox";
 import _treeHelper from "@cloud-app-dev/utils/es/treeHelper";
 import _useHttp2 from "@cloud-app-dev/basic-components/es/useHttp";
 
@@ -87,7 +86,7 @@ function OrgUserTree(_a) {
       onDefailtSelect(treeData[0].id);
     }
   }, [treeData]);
-  return /*#__PURE__*/React.createElement(_CBox, {
+  return /*#__PURE__*/React.createElement("div", {
     className: "bc-org-user-tree-layout ".concat(className)
   }, title ? /*#__PURE__*/React.createElement(TreeTitle, {
     title: title,

package/es/PlaceTree/index.js

@@ -1,6 +1,5 @@
 import _IconFont from "@cloud-app-dev/basic-components/es/IconFont";
 import _Tree from "@cloud-app-dev/basic-components/es/Tree";
-import _CBox from "@cloud-app-dev/basic-components/es/CBox";
 import _Store from "@cloud-app-dev/basic-components/es/Store";
 import _treeHelper from "@cloud-app-dev/utils/es/treeHelper";
 
@@ -124,7 +123,7 @@ function PlaceTree(params) {
       });
     });
   }, [keyword]);
-  return /*#__PURE__*/React.createElement(_CBox, {
+  return /*#__PURE__*/React.createElement("div", {
     className: "lm-c-place-tree ".concat(className)
   }, /*#__PURE__*/React.createElement(TreeTitle, {
     title: title,

package/es/RefDrawer/index.d.ts

@@ -7,9 +7,9 @@ export interface IUseDrawerHookState {
     width?: number | string;
     className?: string;
 }
-export interface IDrawerMethodsProps {
+export interface IRefDrawerMethodsProps {
     open: (options: IUseDrawerHookState) => void;
     close: () => void;
 }
-declare const _default: React.ForwardRefExoticComponent<Pick<any, string | number | symbol> & React.RefAttributes<IDrawerMethodsProps>>;
+declare const _default: React.ForwardRefExoticComponent<Pick<any, string | number | symbol> & React.RefAttributes<IRefDrawerMethodsProps>>;
 export default _default;

package/es/RefModal/index.d.ts

@@ -7,9 +7,9 @@ export interface IUseModalHookState {
     width?: number | string;
     className?: string;
 }
-export interface IModalMethodsProps {
+export interface IRefModalMethodsProps {
     open: (options: IUseModalHookState) => void;
     close: () => void;
 }
-declare const _default: React.ForwardRefExoticComponent<Pick<any, string | number | symbol> & React.RefAttributes<IModalMethodsProps>>;
+declare const _default: React.ForwardRefExoticComponent<Pick<any, string | number | symbol> & React.RefAttributes<IRefModalMethodsProps>>;
 export default _default;

package/es/TreeMode/index.js

@@ -1,6 +1,5 @@
 import _IconFont from "@cloud-app-dev/basic-components/es/IconFont";
 import _Tree from "@cloud-app-dev/basic-components/es/Tree";
-import _CBox from "@cloud-app-dev/basic-components/es/CBox";
 import _treeHelper from "@cloud-app-dev/utils/es/treeHelper";
 import _useHttp2 from "@cloud-app-dev/basic-components/es/useHttp";
 
@@ -153,7 +152,7 @@ function TreeMode(_a) {
       onDefailtSelect(id);
     }
   }, [treeData, treeKey]);
-  return /*#__PURE__*/React.createElement(_CBox, {
+  return /*#__PURE__*/React.createElement("div", {
     className: "bc-type-tree-layout ".concat(className)
   }, /*#__PURE__*/React.createElement(TreeTitle, {
     title: title,

package/es/WorkerFlow/Demo.js

@@ -47,6 +47,7 @@ var App = function App() {
   }, /*#__PURE__*/React.createElement(WorkerFlow, {
     form: form,
     data: data.data,
+    readOnly: false,
     onChange: console.log,
     hasTools: true,
     errorIds: ['UserTask_2222', 'SequenceFlow_6666']

package/es/WorkerFlow/Form/Condition.js

@@ -4,7 +4,6 @@ import "antd/lib/button/style";
 import _Button from "antd/lib/button";
 import _IconFont from "@cloud-app-dev/basic-components/es/IconFont";
 import _ContentBox from "@cloud-app-dev/basic-components/es/ContentBox";
-import _useChangeEffect from "@cloud-app-dev/basic-components/es/useChangeEffect";
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
@@ -18,20 +17,23 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { useCallback, useImperativeHandle, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import RefModal from '../../RefModal';
 
 function ConditionForm(_ref) {
   var form = _ref.form,
       item = _ref.item,
       onChange = _ref.onChange,
-      useConditionFields = _ref.useConditionFields;
+      _ref$useConditionFiel = _ref.useConditionFields,
+      useConditionFields = _ref$useConditionFiel === void 0 ? [] : _ref$useConditionFiel;
 
   var _a, _b;
 
+  console.log(item, useConditionFields);
+
   var _useState = useState({
-    field: ((_a = item === null || item === void 0 ? void 0 : item.conditionList[0]) === null || _a === void 0 ? void 0 : _a.field) || '',
-    value: ((_b = item === null || item === void 0 ? void 0 : item.conditionList[0]) === null || _b === void 0 ? void 0 : _b.value) || ''
+    field: (item === null || item === void 0 ? void 0 : item.conditionList) ? (_a = item.conditionList[0]) === null || _a === void 0 ? void 0 : _a.field : '',
+    value: (item === null || item === void 0 ? void 0 : item.conditionList) ? (_b = item === null || item === void 0 ? void 0 : item.conditionList[0]) === null || _b === void 0 ? void 0 : _b.value : ''
   }),
       _useState2 = _slicedToArray(_useState, 2),
       state = _useState2[0],
@@ -103,8 +105,7 @@ function ConditionForm(_ref) {
       };
     });
   }, []);
-
-  _useChangeEffect(function () {
+  useEffect(function () {
     if (state.field !== undefined && state.value !== undefined && formItem) {
       var conditionList = [{
         field: state.field,
@@ -128,7 +129,6 @@ function ConditionForm(_ref) {
       });
     }
   }, [state.field, state.value, formItem, options]);
-
   return /*#__PURE__*/React.createElement(_ContentBox.InfoBox, {
     title: "\u8BBE\u7F6E\u6761\u4EF6",
     contentStyle: {

package/es/WorkerFlow/Form/GroupList.d.ts

@@ -5,6 +5,7 @@ interface IGroupListProps {
     checkedKeys: string[];
     keywords?: string;
     onChecked: (ids: string[]) => void;
+    title: string;
 }
-declare function GroupList({ list, onKeywordChange, onChecked, checkedKeys }: IGroupListProps): JSX.Element;
+declare function GroupList({ list, onKeywordChange, onChecked, checkedKeys, title }: IGroupListProps): JSX.Element;
 export default GroupList;

package/es/WorkerFlow/Form/GroupList.js

@@ -7,12 +7,13 @@ function GroupList(_ref) {
   var list = _ref.list,
       onKeywordChange = _ref.onKeywordChange,
       onChecked = _ref.onChecked,
-      checkedKeys = _ref.checkedKeys;
+      checkedKeys = _ref.checkedKeys,
+      title = _ref.title;
   return /*#__PURE__*/React.createElement("div", {
     className: "lm-c-check-list-wrapper vidc-list-component post-group-list"
   }, /*#__PURE__*/React.createElement(TreeTitle, {
     titleExt: false,
-    title: "\u5DF2\u6DFB\u52A0(".concat(list.length, ")\u4E2A"),
+    title: title,
     inputPlaceholder: "\u8BF7\u8F93\u5165\u5C97\u4F4D\u540D\u79F0",
     onChange: onKeywordChange
   }), /*#__PURE__*/React.createElement("div", {

package/es/WorkerFlow/Form/GroupSelectModalContent.js

@@ -156,7 +156,8 @@ function GroupSelectModalContent(_ref, ref) {
       });
     },
     keywords: state.keyword1,
-    onChecked: onUserChecked1
+    onChecked: onUserChecked1,
+    title: "\u5C97\u4F4D\u5217\u8868"
   }), /*#__PURE__*/React.createElement(GroupList, {
     list: renderList,
     checkedKeys: state.selectIds,
@@ -168,7 +169,8 @@ function GroupSelectModalContent(_ref, ref) {
       });
     },
     keywords: state.keyword2,
-    onChecked: onUserChecked2
+    onChecked: onUserChecked2,
+    title: "\u5DF2\u6DFB\u52A0\uFF08".concat(state.selectIds.length, "\uFF09")
   }));
 }
 

package/es/WorkerFlow/Form/UserSet.js

@@ -170,15 +170,10 @@ function UserSelectType2(_ref3) {
       _onChange3 = _ref3.onChange,
       type = _ref3.type,
       emptyUsers = _ref3.emptyUsers;
-  var userList = useMemo(function () {
-    return users.filter(function (v) {
-      return v.key === 'userId';
-    });
-  }, [users]);
   return /*#__PURE__*/React.createElement("div", {
     className: "user-select-type1"
   }, /*#__PURE__*/React.createElement(UserAndGroupSelect, {
-    userList: userList,
+    userList: users,
     onChange: function onChange(users) {
       return _onChange3(_defineProperty({}, type, users));
     }

package/es/WorkerFlow/Nodes/TitleElement.js

@@ -13,7 +13,8 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { useState, useEffect, useRef, useCallback } from 'react';
+import React, { useState, useEffect, useRef, useCallback, useContext } from 'react';
+import WFC from '../OperatorContext';
 
 function TitleElement(_ref) {
   var nodeName = _ref.nodeName,
@@ -22,6 +23,9 @@ function TitleElement(_ref) {
       icon = _ref.icon,
       delNode = _ref.delNode;
 
+  var _useContext = useContext(WFC),
+      readOnly = _useContext.readOnly;
+
   var _useState = useState(nodeName),
       _useState2 = _slicedToArray(_useState, 2),
       title = _useState2[0],
@@ -41,11 +45,11 @@ function TitleElement(_ref) {
     }
   }, [title, placeholder]);
   useEffect(function () {
-    return editable && input.current.focus();
+    return !readOnly && editable && input.current.focus();
   }, [editable]);
 
   _useChangeEffect(function () {
-    !editable && onTitleChange && onTitleChange(title);
+    !readOnly && !editable && onTitleChange && onTitleChange(title);
   }, [title, editable]);
 
   return /*#__PURE__*/React.createElement(React.Fragment, null, icon && /*#__PURE__*/React.createElement(_IconFont, {
@@ -53,7 +57,7 @@ function TitleElement(_ref) {
     style: {
       paddingRight: 4
     }
-  }), editable ? /*#__PURE__*/React.createElement("input", {
+  }), !readOnly && editable ? /*#__PURE__*/React.createElement("input", {
     ref: input,
     type: "text",
     className: "cloudapp-input editable-title-input",
@@ -70,8 +74,11 @@ function TitleElement(_ref) {
     className: "editable-title",
     onClick: function onClick() {
       return setEditable(true);
-    }
-  }, title), /*#__PURE__*/React.createElement(_IconFont, {
+    },
+    style: readOnly ? {
+      borderColor: 'transparent'
+    } : undefined
+  }, title), !readOnly && /*#__PURE__*/React.createElement(_IconFont, {
     className: "worker-flow-node-del",
     type: "icon-MarkNo",
     onClick: delNode,

package/es/WorkerFlow/XML/UserTask.js

@@ -48,6 +48,10 @@ export function createUserTask(xml, node, pids, stopId) {
 
     multiInstanceLoopCharacteristics.setAttribute('camunda:collection', "assigneeList_".concat(node.id));
     multiInstanceLoopCharacteristics.setAttribute('camunda:elementVariable', "users_".concat(node.id));
+    var completionCondition = xml.createElement('bpmn:completionCondition');
+    completionCondition.setAttribute('xsi:type', 'bpmn:tFormalExpression');
+    completionCondition.innerHTML = '${!dealBlank}';
+    multiInstanceLoopCharacteristics.appendChild(completionCondition);
     userTask.appendChild(multiInstanceLoopCharacteristics);
   }
 

package/es/WorkerFlow/index.js

@@ -70,8 +70,17 @@ function WorkerFlow(_ref, ref) {
 
   var updateNode = function updateNode() {
     return setConfig(Object.assign({}, config));
-  }; // 链表操作: 几种行为， 添加行为，删除行为，点击行为     pRef.childNode -> node.childNode -> 后继
-  // 添加节点
+  };
+  /**
+   * @mate 节点函数介绍
+   * @description 链表操作: 几种行为， 添加行为，删除行为，点击行为     pRef.childNode -> node.childNode -> 后继
+   */
+
+  /**
+   * @description 添加节点
+   * @param type
+   * @param node
+   */
 
 
   function onInsertNode(type, node) {
@@ -114,7 +123,15 @@ function WorkerFlow(_ref, ref) {
     }
 
     updateNode();
-  } // 删除节点
+  }
+  /**
+   * @description 删除节点的操作
+   * @param parentNode
+   * @param node
+   * @param type
+   * @param index
+   * @returns
+   */
 
 
   function onDeleteNode(parentNode, node, type, index) {
@@ -164,7 +181,14 @@ function WorkerFlow(_ref, ref) {
     modal.confirm(Object.assign(Object.assign({}, options), {
       onOk: onOk
     }));
-  } // 获取节点
+  }
+  /**
+   * @description 选中节点操作
+   * @param node
+   * @param parentNode
+   * @param index
+   * @returns
+   */
 
 
   function onSelectNode(node, parentNode, index) {
@@ -207,9 +231,12 @@ function WorkerFlow(_ref, ref) {
     }).includes(node.type)) {
       var nodeName = node.type === 4 ? node.conditionNodes[index].nodeName : node.nodeName;
       var FormContent = FormMap[node.type];
-      var useConditionFields = node.type === 4 ? _toConsumableArray(node.conditionNodes.map(function (v) {
+      var fiels = node.type === 4 ? _toConsumableArray(node.conditionNodes.map(function (v) {
         return v.id !== node.conditionNodes[index].id ? v.conditionList : [];
       })).flat() : [];
+      var useConditionFields = fiels.filter(function (v) {
+        return !!v;
+      });
       var nodeItem = node.type === 4 ? node.conditionNodes[index] : node;
       var from = nodeItem.form ? form.map(function (v) {
         return nodeItem.form.find(function (v2) {
@@ -260,12 +287,17 @@ function WorkerFlow(_ref, ref) {
       useFormKeys: useFormKeys
     };
   }, [config]);
+  /**
+   * @description onChange传递数据
+   */
 
   _useChangeEffect(function () {
-    if (onChange) {
-      onChange(getConfig());
-    }
+    return onChange && onChange(getConfig());
   }, [config]);
+  /**
+   * @description ref传递数据
+   */
+
 
   useImperativeHandle(ref, function () {
     return {

package/es/WorkerFlow/utils.js

@@ -168,7 +168,7 @@ export function getUserFormKeys(data) {
   var arr = [];
 
   var fn = function fn(node) {
-    if (node.bpmnType == 'sequenceFlow') {
+    if (node.bpmnType == 'sequenceFlow' && node.conditionList) {
       arr.push.apply(arr, _toConsumableArray(node.conditionList));
     }
 

package/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "name": "@cloud-app-dev/vidc",
   "description": "Video Image Data Componennts",
-  "version": "1.0.47",
+  "version": "1.0.51",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -37,8 +37,8 @@
     "rc-queue-anim": "^2.0.0"
   },
   "devDependencies": {
-    "@cloud-app-dev/utils": "^2.0.1",
-    "@cloud-app-dev/basic-components": "^1.0.58",
+    "@cloud-app-dev/utils": "^2.0.2",
+    "@cloud-app-dev/basic-components": "^1.0.62",
     "@types/chroma-js": "^2.1.3",
     "@types/lodash": "^4.14.172",
     "@umijs/test": "^3.0.5",