#2488: [Fix][UI Next][V1.0.0-Alpha] Fix the branch flow options not showing and back to show. (#9049)

3 years ago · 609013ef4c
2 changed files with 60 additions and 151 deletions
--- a/commit.ref
+++ b/commit.ref
@ -1 +1 @@
-Subproject commit d91711b3222044e619daeaef780bb3498bb83085
+Subproject commit 8bb6971c2f6a4c4e42ee1d06bd07ba7d75e6bc3d
--- a/commit.yml
+++ b/commit.yml
@ -2,158 +2,67 @@
 branches: {
  }
 fileChange:
-  /dolphinscheduler-e2e:
-    newFile: !uuid '0ac721f5190afbc2edb97a28b6cb0c3624c399d2'
-    oldFile: !uuid 'a497e039606bf99dd383fb51e2591c372d197a09'
-  /dolphinscheduler-e2e/dolphinscheduler-e2e-case:
-    newFile: !uuid 'f52b70db655b8629bbaf07f0df548199951f8405'
-    oldFile: !uuid '373902600e9e5b1c773f8e5c25baeba3bac2d683'
-  /dolphinscheduler-e2e/dolphinscheduler-e2e-case/src:
-    newFile: !uuid '119d3fe8c8109ee31706c9faa61a184dc4fbda60'
-    oldFile: !uuid '30bf6c30b0e8ff30b9969abfa9483a478928ae29'
-  /dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test:
-    newFile: !uuid '7133e0d164224c504513b8e17c1baf3ded4b8111'
-    oldFile: !uuid '44ca01d80834f177b623fc9670bea24876ec46c5'
-  /dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java:
-    newFile: !uuid '90755d591403fa87c2bf347e65f433f52decf4ad'
-    oldFile: !uuid 'e1fbeefd5d928d07d81685ef3111c8b8d7dab111'
-  /dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org:
-    newFile: !uuid '8e038d726bfe25c376ca353f2386ca99a3d59bcd'
-    oldFile: !uuid 'bb7f89ea2c1055a8f21d98d19729649883afcf2e'
-  /dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache:
-    newFile: !uuid '01a953ffb0e4b311f7ed19c4f9acbb71c53534c8'
-    oldFile: !uuid '4cacee7718e6cc873f52105c50917ae8aa88d4d0'
-  /dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler:
-    newFile: !uuid '93873d0a24ceda85a2fd8e3c80b951a9e98f99ec'
-    oldFile: !uuid 'f9150a0eb88f56a1469b30147b5a24d404891bf4'
-  /dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e:
-    newFile: !uuid 'e61095d39cca7382d57dc652581264973795b9a7'
-    oldFile: !uuid '9a5e8d2e0793d7ed2c9f3d8f30d26f568b89977b'
-  /dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages:
-    newFile: !uuid '5b17c397e36d4cb659a4f3c47a58b6038bc7f446'
-    oldFile: !uuid 'eef0a98c3344687cb56d1245cde19a2f2928d51d'
-  /dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/resource:
-    newFile: !uuid 'cf223bd7f4bee80f2c905155a42f30fa12edc896'
-    oldFile: !uuid '71411d8749c6f3920cb545a5d30d1e9aa1c42dc4'
-  ? /dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/resource/ResourcePage.java
-  : newFile: !uuid '68c6556c21c6199be9a5a3fd94a1b34acc1f5814'
-    oldFile: !uuid '800977522e585ac81dd26ea50865c224b496e035'
  /dolphinscheduler-ui-next:
-    newFile: !uuid 'e932c6ffad32d6b066053de4ed45663af663a6cb'
-    oldFile: !uuid 'bfebcda1fe30233922c250e488d47092461406b7'
+    newFile: !uuid 'a928dcd7f3a326af45b9482a884d185b662fb66b'
+    oldFile: !uuid 'e932c6ffad32d6b066053de4ed45663af663a6cb'
  /dolphinscheduler-ui-next/src:
