@cloud-app-dev/vidc 1.0.43 → 1.0.47

package/.umirc.ts

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

package/es/Api/index.d.ts

@@ -3,7 +3,7 @@ import { UserInfo } from '@cloud-app-dev/basic-components/es/Store/app';
 import { BzTreeItemType, PostItemType } from '../core';
 declare class Api {
     getOrgs(): Promise<OrgItemType[]>;
-    getUsers(organizationId: string): Promise<UserInfo[]>;
+    getUsers(organizationId: string, params?: any, filterUserIds?: string[]): Promise<UserInfo[]>;
     getPosts(orgId: string): Promise<PostItemType[]>;
     getDeviceBzTree(): Promise<BzTreeItemType[]>;
     getCustomDeviceGroup(): Promise<BzTreeItemType[]>;

package/es/Api/index.js

@@ -49,6 +49,11 @@ var Api = /*#__PURE__*/function () {
   }, {
     key: "getUsers",
     value: function getUsers(organizationId) {
+      var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      var filterUserIds = arguments.length > 2 ? arguments[2] : undefined;
+
+      var _a, _b;
+
       return __awaiter(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
         var res;
         return regeneratorRuntime.wrap(function _callee2$(_context2) {
@@ -61,18 +66,20 @@ var Api = /*#__PURE__*/function () {
                   method: 'post',
                   requestId: 'queryUsers',
                   headers: getHeader(),
-                  data: {
+                  data: Object.assign({
                     containSubOrganization: 1,
                     limit: 10000,
                     offset: 0,
                     organizationId: organizationId,
                     validState: ['104406']
-                  }
+                  }, params)
                 });
 
               case 2:
                 res = _context2.sent;
-                return _context2.abrupt("return", res.data.list);
+                return _context2.abrupt("return", !filterUserIds ? (_a = res.data) === null || _a === void 0 ? void 0 : _a.list : (((_b = res.data) === null || _b === void 0 ? void 0 : _b.list) || []).filter(function (v) {
+                  return !filterUserIds.includes(v.id);
+                }));
 
               case 4:
               case "end":

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

@@ -88,7 +88,7 @@ function ModifyPassword(_ref) {
               case 14:
                 _context.prev = 14;
                 _context.t0 = _context["catch"](1);
-                console.log(_context.t0);
+                console.error(_context.t0);
 
                 try {
                   msg = (_a = _context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.data) === null || _a === void 0 ? void 0 : _a.message;

package/es/List/index.css

@@ -1,3 +1,9 @@
 .vidc-list-component {
   margin-left: -1px;
 }
+.vidc-list-component .lm-c-base-list-layout .list-item .item-info .anticon {
+  color: var(--icon);
+}
+.vidc-list-component .lm-c-base-list-layout .list-item:hover .item-info .anticon {
+  color: inherit;
+}

package/es/TreeMode/demo.js

@@ -20,7 +20,9 @@ function App() {
     mode: "Custom"
   }), /*#__PURE__*/React.createElement(BsTree, {
     title: "\u884C\u653F\u533A\u5212",
-    mode: "Place"
+    mode: "Place",
+    checkable: true,
+    checkStrictly: true
   }), /*#__PURE__*/React.createElement(BsTree, {
     title: "\u7EC4\u7EC7\u673A\u6784",
     mode: "Org"

package/es/TreeMode/index.css

@@ -13,11 +13,6 @@
   flex: 1;
   overflow: auto;
 }
-.bc-type-tree-layout .lm-base-tree-component .cloudapp-tree-treenode span.cloudapp-tree-node-content-wrapper:hover:after,
-.bc-type-tree-layout .lm-base-tree-component .cloudapp-tree-treenode span.cloudapp-tree-node-content-wrapper.cloudapp-tree-node-selected:after {
-  left: 10px;
-  width: calc(100% - 10px);
-}
 .bc-type-tree-layout .cloudapp-tree {
   height: 100%;
   overflow: auto;
@@ -34,3 +29,10 @@
   display: inline-flex;
   justify-content: space-between;
 }
+.bc-type-tree-layout .cloudapp-tree-title > span .anticon {
+  font-size: 16px;
+  color: var(--icon);
+  padding-right: 6px;
+  position: relative;
+  top: 1px;
+}

package/es/TreeMode/index.d.ts

@@ -11,12 +11,13 @@ interface IBsTreeProps extends BaseTreeProps {
     onDefailtSelect?: (id?: string) => void;
     mode?: 'Bz' | 'Custom' | 'Place' | 'Org';
 }
-declare function TreeMode({ title, className, renderHeader, inputPlaceholder, treeNodeProps, onDefailtSelect, mode, ...props }: IBsTreeProps): JSX.Element;
+declare function TreeMode({ title, className, renderHeader, inputPlaceholder, treeNodeProps, onDefailtSelect, mode, showIcon, ...props }: IBsTreeProps): JSX.Element;
 declare namespace TreeMode {
     var defaultProps: {
         mode: string;
         className: string;
         treeNodeProps: {};
+        showIcon: boolean;
     };
 }
 export default TreeMode;

package/es/TreeMode/index.js

@@ -40,7 +40,8 @@ function TreeMode(_a) {
       treeNodeProps = _a.treeNodeProps,
       onDefailtSelect = _a.onDefailtSelect,
       mode = _a.mode,
-      props = __rest(_a, ["title", "className", "renderHeader", "inputPlaceholder", "treeNodeProps", "onDefailtSelect", "mode"]);
+      showIcon = _a.showIcon,
+      props = __rest(_a, ["title", "className", "renderHeader", "inputPlaceholder", "treeNodeProps", "onDefailtSelect", "mode", "showIcon"]);
 
   var _useState = useState({
     keyword: undefined,
@@ -168,6 +169,7 @@ function TreeMode(_a) {
   }), renderHeader && renderHeader(), list.length > 0 && /*#__PURE__*/React.createElement(_Tree, Object.assign({}, props, {
     treeData: treeData,
     key: state.focusKey,
+    showIcon: showIcon,
     onExpand: function onExpand(keys) {
       return setState(function (old) {
         return Object.assign(Object.assign({}, old), {
@@ -185,7 +187,7 @@ function TreeMode(_a) {
     },
     icon: function icon(node) {
       return /*#__PURE__*/React.createElement(_IconFont, {
-        type: "".concat(treeData.length > 0 && node.id === treeData[0].id ? 'icon-S_Bar_Home' : mode === 'Place' && node.level > 4 ? 'icon-S_Place_Place' : 'icon-S_Photo_ListTree')
+        type: "".concat(treeData.length === 1 && node.id === treeData[0].id ? 'icon-S_Bar_Home' : mode === 'Place' ? node.level > 4 ? 'icon-S_Place_Place' : 'icon-S_Bar_Add' : 'icon-S_Photo_ListTree')
       });
     }
   })));
@@ -194,6 +196,7 @@ function TreeMode(_a) {
 TreeMode.defaultProps = {
   mode: 'Bz',
   className: '',
-  treeNodeProps: {}
+  treeNodeProps: {},
+  showIcon: true
 };
 export default TreeMode;

package/es/TreeTitle/index.css

@@ -18,6 +18,7 @@
   height: 28px;
   position: relative;
   top: -1px;
+  max-width: 200px;
 }
 .lm-c-tree-title-part .input-keword input {
   font-size: var(--fs-small);

package/es/UserSelect/demo.js

@@ -1,7 +1,7 @@
 import "antd/lib/config-provider/style";
 import _ConfigProvider from "antd/lib/config-provider";
 import React from 'react';
-import OrgTree from './index';
+import UserSelect from './index';
 
 function App() {
   return /*#__PURE__*/React.createElement(_ConfigProvider, {
@@ -12,8 +12,9 @@ function App() {
       width: 1000,
       height: 600
     }
-  }, /*#__PURE__*/React.createElement(OrgTree, {
-    selectUsers: []
+  }, /*#__PURE__*/React.createElement(UserSelect, {
+    selectUsers: [],
+    filterUserIds: ['101003000142']
   })));
 }
 

package/es/UserSelect/index.d.ts

@@ -5,6 +5,14 @@ interface IUserSelectProps {
     selectUsers: UserInfo[];
     onChange?: (users: UserInfo[]) => void;
     className?: string;
+    /**
+     * @description 过滤不需要的用户
+     */
+    filterUserIds?: string[];
+    /**
+     * @description  getUser其他参数
+     */
+    userParams?: any;
 }
 declare const _default: React.ForwardRefExoticComponent<IUserSelectProps & React.RefAttributes<any>>;
 export default _default;

package/es/UserSelect/index.js

@@ -1,3 +1,4 @@
+import _IconFont from "@cloud-app-dev/basic-components/es/IconFont";
 import _useChangeEffect from "@cloud-app-dev/basic-components/es/useChangeEffect";
 import _treeHelper from "@cloud-app-dev/utils/es/treeHelper";
 import _useHttp2 from "@cloud-app-dev/basic-components/es/useHttp";
@@ -33,7 +34,9 @@ function UserSelect(_ref, ref) {
   var selectUsers = _ref.selectUsers,
       onChange = _ref.onChange,
       _ref$className = _ref.className,
-      className = _ref$className === void 0 ? '' : _ref$className;
+      className = _ref$className === void 0 ? '' : _ref$className,
+      filterUserIds = _ref.filterUserIds,
+      userParams = _ref.userParams;
 
   var _useState = useState({
     keyword1: '',
@@ -61,12 +64,12 @@ function UserSelect(_ref, ref) {
     return state.orgId ? state.orgId : treeData[0] ? treeData[0].id : undefined;
   }, [treeData, state.orgId]);
 
-  var _useHttp3 = _useHttp2(['QueryUserList', selectId], function (_ref2) {
+  var _useHttp3 = _useHttp2(['QueryUserList', selectId, userParams], function (_ref2) {
     var _ref3 = _slicedToArray(_ref2, 2),
         _ = _ref3[0],
         id = _ref3[1];
 
-    return id ? api.getUsers(id) : Promise.resolve();
+    return id ? api.getUsers(id, userParams, filterUserIds) : Promise.resolve();
   }),
       _useHttp3$data = _useHttp3.data,
       userList = _useHttp3$data === void 0 ? [] : _useHttp3$data;
@@ -118,6 +121,16 @@ function UserSelect(_ref, ref) {
     }));
   }, [state.selectUsers, state.selectIds]);
 
+  var renderList1 = useMemo(function () {
+    return userList.filter(function (v) {
+      return !state.keyword1 || v.realName.includes(state.keyword1);
+    });
+  }, [userList, state.keyword1]);
+  var renderList2 = useMemo(function () {
+    return state.selectUsers.filter(function (v) {
+      return !state.keyword2 || v.realName.includes(state.keyword2);
+    });
+  }, [state.selectUsers, state.keyword2]);
   return /*#__PURE__*/React.createElement("div", {
     className: "user-select-modal-content ".concat(className)
   }, /*#__PURE__*/React.createElement(TreeMode, {
@@ -134,13 +147,13 @@ function UserSelect(_ref, ref) {
     selectedKeys: [selectId]
   }), /*#__PURE__*/React.createElement(List, {
     onChecked: onUserChecked1,
-    list: userList,
+    list: renderList1,
     key: userList.length,
     checkedKeys: list1CheckedKeys,
     itemKey: "id",
     itemNameKey: "realName",
     className: "user-source-list",
-    title: "\u4EBA\u5458",
+    title: "\u4EBA\u5458\u5217\u8868",
     onKeywordChange: function onKeywordChange(v) {
       return setState(function (old) {
         return Object.assign(Object.assign({}, old), {
@@ -148,14 +161,19 @@ function UserSelect(_ref, ref) {
         });
       });
     },
-    keywords: state.keyword1
+    keywords: state.keyword1,
+    whatIcon: function whatIcon() {
+      return /*#__PURE__*/React.createElement(_IconFont, {
+        type: "icon-S_AID_username"
+      });
+    }
   }), /*#__PURE__*/React.createElement(List, {
-    list: state.selectUsers,
+    list: renderList2,
     itemKey: "id",
     itemNameKey: "realName",
     checkedKeys: state.selectIds,
     className: "user-select-list",
-    title: "\u5DF2\u6DFB\u52A0",
+    title: "\u5DF2\u9009\u62E9\u4EBA\u5458",
     onKeywordChange: function onKeywordChange(v) {
       return setState(function (old) {
         return Object.assign(Object.assign({}, old), {
@@ -164,7 +182,12 @@ function UserSelect(_ref, ref) {
       });
     },
     keywords: state.keyword2,
-    onChecked: onUserChecked2
+    onChecked: onUserChecked2,
+    whatIcon: function whatIcon() {
+      return /*#__PURE__*/React.createElement(_IconFont, {
+        type: "icon-S_AID_username"
+      });
+    }
   }));
 }
 

package/es/WorkerFlow/Demo.js

@@ -2,11 +2,12 @@ import "antd/lib/config-provider/style";
 import _ConfigProvider from "antd/lib/config-provider";
 import React from 'react';
 import WorkerFlow from './index';
+import data from './data.json';
 var form = [{
   label: '处理意见',
   auth: 1,
   name: 'yijian',
-  fromType: 'SINGLE_SELECTION',
+  widgetType: 'SINGLE_SELECTION',
   required: true,
   options: [{
     label: '有效',
@@ -45,8 +46,10 @@ var App = function App() {
     }
   }, /*#__PURE__*/React.createElement(WorkerFlow, {
     form: form,
+    data: data.data,
     onChange: console.log,
-    hasTools: true
+    hasTools: true,
+    errorIds: ['UserTask_2222', 'SequenceFlow_6666']
   })));
 };
 

package/es/WorkerFlow/Form/Approver.js

@@ -14,8 +14,8 @@ function ApproverForm(_ref) {
     return (_a = getParentNodeById(config, item.id)) === null || _a === void 0 ? void 0 : _a.bpmnType;
   }, [config, item.id]);
   var includeUserTypes = useMemo(function () {
-    return parentNodeType === 'startEvent' || parentNodeType === 'sequenceFlow' ? [1, 3, 4, 5] : [1, 2, 3, 4, 5];
-  }, []);
+    return parentNodeType === 'startEvent' ? [1, 3] : parentNodeType === 'sequenceFlow' ? [1, 3, 4, 5] : [1, 2, 3, 4, 5];
+  }, [parentNodeType]);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(UserSet, {
     chargeLevel: item.chargeLevel,
     userType: item.userType,

package/es/WorkerFlow/Form/Condition.js

@@ -57,7 +57,7 @@ function ConditionForm(_ref) {
   var addCondition = useCallback(function () {
     var modal = modalRef.current;
     var allowForm = form.filter(function (v) {
-      return v.fromType === 'SINGLE_SELECTION' && v.required;
+      return v.widgetType === 'SINGLE_SELECTION' && v.required;
     });
 
     var onOk = function onOk() {

package/es/WorkerFlow/Form/GroupSelect.js

@@ -108,8 +108,11 @@ function GroupSelect(_ref) {
   return /*#__PURE__*/React.createElement("div", {
     className: "user-select-component group-select-component"
   }, /*#__PURE__*/React.createElement("div", {
-    className: "user-select-tools"
-  }, /*#__PURE__*/React.createElement(_Button, {
+    className: "user-select-tools",
+    style: {
+      justifyContent: 'space-between'
+    }
+  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(_Button, {
     icon: /*#__PURE__*/React.createElement(_IconFont, {
       type: "icon-S_Edit_Draw"
     }),
@@ -117,7 +120,19 @@ function GroupSelect(_ref) {
     onClick: userModify
   }, state.userList.length === 0 ? '选择岗位' : '修改岗位'), /*#__PURE__*/React.createElement("span", {
     className: "placeholder"
-  }, "\u4E0D\u80FD\u8D85\u8FC720\u4EBA")), /*#__PURE__*/React.createElement("div", {
+  }, "\u4E0D\u80FD\u8D85\u8FC720\u4EBA")), state.userList.length > 1 && /*#__PURE__*/React.createElement("span", {
+    style: {
+      cursor: 'pointer',
+      color: 'var(--primary)'
+    },
+    onClick: function onClick() {
+      return setState(function (old) {
+        return Object.assign(Object.assign({}, old), {
+          userList: []
+        });
+      });
+    }
+  }, "\u6E05\u7A7A")), /*#__PURE__*/React.createElement("div", {
     className: "user-list-wrapper"
   }, renderList.map(function (v) {
     return /*#__PURE__*/React.createElement("div", {

package/es/WorkerFlow/Form/Handle.js

@@ -14,8 +14,8 @@ function HandleForm(_ref) {
     return (_a = getParentNodeById(config, item.id)) === null || _a === void 0 ? void 0 : _a.bpmnType;
   }, [config, item.id]);
   var includeUserTypes = useMemo(function () {
-    return parentNodeType === 'startEvent' || parentNodeType === 'sequenceFlow' ? [1, 3, 4, 5] : [1, 2, 3, 4, 5];
-  }, []);
+    return parentNodeType === 'startEvent' ? [1, 3] : parentNodeType === 'sequenceFlow' ? [1, 3, 4, 5] : [1, 2, 3, 4, 5];
+  }, [parentNodeType]);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(UserSet, {
     chargeLevel: item.chargeLevel,
     userType: item.userType,

package/es/WorkerFlow/Form/LevelGroupSelect.js

@@ -25,8 +25,11 @@ import React, { useCallback, useMemo, useRef, useState, useEffect } from 'react'
 import _ from 'lodash';
 import chroma from 'chroma-js';
 import GroupSelectModalContent from './GroupSelectModalContent';
-import { formatRenderGroup } from './utils';
+import { formatRenderGroup, ToUpperNumberString } from './utils';
 import RefModal from '../../RefModal';
+var levelDict = Array.from(new Array(30)).map(function (_, i) {
+  return i + 1;
+});
 
 function LevelGroupSelect(_ref) {
   var _this = this;
@@ -115,8 +118,15 @@ function LevelGroupSelect(_ref) {
   return /*#__PURE__*/React.createElement("div", {
     className: "user-select-component group-select-component level-group-select-component"
   }, /*#__PURE__*/React.createElement("div", {
-    className: "user-select-tools"
-  }, /*#__PURE__*/React.createElement("span", null, "\u6307\u5B9A\u5C97\u4F4D\uFF08\u540C\u65F6\u662F\u4E3B\u7BA1\uFF09", /*#__PURE__*/React.createElement(_IconFont, {
+    className: "user-select-tools",
+    style: {
+      justifyContent: 'space-between'
+    }
+  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
+    style: {
+      paddingRight: 10
+    }
+  }, "\u6307\u5B9A\u5C97\u4F4D\uFF08\u540C\u65F6\u662F\u4E3B\u7BA1\uFF09", /*#__PURE__*/React.createElement(_IconFont, {
     type: "icon-Warning"
   })), /*#__PURE__*/React.createElement(_Button, {
     icon: /*#__PURE__*/React.createElement(_IconFont, {
@@ -124,7 +134,19 @@ function LevelGroupSelect(_ref) {
     }),
     type: "primary",
     onClick: userModify
-  }, state.userList.length === 0 ? '选择岗位' : '修改岗位')), /*#__PURE__*/React.createElement("div", {
+  }, state.userList.length === 0 ? '选择岗位' : '修改岗位')), state.userList.length > 1 && /*#__PURE__*/React.createElement("span", {
+    style: {
+      cursor: 'pointer',
+      color: 'var(--primary)'
+    },
+    onClick: function onClick() {
+      return setState(function (old) {
+        return Object.assign(Object.assign({}, old), {
+          userList: []
+        });
+      });
+    }
+  }, "\u6E05\u7A7A")), /*#__PURE__*/React.createElement("div", {
     className: "user-list-wrapper"
   }, renderList.map(function (v) {
     return /*#__PURE__*/React.createElement("div", {
@@ -169,13 +191,13 @@ function LevelGroupSelect(_ref) {
         });
       });
     }
-  }, /*#__PURE__*/React.createElement(_Select.Option, {
-    value: 1
-  }, "\u7B2C\u4E00\u7EA7\u4E3B\u7BA1"), /*#__PURE__*/React.createElement(_Select.Option, {
-    value: 2
-  }, "\u7B2C\u4E8C\u7EA7\u4E3B\u7BA1"), /*#__PURE__*/React.createElement(_Select.Option, {
-    value: 3
-  }, "\u7B2C\u4E09\u7EA7\u4E3B\u7BA1"))), /*#__PURE__*/React.createElement(RefModal, {
+  }, levelDict.map(function (v) {
+    return /*#__PURE__*/React.createElement(_Select.Option, {
+      value: v
+    }, "\u7B2C", ToUpperNumberString("".concat(v)), "\u7EA7\u4E3B\u7BA1");
+  }), /*#__PURE__*/React.createElement(_Select.Option, {
+    value: 99
+  }, "\u6700\u9AD8\u5C42\u7EA7\u4E3B\u7BA1"))), /*#__PURE__*/React.createElement(RefModal, {
     ref: modalRef
   }));
 }

package/es/WorkerFlow/Form/UserAndGroupSelect.js

@@ -128,7 +128,7 @@ function UserAndGroupSelect(_ref) {
     className: "select-title"
   }, "\u9009\u62E9\u8303\u56F4"), /*#__PURE__*/React.createElement("div", {
     className: "user-select-tools"
-  }, /*#__PURE__*/React.createElement(_Select, {
+  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(_Select, {
     value: state.type,
     style: {
       width: 100,
@@ -145,11 +145,29 @@ function UserAndGroupSelect(_ref) {
     }),
     type: "primary",
     onClick: userModify
-  }, state.userList.length === 0 ? '添加人员' : '修改人员'), /*#__PURE__*/React.createElement("span", {
+  }, state.userList.length === 0 ? '添加' : '修改', state.type === 'groupId' ? '岗位' : '人员')), /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: 'flex',
+      justifyContent: 'space-between',
+      flex: 1
+    }
+  }, /*#__PURE__*/React.createElement("span", {
     className: "placeholder"
-  }, "\u4E0D\u80FD\u8D85\u8FC720\u4E2A")), /*#__PURE__*/React.createElement("div", {
+  }, "\u4E0D\u80FD\u8D85\u8FC720\u4E2A"), state.userList.length > 1 && /*#__PURE__*/React.createElement("span", {
+    style: {
+      cursor: 'pointer',
+      color: 'var(--primary)'
+    },
+    onClick: function onClick() {
+      return setState(function (old) {
+        return Object.assign(Object.assign({}, old), {
+          userList: []
+        });
+      });
+    }
+  }, "\u6E05\u7A7A"))), /*#__PURE__*/React.createElement("div", {
     className: "user-list-wrapper"
-  }, state.type === 'userId' ? state.userList.map(function (v) {
+  }, state.type === 'userId' ? renderList.map(function (v) {
     return /*#__PURE__*/React.createElement(_Tag, {
       closable: true,
       key: v.value,

package/es/WorkerFlow/Form/UserSelect.js

@@ -104,8 +104,11 @@ function UserSelect(_ref) {
   return /*#__PURE__*/React.createElement("div", {
     className: "user-select-component"
   }, /*#__PURE__*/React.createElement("div", {
-    className: "user-select-tools"
-  }, /*#__PURE__*/React.createElement(_Button, {
+    className: "user-select-tools",
+    style: {
+      justifyContent: 'space-between'
+    }
+  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(_Button, {
     icon: /*#__PURE__*/React.createElement(_IconFont, {
       type: "icon-S_Edit_Draw"
     }),
@@ -113,7 +116,19 @@ function UserSelect(_ref) {
     onClick: userModify
   }, state.userList.length === 0 ? '添加人员' : '修改人员'), /*#__PURE__*/React.createElement("span", {
     className: "placeholder"
-  }, "\u4E0D\u80FD\u8D85\u8FC720\u4EBA")), /*#__PURE__*/React.createElement("div", {
+  }, "\u4E0D\u80FD\u8D85\u8FC720\u4EBA")), state.userList.length > 1 && /*#__PURE__*/React.createElement("span", {
+    style: {
+      cursor: 'pointer',
+      color: 'var(--primary)'
+    },
+    onClick: function onClick() {
+      return setState(function (old) {
+        return Object.assign(Object.assign({}, old), {
+          userList: []
+        });
+      });
+    }
+  }, "\u6E05\u7A7A")), /*#__PURE__*/React.createElement("div", {
     className: "user-list-wrapper"
   }, state.userList.map(function (v) {
     return /*#__PURE__*/React.createElement(_Tag, {

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

@@ -1,2 +1,3 @@
 import { NodeUserType } from '../interface';
 export declare function formatRenderGroup(list?: NodeUserType[]): [string, NodeUserType[]][];
+export declare function ToUpperNumberString(n: string): string;

package/es/WorkerFlow/Form/utils.js

@@ -23,4 +23,25 @@ export function formatRenderGroup() {
   }
 
   return arr;
+}
+var upperNumbers = '十一二三四五六七八九';
+export function ToUpperNumberString(n) {
+  var arr = (n + '').split('');
+  var strs = arr.map(function (v) {
+    return upperNumbers.charAt(+v);
+  }).join('');
+
+  if (strs === '一十') {
+    return '十';
+  }
+
+  if (strs.length === 2 && strs.charAt(0) === '一') {
+    return strs.replace('一', '十');
+  }
+
+  if (strs.length === 2 && strs.charAt(0) !== '一' && !strs.includes('十')) {
+    return strs.charAt(0) + '十' + strs.charAt(1);
+  }
+
+  return strs;
 }

package/es/WorkerFlow/Nodes/Approver.js

@@ -13,7 +13,8 @@ function ApproverNode(_ref) {
 
   var _useContext = useContext(WFC),
       onDeleteNode = _useContext.onDeleteNode,
-      onSelectNode = _useContext.onSelectNode; // TODO: 这里读取props数据
+      onSelectNode = _useContext.onSelectNode,
+      updateNode = _useContext.updateNode; // TODO: 这里读取props数据
 
 
   var TitleEl = /*#__PURE__*/React.createElement(TitleElement, {
@@ -24,7 +25,8 @@ function ApproverNode(_ref) {
     placeholder: nodeName,
     nodeName: nodeName,
     onTitleChange: function onTitleChange(val) {
-      return node.nodeName = val;
+      node.nodeName = val;
+      updateNode();
     }
   });
   return /*#__PURE__*/React.createElement(NodeWrap, {

package/es/WorkerFlow/Nodes/Condition.js

@@ -27,10 +27,11 @@ function BranchNode(_ref2) {
       last = _ref2.last,
       sortLeft = _ref2.sortLeft,
       owner = _ref2.owner,
-      nodeName = _ref2.nodeName,
       delBranch = _ref2.delBranch,
       sortRight = _ref2.sortRight,
       onBranchClick = _ref2.onBranchClick,
+      updateNode = _ref2.updateNode,
+      errorIds = _ref2.errorIds,
       node = _ref2.node,
       id = _ref2.id;
   return /*#__PURE__*/React.createElement("div", {
@@ -38,7 +39,7 @@ function BranchNode(_ref2) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "condition-node-box"
   }, /*#__PURE__*/React.createElement("div", {
-    className: "auto-judge",
+    className: "auto-judge ".concat(node.error || errorIds.includes(id) ? 'error' : ''),
     id: id
   }, !first && /*#__PURE__*/React.createElement("div", {
     className: "sort-left",
@@ -47,11 +48,12 @@ function BranchNode(_ref2) {
     className: "title-wrapper"
   }, /*#__PURE__*/React.createElement(TitleElement, {
     placeholder: "\u8BF7\u8F93\u5165\u6761\u4EF6\u540D\u79F0",
-    onTitleChange: function onTitleChange(v) {
-      return node.nodeName = v;
-    },
     delNode: delBranch,
-    nodeName: node.nodeName
+    nodeName: node.nodeName,
+    onTitleChange: function onTitleChange(v) {
+      node.nodeName = v;
+      updateNode();
+    }
   })), !last && /*#__PURE__*/React.createElement("div", {
     className: "sort-right",
     onClick: sortRight
@@ -84,7 +86,10 @@ function ConditionNode(_ref3) {
       onInsertNode = _useContext.onInsertNode,
       onDeleteNode = _useContext.onDeleteNode,
       onSelectNode = _useContext.onSelectNode,
-      readOnly = _useContext.readOnly;
+      readOnly = _useContext.readOnly,
+      updateNode = _useContext.updateNode,
+      _useContext$errorIds = _useContext.errorIds,
+      errorIds = _useContext$errorIds === void 0 ? [] : _useContext$errorIds;
 
   if (!Array.isArray(branches) || branches.length === 0) {
     return null;
@@ -107,10 +112,10 @@ function ConditionNode(_ref3) {
       className: "col-box",
       key: index.toString()
     }, /*#__PURE__*/React.createElement(BranchNode, Object.assign({}, item, {
-      nodeName: item.nodeName,
       priorityLevel: item.priorityLevel,
       owner: item.owner,
       first: index === 0,
+      updateNode: updateNode,
       onBranchClick: function onBranchClick() {
         return onSelectNode(node, parentNode, index);
       },
@@ -118,7 +123,8 @@ function ConditionNode(_ref3) {
         return branches.length === 2 ? onDeleteNode(parentNode, node) : onDeleteNode(parentNode, node, NodeTypes.BRANCH, index);
       },
       last: index === branches.length - 1,
-      node: item
+      node: item,
+      errorIds: errorIds
     })), item.childNode && /*#__PURE__*/React.createElement(Render, {
       parentNode: item,
       config: item.childNode

package/es/WorkerFlow/Nodes/Constants.js

@@ -91,7 +91,7 @@ export var NodeTemplates = (_NodeTemplates = {}, _defineProperty(_NodeTemplates,
 }), _defineProperty(_NodeTemplates, OptionTypes.CONDITION, function () {
   return {
     id: createId('ExclusiveGateway'),
-    nodeName: '路由',
+    nodeName: '条件分支',
     type: OptionTypes.CONDITION,
     childNode: null,
     conditionNodes: [],

package/es/WorkerFlow/Nodes/Handle.js

@@ -13,7 +13,8 @@ function HandleNode(_ref) {
 
   var _useContext = useContext(WFC),
       onDeleteNode = _useContext.onDeleteNode,
-      onSelectNode = _useContext.onSelectNode;
+      onSelectNode = _useContext.onSelectNode,
+      updateNode = _useContext.updateNode;
 
   var TitleEl = /*#__PURE__*/React.createElement(TitleElement, {
     icon: "icon-yewu",
@@ -23,7 +24,8 @@ function HandleNode(_ref) {
     placeholder: nodeName,
     nodeName: nodeName,
     onTitleChange: function onTitleChange(val) {
-      return node.nodeName = val;
+      node.nodeName = val;
+      updateNode();
     }
   });
   return /*#__PURE__*/React.createElement(NodeWrap, {

package/es/WorkerFlow/Nodes/Notifier.js

@@ -13,7 +13,8 @@ function NotifierNode(_ref) {
 
   var _useContext = useContext(WFC),
       onDeleteNode = _useContext.onDeleteNode,
-      onSelectNode = _useContext.onSelectNode;
+      onSelectNode = _useContext.onSelectNode,
+      updateNode = _useContext.updateNode;
 
   var TitleEl = /*#__PURE__*/React.createElement(TitleElement, {
     icon: "icon-biaoqian",
@@ -23,7 +24,8 @@ function NotifierNode(_ref) {
     placeholder: nodeName,
     nodeName: nodeName,
     onTitleChange: function onTitleChange(val) {
-      return node.nodeName = val;
+      node.nodeName = val;
+      updateNode();
     }
   });
   return /*#__PURE__*/React.createElement(NodeWrap, {

package/es/WorkerFlow/Nodes/TitleElement.js

@@ -45,8 +45,8 @@ function TitleElement(_ref) {
   }, [editable]);
 
   _useChangeEffect(function () {
-    onTitleChange && onTitleChange(title);
-  }, [title]);
+    !editable && onTitleChange && onTitleChange(title);
+  }, [title, editable]);
 
   return /*#__PURE__*/React.createElement(React.Fragment, null, icon && /*#__PURE__*/React.createElement(_IconFont, {
     type: icon,

package/es/WorkerFlow/Nodes/Wrap.js

@@ -1,6 +1,7 @@
-import React from 'react';
+import React, { useContext } from 'react';
 import { NodeTypes } from './Constants';
 import AddNode from './Add';
+import WFC from '../OperatorContext';
 
 function NodeWrap(_ref) {
   var type = _ref.type,
@@ -10,10 +11,15 @@ function NodeWrap(_ref) {
       children = _ref.children,
       titleStyle = _ref.titleStyle,
       id = _ref.id;
+
+  var _useContext = useContext(WFC),
+      _useContext$errorIds = _useContext.errorIds,
+      errorIds = _useContext$errorIds === void 0 ? [] : _useContext$errorIds;
+
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     className: "node-wrap"
   }, /*#__PURE__*/React.createElement("div", {
-    className: 'node-wrap-box ' + (type === NodeTypes.START ? 'start-node' : ''),
+    className: "node-wrap-box ".concat(type === NodeTypes.START ? 'start-node' : '', " ").concat(node.error || errorIds.includes(node.id) ? 'error' : ''),
     id: id
   }, /*#__PURE__*/React.createElement("div", {
     className: "title",

package/es/WorkerFlow/index.css

@@ -234,7 +234,7 @@
 }
 .worker-flow-design .auto-judge.error:after {
   border: 1px solid #f25643;
-  box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.1);
+  box-shadow: 0 2px 5px 0 rgba(238, 55, 55, 0.5);
 }
 .worker-flow-design .auto-judge .title-wrapper {
   font-size: 12px;
@@ -488,7 +488,7 @@
 }
 .node-wrap-box.error:after {
   border: 1px solid #f25643;
-  box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.1);
+  box-shadow: 0 2px 5px 0 rgba(238, 55, 55, 0.5);
 }
 .node-wrap-box .title {
   position: relative;
@@ -677,6 +677,10 @@
 .user-list-wrapper {
   padding: 10px 0;
 }
+.user-select-tools {
+  display: flex;
+  align-items: center;
+}
 .user-select-tools .cloudapp-btn {
   margin-right: 20px;
 }

package/es/WorkerFlow/index.d.ts

@@ -4,6 +4,7 @@ import './index.less';
 interface IWorkFlowProps {
     data?: WorkerFlowRequest;
     form?: WorkerFlowFormType[];
+    errorIds?: string[];
     onChange?: (data: SubmitData) => void;
     readOnly?: boolean;
     hasTools?: boolean;

package/es/WorkerFlow/index.js

@@ -53,7 +53,8 @@ function WorkerFlow(_ref, ref) {
       form = _ref$form === void 0 ? [] : _ref$form,
       onChange = _ref.onChange,
       readOnly = _ref.readOnly,
-      hasTools = _ref.hasTools;
+      hasTools = _ref.hasTools,
+      errorIds = _ref.errorIds;
 
   var _useState = useState(cloneDeep((_data === null || _data === void 0 ? void 0 : _data.nodeConfig) || cloneDeep(TemplateConfig1))),
       _useState2 = _slicedToArray(_useState, 2),
@@ -123,7 +124,7 @@ 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 title = "\u662F\u5426\u5220\u9664\"".concat(type === NodeTypes.BRANCH ? node.conditionNodes[index].nodeName : node.nodeName, "\"\u8282\u70B9\uFF1F");
     var options = {
       title: title,
       okText: '确定',
@@ -185,13 +186,14 @@ function WorkerFlow(_ref, ref) {
         node.conditionNodes[index].expression = data.expression;
         node.conditionNodes[index].owner = data.owner;
       } else {
+        var userArr = data.nodeUserList.map(function (v) {
+          return v.name;
+        });
         node.nodeUserList = data.nodeUserList || [];
         node.form = data.form || [];
         node.userType = data.userType;
         node.usersHandType = data.usersHandType;
-        node.owner = data.userType === 4 ? '直属主管' : data.nodeUserList.map(function (v) {
-          return v.name;
-        }).join('，');
+        node.owner = data.userType === 4 ? '直属主管' : userArr.join('，');
         node.emptyUserList = data.emptyUserList;
         node.chargeLevel = data.chargeLevel;
       }
@@ -260,7 +262,9 @@ function WorkerFlow(_ref, ref) {
   }, [config]);
 
   _useChangeEffect(function () {
-    onChange && onChange(getConfig());
+    if (onChange) {
+      onChange(getConfig());
+    }
   }, [config]);
 
   useImperativeHandle(ref, function () {
@@ -276,7 +280,8 @@ function WorkerFlow(_ref, ref) {
       onInsertNode: onInsertNode,
       onDeleteNode: onDeleteNode,
       onSelectNode: onSelectNode,
-      readOnly: readOnly
+      readOnly: readOnly,
+      errorIds: errorIds
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: "worker-flow-container"

package/es/WorkerFlow/interface.d.ts

@@ -15,7 +15,7 @@ export type NodeUserType = {
 export type WorkerFlowFormType = {
   name: string;
   label: string;
-  fromType: 'SINGLE_TEXT' | 'MULTIPLE_TEXT' | 'SINGLE_SELECTION' | 'MULTIPLE_SELECTION' | 'IMAGE';
+  widgetType: 'SINGLE_TEXT' | 'MULTIPLE_TEXT' | 'SINGLE_SELECTION' | 'MULTIPLE_SELECTION' | 'IMAGE';
   type: string;
   value: string;
   auth?: FormAuthType;
@@ -49,6 +49,7 @@ export type NodeItem = {
 
 export interface WorkerFlowContext {
   config: NodeItem;
+  errorIds?: string[];
   form: WorkerFlowFormType[];
   onInsertNode: (type: NodeType, node: NodeItem) => void;
   onDeleteNode: (parentNode: NodeItem, node: NodeItem, type?: NodeType, index?: number) => void;

package/es/WorkerFlow/utils.d.ts

@@ -4,3 +4,4 @@ export declare function getNextTaskId(node: NodeItem): string | undefined;
 export declare function getNextNode(node: NodeItem): NodeItem | undefined;
 export declare function filterNoticeNode(data: NodeItem): NodeItem;
 export declare function getUserFormKeys(data: NodeItem): ConditionItemType[];
+export declare function getFirstUserTask(data: NodeItem): NodeItem | undefined;

package/es/WorkerFlow/utils.js

@@ -13,6 +13,8 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 import _ from 'lodash';
 import { getNodeById } from './XML/utils';
 export function getJAVATaskData(data) {
+  var _a;
+
   var arr = [];
 
   var fn = function fn(node, _nextNode) {
@@ -100,7 +102,7 @@ export function getJAVATaskData(data) {
   } // 修正最后一个节点的nextid
 
 
-  var lastNextId = arr[arr.length - 1].nextTaskId;
+  var lastNextId = (_a = arr[arr.length - 1]) === null || _a === void 0 ? void 0 : _a.nextTaskId;
 
   if (lastNextId) {
     var lastNode = getNodeById(data, lastNextId);
@@ -167,7 +169,6 @@ export function getUserFormKeys(data) {
 
   var fn = function fn(node) {
     if (node.bpmnType == 'sequenceFlow') {
-      console.log(node.conditionList);
       arr.push.apply(arr, _toConsumableArray(node.conditionList));
     }
 
@@ -186,4 +187,11 @@ export function getUserFormKeys(data) {
   return arr.filter(function (v) {
     return !!v;
   });
+}
+export function getFirstUserTask(data) {
+  if (data.bpmnType === 'startEvent') {
+    return data.childNode;
+  }
+
+  return undefined;
 }

package/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "name": "@cloud-app-dev/vidc",
   "description": "Video Image Data Componennts",
-  "version": "1.0.43",
+  "version": "1.0.47",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -38,7 +38,7 @@
   },
   "devDependencies": {
     "@cloud-app-dev/utils": "^2.0.1",
-    "@cloud-app-dev/basic-components": "^1.0.54",
+    "@cloud-app-dev/basic-components": "^1.0.58",
     "@types/chroma-js": "^2.1.3",
     "@types/lodash": "^4.14.172",
     "@umijs/test": "^3.0.5",