@cloud-app-dev/vidc 1.0.39 → 1.0.43

package/es/WorkerFlow/Tools.js

@@ -20,7 +20,8 @@ var ZOOM = {
 
 function ZoomLayout(_ref) {
   var children = _ref.children,
-      exportBpmnFile = _ref.exportBpmnFile;
+      exportBpmnFile = _ref.exportBpmnFile,
+      hasTools = _ref.hasTools;
 
   // 放大比例, 按百分制给 100 为 100%
   var _useState = useState(100),
@@ -60,7 +61,7 @@ function ZoomLayout(_ref) {
     onClick: function onClick() {
       return zoomSize(ZOOM.UP);
     }
-  })), /*#__PURE__*/React.createElement("div", {
+  })), hasTools && /*#__PURE__*/React.createElement("div", {
     className: "tools"
   }, /*#__PURE__*/React.createElement("button", {
     onClick: exportBpmnFile

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

@@ -2,4 +2,5 @@ import { NodeItem } from '../interface';
 export declare function createId(type: string): string;
 export declare function getEndEventId(data: NodeItem): string;
 export declare function getNodeById(data: NodeItem, id: string): NodeItem;
+export declare function getParentNodeById(data: NodeItem, id: string): NodeItem;
 export declare function transformArray(data: NodeItem): NodeItem[];

package/es/WorkerFlow/XML/utils.js

@@ -45,6 +45,36 @@ export function getNodeById(data, id) {
   runGetNode(data);
   return nodeItem;
 }
+export function getParentNodeById(data, id) {
+  var nodeItem;
+
+  var runGetNode = function runGetNode(node) {
+    if (!node || !!nodeItem) {
+      return;
+    }
+
+    if (!node.childNode) {
+      return;
+    }
+
+    if (node.childNode.id === id) {
+      nodeItem = node;
+    } else {
+      if (node.conditionNodes && node.conditionNodes.length > 0) {
+        node.conditionNodes.forEach(function (item) {
+          runGetNode(item);
+        });
+      }
+
+      if (node.childNode) {
+        runGetNode(node.childNode);
+      }
+    }
+  };
+
+  runGetNode(data);
+  return nodeItem;
+}
 export function transformArray(data) {
   var arr = [];
 

package/es/WorkerFlow/index.css

@@ -246,10 +246,18 @@
 }
 .worker-flow-design .auto-judge .title-wrapper .editable-title {
   display: inline-block;
-  max-width: 120px;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
+  margin-right: 10px;
+  height: 20px;
+}
+.worker-flow-design .auto-judge .title-wrapper .editable-title-input {
+  margin-right: 10px;
+  height: 20px;
+}
+.worker-flow-design .auto-judge .title-wrapper .anticon {
+  color: #333;
 }
 .worker-flow-design .auto-judge .content {
   font-size: 14px;
@@ -400,7 +408,9 @@
   top: 30px;
   z-index: 1;
 }
-.auto-judge:hover .editable-title,
+.auto-judge:hover .editable-title {
+  border-bottom: 1px dashed #15bc83;
+}
 .node-wrap-box:hover .editable-title {
   border-bottom: 1px dashed #fff;
 }

package/es/WorkerFlow/index.js

@@ -166,7 +166,7 @@ function WorkerFlow(_ref, ref) {
   } // 获取节点
 
 
-  function onSelectNode(node, index) {
+  function onSelectNode(node, parentNode, index) {
     if (readOnly) {
       return;
     }
@@ -209,13 +209,20 @@ function WorkerFlow(_ref, ref) {
         return v.id !== node.conditionNodes[index].id ? v.conditionList : [];
       })).flat() : [];
       var nodeItem = node.type === 4 ? node.conditionNodes[index] : node;
+      var from = nodeItem.form ? form.map(function (v) {
+        return nodeItem.form.find(function (v2) {
+          return v2.name === v.name;
+        }) || v;
+      }) : form;
       drawer.open({
         title: nodeName,
         width: 640,
         content: /*#__PURE__*/React.createElement(FormContent, {
           useConditionFields: useConditionFields,
-          form: nodeItem.form || form,
+          form: from,
           item: nodeItem,
+          config: config,
+          parentNode: parentNode,
           onChange: onChange,
           index: index
         }),

package/es/WorkerFlow/interface.d.ts

@@ -15,6 +15,7 @@ export type NodeUserType = {
 export type WorkerFlowFormType = {
   name: string;
   label: string;
+  fromType: 'SINGLE_TEXT' | 'MULTIPLE_TEXT' | 'SINGLE_SELECTION' | 'MULTIPLE_SELECTION' | 'IMAGE';
   type: string;
   value: string;
   auth?: FormAuthType;
@@ -51,7 +52,7 @@ export interface WorkerFlowContext {
   form: WorkerFlowFormType[];
   onInsertNode: (type: NodeType, node: NodeItem) => void;
   onDeleteNode: (parentNode: NodeItem, node: NodeItem, type?: NodeType, index?: number) => void;
-  onSelectNode: (node: NodeItem, index?: number) => void;
+  onSelectNode: (node: NodeItem, parentNode: NodeItem, index?: number) => void;
   updateNode: () => void;
   readOnly?: boolean;
 }
@@ -84,6 +85,8 @@ export type SubmitFlowItemType = {
 export type SubmitData = {
   config: WorkerFlowRequest;
   bpmnBlob: Blob;
-  useFormKeys: string[];
+  useFormKeys: ConditionItemType[];
   taskList: SubmitFlowItemType[];
 };
+
+export type AddNodeType = 1 | 2 | 3 | 4; //1审核人，2抄送人，3办理人，4条件分支

package/es/WorkerFlow/utils.d.ts

@@ -1,6 +1,6 @@
-import { NodeItem, SubmitFlowItemType } from './interface';
+import { ConditionItemType, NodeItem, SubmitFlowItemType } from './interface';
 export declare function getJAVATaskData(data: NodeItem): SubmitFlowItemType[];
 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): string[];
+export declare function getUserFormKeys(data: NodeItem): ConditionItemType[];

package/es/WorkerFlow/utils.js

@@ -11,6 +11,7 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 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; }
 
 import _ from 'lodash';
+import { getNodeById } from './XML/utils';
 export function getJAVATaskData(data) {
   var arr = [];
 
@@ -76,7 +77,8 @@ export function getJAVATaskData(data) {
       }
 
       arr.push(item);
-    }
+    } // 检查最后一个nextTaskId
+
 
     var nextNode = getNextNode(node.childNode);
 
@@ -95,6 +97,17 @@ export function getJAVATaskData(data) {
 
   if (arr[0]) {
     arr[0].taskFirstBlank = 1;
+  } // 修正最后一个节点的nextid
+
+
+  var lastNextId = arr[arr.length - 1].nextTaskId;
+
+  if (lastNextId) {
+    var lastNode = getNodeById(data, lastNextId);
+
+    if (lastNode.type === 2 || lastNode.bpmnType === 'endEvent') {
+      arr[arr.length - 1].nextTaskId = undefined;
+    }
   }
 
   return arr;
@@ -154,9 +167,8 @@ export function getUserFormKeys(data) {
 
   var fn = function fn(node) {
     if (node.bpmnType == 'sequenceFlow') {
-      arr.push.apply(arr, _toConsumableArray(node.conditionList.map(function (v) {
-        return v.field;
-      })));
+      console.log(node.conditionList);
+      arr.push.apply(arr, _toConsumableArray(node.conditionList));
     }
 
     if (node.conditionNodes) {

package/es/utils.js

@@ -1,7 +1,7 @@
-import { cache } from '@cloud-app-dev/utils';
+import _cache from "@cloud-app-dev/utils/es/cache";
 export var getHeader = function getHeader() {
   return {
-    Authorization: cache.getCache('token', 'session')
+    Authorization: _cache.getCache('token', 'session')
   };
 };
 /**

package/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "name": "@cloud-app-dev/vidc",
   "description": "Video Image Data Componennts",
-  "version": "1.0.39",
+  "version": "1.0.43",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -30,7 +30,6 @@
     ]
   },
   "dependencies": {
-    "@cloud-app-dev/utils": "^1.0.2",
     "chroma-js": "^2.1.2",
     "jsencrypt": "^3.2.1",
     "lodash": "^4.17.21",
@@ -38,7 +37,8 @@
     "rc-queue-anim": "^2.0.0"
   },
   "devDependencies": {
-    "@cloud-app-dev/basic-components": "^1.0.51",
+    "@cloud-app-dev/utils": "^2.0.1",
+    "@cloud-app-dev/basic-components": "^1.0.54",
     "@types/chroma-js": "^2.1.3",
     "@types/lodash": "^4.14.172",
     "@umijs/test": "^3.0.5",

package/scripts/entry.js

@@ -17,4 +17,4 @@ function run() {
 
 run();
 
-console.log('entry is init!');
+console.log('================== entry is init! ===================');