-    newFile: !uuid '0c99e374166c633934b8c03203f67584f6d30a69'
-    oldFile: !uuid 'bd11485ace60ee33982a4693a7ba1a8867645910'
-  /dolphinscheduler-ui-next/src/layouts:
-    newFile: !uuid '7b511c60f7da5277f6c36ea5df7cf1eb9fa21794'
-    oldFile: !uuid 'f337f0611d92db40806d51bfe3c8d15b640b465c'
-  /dolphinscheduler-ui-next/src/layouts/content:
-    newFile: !uuid '3e2a9b6d3b9e0cbe8d6c094accebdcae92cb2ec8'
-    oldFile: !uuid '4f389b4bad7f8991e4b17f3e35486392fd719f9e'
-  /dolphinscheduler-ui-next/src/layouts/content/components:
-    newFile: !uuid '75d5539fcbe0dfd6753b89ff3dbd9e4f5f22f616'
-    oldFile: !uuid '050efff4ce23bbee0823cec4d3fc5c14196c5704'
-  /dolphinscheduler-ui-next/src/layouts/content/components/navbar:
-    newFile: !uuid 'f8974bfc8bc68c7e7eb01b588eb97526b65a383b'
-    oldFile: !uuid 'b0ae7160ce2db0864249de4677453e2dd4fb80af'
-  /dolphinscheduler-ui-next/src/layouts/content/components/navbar/index.tsx:
-    newFile: !uuid '96a7702742d33dc16f676ddbf491f09810742815'
-    oldFile: !uuid '71b0ca20db70da57a1a70013c96a9034f5543516'
-  /dolphinscheduler-ui-next/src/layouts/content/components/navbar/use-menuClick.ts:
-    newFile: null
-    oldFile: !uuid '7f9adb6b25c9ea694285a87ef59bae721f592364'
-  /dolphinscheduler-ui-next/src/layouts/content/components/sidebar:
-    newFile: !uuid 'ad0916658ea96ac8d8754db6a2ae24ecdfa718cf'
-    oldFile: !uuid 'd04b2a7ccc486e80df9c1e278c90962368e42dbd'
-  /dolphinscheduler-ui-next/src/layouts/content/components/sidebar/index.tsx:
-    newFile: !uuid '782b9666090ba46d70bb2f2fed2bed5ae3c483bc'
-    oldFile: !uuid '5dec929b384a83df3e67b6c2aab7d95a3721953c'
-  /dolphinscheduler-ui-next/src/layouts/content/index.tsx:
-    newFile: !uuid '45edeb9790c468f74ec78e1b8bb7c386cdd79dea'
-    oldFile: !uuid 'c531e6759f537bd551aa64fa634ae477c14fa0ea'
-  /dolphinscheduler-ui-next/src/layouts/content/use-dataList.ts:
-    newFile: !uuid '7f18b700f1b8fbeac40ca3c9cd2f30b5554828a5'
-    oldFile: !uuid '62d455cf6c76b4d6a4986d9abcff25e5704f6af9'
-  /dolphinscheduler-ui-next/src/router:
-    newFile: !uuid '4096579df7cae9be413ec922d79147d48de54557'
-    oldFile: !uuid 'f43eee20eb4b5b26afaf5d6494c09cfb00950c85'
-  /dolphinscheduler-ui-next/src/router/index.ts:
-    newFile: !uuid '381578a8c852a73733ba8bff927bb0b362f65d31'
-    oldFile: !uuid 'b905b6e044bc9b107bdbf32d4274dd057e69627e'
-  /dolphinscheduler-ui-next/src/router/modules:
-    newFile: !uuid 'd8178dc6c22a65111193019734f7a922b0610256'
-    oldFile: !uuid '232e06dbd2a94ebdb2473580055d8227018cfd0b'
-  /dolphinscheduler-ui-next/src/router/modules/data-quality.ts:
-    newFile: !uuid '71c0f193125f8b2f74fb9978636d3e8b84855071'
-    oldFile: !uuid '67ccc0a07ed0e812685124e9aaa0971684bf887d'
-  /dolphinscheduler-ui-next/src/router/modules/datasource.ts:
-    newFile: !uuid '555227dfe34a6bc4d016dfa130bd7cdb4b9a9519'
-    oldFile: !uuid '1c39c5db875523e6ea500fc354cd07a2a7529a5b'
-  /dolphinscheduler-ui-next/src/router/modules/monitor.ts:
-    newFile: !uuid 'e2fa40b1c567af9965d573e4fa88576a9d992fef'
-    oldFile: !uuid '9a45b336df4600016e049768d8568bbad7aab162'
-  /dolphinscheduler-ui-next/src/router/modules/projects.ts:
-    newFile: !uuid '39f0b144f2a095b3e9f5fdf0218f542a6787d9c7'
-    oldFile: !uuid 'afc401dbcd5efd402a159a30569996685c25425b'
-  /dolphinscheduler-ui-next/src/router/modules/resources.ts:
-    newFile: !uuid 'cc47e58377aa66ac13d2c9db338e8ca90a29beeb'
-    oldFile: !uuid '7ec2ab12b098fcf5639b3661bbd528366c7a1367'
-  /dolphinscheduler-ui-next/src/router/modules/security.ts:
-    newFile: !uuid '039a5fbe099699fa3c94e29346487a3c489d3619'
-    oldFile: !uuid '7190f3b18895c43922ab9628502ea323e104958d'
-  /dolphinscheduler-ui-next/src/router/routes.ts:
-    newFile: !uuid '7a36ac82fe3b1489359d1c2f22bb674add6d630f'
-    oldFile: !uuid 'a7af8f9144e51dadfb6ee0caf1c29ce91022c790'
+    newFile: !uuid '4d4be9105ff8cc1c9bc876116b4426ec07d5bc2c'
+    oldFile: !uuid '0c99e374166c633934b8c03203f67584f6d30a69'
  /dolphinscheduler-ui-next/src/store:
-    newFile: !uuid '3c33d65557908805f576e59f607f4c88ba8e6747'
-    oldFile: !uuid 'd0ddab291174c2e064d9df697b9eb0c82170af79'
-  /dolphinscheduler-ui-next/src/store/menu:
-    newFile: null
-    oldFile: !uuid '4f26936e45193fb39c6170a468e3c534245fe74d'
-  /dolphinscheduler-ui-next/src/store/menu/menu.ts:
-    newFile: null
-    oldFile: !uuid 'c619bbabe6978982c5607be4af726b49844f74d7'
-  /dolphinscheduler-ui-next/src/store/menu/types.ts:
-    newFile: null
-    oldFile: !uuid '25fa63488497daecdccd02e1e13523a9bc4327b7'
-  /dolphinscheduler-ui-next/src/store/route:
-    newFile: !uuid 'c906a3c55cb83840b6d05f86e8e52551d09cd191'
-    oldFile: null
-  /dolphinscheduler-ui-next/src/store/route/route.ts:
-    newFile: !uuid '006e6b653e1cfd71614ee48de1d69e5d2cb1f1b2'
-    oldFile: null
-  /dolphinscheduler-ui-next/src/store/route/types.ts:
-    newFile: !uuid '13019f99e658cb8ef7aab41f7fd19be301f9ed5a'
-    oldFile: null
+    newFile: !uuid '351b416b00d9bf023410724be6c642f4f21f0940'
+    oldFile: !uuid '3c33d65557908805f576e59f607f4c88ba8e6747'
+  /dolphinscheduler-ui-next/src/store/project:
+    newFile: !uuid 'a3ab348672400040a4eb43820d194f868e75ad0e'
+    oldFile: !uuid '271a8b4f37bbd9dd99e0461a01ceae0f8dcf72a7'
+  /dolphinscheduler-ui-next/src/store/project/task-node.ts:
+    newFile: !uuid '977959494be424e428a34c353846ce3b11e671b4'
+    oldFile: !uuid '9d8ec7e95ebbe5dc10cd6a7e82bde5e0824f95f8'
  /dolphinscheduler-ui-next/src/views:
-    newFile: !uuid '0aa33732f024e6aa35201af587010ff03b7f6716'
-    oldFile: !uuid '56d83184698ee5f058f5d7d9e68623db7d49d735'
-  /dolphinscheduler-ui-next/src/views/login:
-    newFile: !uuid 'b4ae8759c38b9ed1547bb3bb6f63a63310fd5500'
-    oldFile: !uuid '62721c7a25355aa4c0ec82ca58742ef818e218f1'
-  /dolphinscheduler-ui-next/src/views/login/use-login.ts:
-    newFile: !uuid '6647ec16372c5630b924e884c89b0b9f6b72003c'
-    oldFile: !uuid 'b449dc7fce33215f202e3fab01a7a648d7cdd348'
+    newFile: !uuid 'c761abb43733723b276656596443d111e6f64a8f'
+    oldFile: !uuid '0aa33732f024e6aa35201af587010ff03b7f6716'
  /dolphinscheduler-ui-next/src/views/projects:
-    newFile: !uuid 'baf1e562726c175ba3c7e0527ce59b83c06ee085'
-    oldFile: !uuid 'b61cb0c02de04d2e279aedfa04d94ca2f8ef1623'
-  /dolphinscheduler-ui-next/src/views/projects/list:
-    newFile: !uuid '2e142293ec142d6407713b5744ed3d3e9a41ad00'
-    oldFile: !uuid '815afbcc172da0e7b5bbb16bd3dbd63acef5dc36'
-  /dolphinscheduler-ui-next/src/views/projects/list/use-table.ts:
-    newFile: !uuid '61ef412316a7fe06ed9befa2effa03fd9a5088aa'
-    oldFile: !uuid '29fa348f9a49f42e75da63a99aec8e753fac9399'
-  /dolphinscheduler-ui-next/src/views/resource:
-    newFile: !uuid '14aeaff4c2a90aac0f6c256660911aeab3d96d1d'
-    oldFile: !uuid '4c270f16fed212125e0b8039f56eb283c4cf7240'
-  /dolphinscheduler-ui-next/src/views/resource/file:
-    newFile: !uuid '74b3a18a2ece6352311e49b4da7393b36774d10a'
-    oldFile: !uuid '94a87da75ad6d5e5cf0f6fdd3a9efdcff38cbd35'
-  /dolphinscheduler-ui-next/src/views/resource/file/index.tsx:
-    newFile: !uuid '86e739ace72c45febd6e2ebaf990dcb4e3583e7b'
-    oldFile: !uuid '8f5fa305d8a675099104181bc3821f0cd7754426'
-gitCommitId: !uuid 'd91711b3222044e619daeaef780bb3498bb83085'
-renames:
-  /dolphinscheduler-ui-next/src/store/route/route.ts: /dolphinscheduler-ui-next/src/store/menu/types.ts
-  /dolphinscheduler-ui-next/src/store/route/types.ts: /dolphinscheduler-ui-next/src/store/menu/types.ts
-revisionId: 2487
+    newFile: !uuid 'c04896490b8f636349605123e7de01ef99ce158f'
+    oldFile: !uuid 'baf1e562726c175ba3c7e0527ce59b83c06ee085'
+  /dolphinscheduler-ui-next/src/views/projects/task:
+    newFile: !uuid '4d30fb4ae20a498686fe3cf945000242478a54cc'
+    oldFile: !uuid '541d9495a934db023d0bb9acc74246364906fe8f'
+  /dolphinscheduler-ui-next/src/views/projects/task/components:
+    newFile: !uuid '414235b505981ee4209712104b98db58e73c3faa'
+    oldFile: !uuid '18a52f4773c6e4ee67467b5a0ee3c02597c5ccdd'
+  /dolphinscheduler-ui-next/src/views/projects/task/components/node:
+    newFile: !uuid '557887e164281667d2ece459ed84897363a09e2b'
+    oldFile: !uuid '20f4a481a5bc8d022539fc9d4b07a459b51351ff'
+  /dolphinscheduler-ui-next/src/views/projects/task/components/node/fields:
+    newFile: !uuid '9efb35de887001f46ca0cdaf835f53fbc4c04124'
+    oldFile: !uuid 'd3c483afbac01a7abe676437a4b1cf0d68eb6e32'
+  /dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-conditions.ts:
+    newFile: !uuid '356e6e0dd370134e500d1ccaec6c0d22c7be866c'
+    oldFile: !uuid '7b14fb3b851caa60bae9b837af0c4c9151083167'
+  /dolphinscheduler-ui-next/src/views/projects/task/components/node/format-data.ts:
+    newFile: !uuid '728a4ec2da8924a57eeeebd8b8943f3b622f2a72'
+    oldFile: !uuid '07ac7e9115006cbbd511877aceb0ad951425843b'
+  /dolphinscheduler-ui-next/src/views/projects/task/components/node/types.ts:
+    newFile: !uuid 'f8bdf0ae74d0259b8758b7242ceb43bb6239c1f0'
+    oldFile: !uuid 'bab4a2886d92d22a48a6e43b245afa85f9b92527'
+  /dolphinscheduler-ui-next/src/views/projects/workflow:
+    newFile: !uuid '93570c78efce3bc4f020928fa38dcfe5595e502b'
+    oldFile: !uuid 'ba7ab71f919e44039e6a770f30d0abec1cfacbc6'
+  /dolphinscheduler-ui-next/src/views/projects/workflow/components:
+    newFile: !uuid 'eb7691f063318902d82030ac47cff3387dbdec4b'
+    oldFile: !uuid '63001b9d088aac573600da34a3aa822bbd0f3f94'
+  /dolphinscheduler-ui-next/src/views/projects/workflow/components/dag:
+    newFile: !uuid 'c2cef63c77d24b9ce4c1401141613ed458c71b4f'
+    oldFile: !uuid '6b0208a6570e0500e8a2741326f9828ce0f7d338'
+  /dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/use-canvas-init.ts:
+    newFile: !uuid '1c422ee38fb7d2431b4f5a9fd2fca42e7915b8b8'
+    oldFile: !uuid '6282acfaedca6ca86ec9d61ac2c7ec2c579ae678'
+  /dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/use-cell-update.ts:
+    newFile: !uuid 'f62c09a8e13f2e5028b6a36790db2ae07186ae0e'
+    oldFile: !uuid '1cfc1e2da5ed0495bf0cce96890e24b382962769'
+  /dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/use-task-edit.ts:
+    newFile: !uuid '770f52a5327e8bf93ddde95207883d59c0f0afe4'
+    oldFile: !uuid 'e15d23d80aae11a705406977e7845d0f206a3c18'
+gitCommitId: !uuid '8bb6971c2f6a4c4e42ee1d06bd07ba7d75e6bc3d'
+renames: {
+  }
+revisionId: 2488