@das-fed/ui 7.1.0-dev.1 → 7.1.0-dev.10

package/packages/business-components/payment/style.css

@@ -1 +1 @@
-.dialog-out[data-v-36df0d16]{--das-ui-color-primary: #1ba854}.dialog-out2[data-v-36df0d16]{--das-ui-color-primary: #fb2323}.payment-dialog[data-v-36df0d16]{color:#666;font-size:12px;line-height:18px}.payment-dialog .payment-dialog-item[data-v-36df0d16]{display:flex;align-items:center;margin-bottom:8px}.payment-dialog .payment-dialog-amount[data-v-36df0d16]{color:#ff5f1f;font-size:21px}.payment-dialog .payment-dialog-qrcode[data-v-36df0d16]{width:232px;height:232px;border:1px solid #d9d9d9;display:flex;align-items:center;justify-content:center;margin:30px auto 8px}.pay-result-dialog[data-v-36df0d16]{display:flex;flex-direction:column;align-items:center;color:#212121;font-size:16px;line-height:24px}.payment-dialog-time[data-v-36df0d16]{display:flex;align-items:center;justify-content:center;position:absolute;left:0;width:100%;bottom:20px}.payment-dialog-time .payment-dialog-time-text[data-v-36df0d16]{font-size:16px;line-height:21px;color:#ff5f1f;margin-left:8px}
+.dialog-out[data-v-02d93cf2]{--das-ui-color-primary: #1ba854}.dialog-out2[data-v-02d93cf2]{--das-ui-color-primary: #fb2323}.payment-dialog[data-v-02d93cf2]{color:#666;font-size:12px;line-height:18px}.payment-dialog .payment-dialog-item[data-v-02d93cf2]{display:flex;align-items:center;margin-bottom:8px}.payment-dialog .payment-dialog-amount[data-v-02d93cf2]{color:#ff5f1f;font-size:21px}.payment-dialog .payment-dialog-qrcode[data-v-02d93cf2]{width:232px;height:232px;border:1px solid #d9d9d9;display:flex;align-items:center;justify-content:center;margin:30px auto 8px}.pay-result-dialog[data-v-02d93cf2]{display:flex;flex-direction:column;align-items:center;color:#212121;font-size:16px;line-height:24px}.payment-dialog-time[data-v-02d93cf2]{display:flex;align-items:center;justify-content:center;position:absolute;left:0;width:100%;bottom:20px}.payment-dialog-time .payment-dialog-time-text[data-v-02d93cf2]{font-size:16px;line-height:21px;color:#ff5f1f;margin-left:8px}

package/packages/business-components/payment/type.d.ts

@@ -42,3 +42,5 @@ export type OrderInfoType = {
 
   [key: string]: any
 }
+
+export type PayAppidType = { [key in ProviderMenu]: string } | undefined 

package/packages/business-components/process-configuration/index.js

@@ -1,9 +1,9 @@
 import '@das-fed/ui/packages/business-components/process-configuration/style.css';
 import { withInstall as fe } from "@das-fed/utils/with-install/index";
-import { ref as r, watch as H, defineComponent as me, computed as O, onUnmounted as ye, onDeactivated as ve, createElementBlock as q, openBlock as F, Fragment as Ce, createElementVNode as u, createCommentVNode as L, createVNode as l, unref as e, withCtx as s, createTextVNode as y, toDisplayString as p, isRef as W, withDirectives as ge } from "vue";
+import { ref as r, watch as H, defineComponent as me, computed as O, onUnmounted as ye, onDeactivated as ve, createElementBlock as j, openBlock as q, Fragment as Ce, createElementVNode as u, createCommentVNode as L, createVNode as l, unref as e, withCtx as s, createTextVNode as y, toDisplayString as p, isRef as W, withDirectives as ge } from "vue";
 import { DasTable as we, DasTableColumn as K } from "@das-fed/ui/packages/components/table/index";
 import { DasDialog as A } from "@das-fed/ui/packages/components/dialog/index";
-import { DasButton as N } from "@das-fed/ui/packages/components/button/index";
+import { DasButton as I } from "@das-fed/ui/packages/components/button/index";
 import { DasMessage as B } from "@das-fed/ui/packages/components/message/index";
 import { DasForm as be } from "@das-fed/ui/packages/components/form/index";
 import { DasFormItem as U } from "@das-fed/ui/packages/components/form-item/index";
@@ -13,7 +13,7 @@ import { t as o, setI18nRule as _e } from "@das-fed/web/packages/i18n/index";
 import { getProjectInfo as v } from "@das-fed/utils/common-info/index";
 import { createService as Q } from "@das-fed/utils/api-services/src/create-service";
 const X = "v1", E = Q(`/workflow/flow/def/${X}`), he = Q(`/workflow/runtime/instance/${X}`), De = E.post("/listJson"), Ne = E.post("/saveCopy"), xe = he.get("/getInstanceCountByDefKeys"), Ie = E.delete("/removeByDefIds"), ze = (f) => {
-  const m = v().id ? v().id : "371344636432453", n = v().name ? v().name : o("AIoT项目"), d = r(!1), C = r(!1), x = r({
+  const m = v().id ? v().id : "371344636432453", n = v().name ? v().name : o("AIoT项目"), d = r(!1), C = r(!1), h = r({
     defId: "",
     // 流程id
     defKey: "",
@@ -24,7 +24,7 @@ const X = "v1", E = Q(`/workflow/flow/def/${X}`), he = Q(`/workflow/runtime/inst
     // 所属项目名称
     typeName: n
     // 所属项目id
-  }), h = r({
+  }), D = r({
     defId: "",
     // 流程id
     defKey: "",
@@ -37,16 +37,16 @@ const X = "v1", E = Q(`/workflow/flow/def/${X}`), he = Q(`/workflow/runtime/inst
   });
   return {
     copyDialogShow: C,
-    copyFormData: x,
-    detailFormData: h,
+    copyFormData: h,
+    detailFormData: D,
     rules: w,
     copyDialogLoading: d,
     saveCopyProcess: async (S) => {
       var c;
       (c = f.value) == null || c.validate(async (g) => {
         if (g) {
-          d.value = !0;
-          const [k, z] = await Ne(x.value, {
+          d.value = !0, console.log(" // copyFormData.value: ", h.value);
+          const [k, z] = await Ne(h.value, {
             params: { destinationProject: m, project: m }
           }).run();
           if (k) {
@@ -67,21 +67,21 @@ const X = "v1", E = Q(`/workflow/flow/def/${X}`), he = Q(`/workflow/runtime/inst
   };
 }, Ve = () => {
   const f = v().id ? v().id : "371344636432453", m = r(!1), n = r([]);
-  return { deleteDialogShow: m, instanceCount: n, reqCount: async (h) => {
+  return { deleteDialogShow: m, instanceCount: n, reqCount: async (D) => {
     const w = {
-      defKeys: h,
+      defKeys: D,
       projectId: f
-    }, [b, I] = await xe(w).run();
-    n.value = I;
-  }, deleteDefItem: async (h) => {
+    }, [b, N] = await xe(w).run();
+    console.log("data: ", N), n.value = N;
+  }, deleteDefItem: async (D) => {
     const w = {
       cascade: !0,
-      ids: h,
+      ids: D,
       project: f
-    }, [b, I] = await Ie(w).run();
+    }, [b, N] = await Ie(w).run();
     b || (m.value = !1, B.success(o("删除成功")));
   }, cancelDelete: () => m.value = !1 };
-}, Ke = { class: "das-process-configuration" }, Se = { class: "table-box" }, Pe = { class: "table-top" }, Te = { class: "operate" }, Re = { class: "table-content" }, $e = { class: "form-content" }, je = { class: "delete-dialog" }, qe = { class: "delete-text" }, Fe = { class: "delete-info-box" }, Le = {
+}, Ke = { class: "das-process-configuration" }, Se = { class: "table-box" }, Pe = { class: "table-top" }, Te = { class: "operate" }, Re = { class: "table-content" }, $e = { class: "form-content" }, Fe = { class: "delete-dialog" }, je = { class: "delete-text" }, qe = { class: "delete-info-box" }, Le = {
   key: 0,
   class: "delete-info-text"
 }, Ue = {
@@ -99,9 +99,9 @@ const X = "v1", E = Q(`/workflow/flow/def/${X}`), he = Q(`/workflow/runtime/inst
   },
   emits: ["update:modelValue", "processInfo", "cancelDialog", "operationClick"],
   setup(f, { emit: m }) {
-    const n = f, d = m, C = O(() => n.title || o("选择流程")), x = window.location.origin, h = v().id ? v().id : "371344636432453";
+    const n = f, d = m, C = O(() => n.title || o("选择流程")), h = window.location.origin, D = v().id ? v().id : "371344636432453";
     v().name ? v().name : o("AIoT项目");
-    const w = r(""), b = r(""), I = r(), S = O(() => n.modelValue ? n.modelValue : !1), c = r([]), g = r(!1), k = r(0), { copyDialogShow: z, copyFormData: _, detailFormData: D, rules: Y, saveCopyProcess: Z, cancelCopy: ee, copyDialogLoading: ae } = ze(I), { deleteDialogShow: P, instanceCount: T, reqCount: oe, deleteDefItem: te, cancelDelete: le } = Ve(), ne = O(() => n.operation ?? [
+    const w = r(""), b = r(""), N = r(), S = O(() => n.modelValue ? n.modelValue : !1), c = r([]), g = r(!1), k = r(0), { copyDialogShow: z, copyFormData: _, detailFormData: x, rules: Y, saveCopyProcess: Z, cancelCopy: ee, copyDialogLoading: ae } = ze(N), { deleteDialogShow: P, instanceCount: T, reqCount: oe, deleteDefItem: te, cancelDelete: le } = Ve(), ne = O(() => n.operation ?? [
       {
         label: o("编辑"),
         value: "edit"
@@ -129,13 +129,13 @@ const X = "v1", E = Q(`/workflow/flow/def/${X}`), he = Q(`/workflow/runtime/inst
       const a = se.value.find((t) => t.value === i);
       return a == null ? void 0 : a.text;
     }, V = r(n.defKey), R = r(), ie = (i, a, t) => {
-      R.value = a;
+      console.log(i, a, t), R.value = a;
     }, J = async (i, a) => {
       if (i === "edit") {
         const t = JSON.stringify(a);
-        window.open(`${x}/mvue/flowDesign?business=${n.bussinessName}&operate=edit&detail=${t}`);
+        window.open(`${h}/mvue/flowDesign?business=${n.bussinessName}&operate=edit&detail=${t}`);
       }
-      i === "copy" && (z.value = !0, _.value.defId = a.defId, _.value.typeId = a.typeId, _.value.defKey = "", _.value.name = "", D.value.defId = a.defId, D.value.defKey = a.defKey, D.value.name = a.name), i === "delete" && (w.value = a.id, b.value = a.name, await oe(a.defKey), P.value = !0), d("operationClick", i, a);
+      i === "copy" && (z.value = !0, _.value.defId = a.defId, _.value.typeId = a.typeId, _.value.defKey = "", _.value.name = "", x.value.defId = a.defId, x.value.defKey = a.defKey, x.value.name = a.name), i === "delete" && (w.value = a.id, b.value = a.name, await oe(a.defKey), P.value = !0), d("operationClick", i, a);
     }, $ = async () => {
       k.value++, k.value === 1 && (g.value = !0);
       const i = {
@@ -144,14 +144,14 @@ const X = "v1", E = Q(`/workflow/flow/def/${X}`), he = Q(`/workflow/runtime/inst
         querys: [
           { group: "main", operation: "IN", property: "businessTypeId", relation: "AND", value: n.bussinessName }
         ]
-      }, [a, t] = await De(i, { params: { project: h } }).run();
+      }, [a, t] = await De(i, { params: { project: D } }).run();
       if (a) {
         g.value = !1;
         return;
       }
       g.value = !1, c.value = t.rows;
     }, de = () => {
-      window.open(`${x}/mvue/flowDesign?business=${n.bussinessName}&operate=add`);
+      window.open(`${h}/mvue/flowDesign?business=${n.bussinessName}&operate=add`);
     }, ue = async () => {
       await Z($);
     }, pe = async () => {
@@ -165,19 +165,19 @@ const X = "v1", E = Q(`/workflow/flow/def/${X}`), he = Q(`/workflow/runtime/inst
       }
       d("processInfo", R.value), d("update:modelValue", !1);
     };
-    let j = r(0);
+    let F = r(0);
     return H(
       () => n.modelValue,
       async (i, a) => {
-        i && (await $(), c.value.length > 0 && (n.defKey ? (V.value = n.defKey, R.value = c.value.find((t) => t.defKey === n.defKey)) : (V.value = c.value[0].defKey, R.value = c.value[0])), j.value = window.setInterval(() => {
+        i && (await $(), c.value.length > 0 && (n.defKey ? (V.value = n.defKey, R.value = c.value.find((t) => t.defKey === n.defKey)) : (V.value = c.value[0].defKey, R.value = c.value[0])), F.value = window.setInterval(() => {
           $();
-        }, 1500)), i || (k.value = 0, window.clearInterval(j.value));
+        }, 1500)), i || (k.value = 0, window.clearInterval(F.value));
       }
     ), ye(() => {
-      window.clearInterval(j.value);
+      window.clearInterval(F.value);
     }), ve(() => {
-      window.clearInterval(j.value);
-    }), (i, a) => (F(), q(
+      window.clearInterval(F.value);
+    }), (i, a) => (q(), j(
       Ce,
       null,
       [
@@ -194,7 +194,7 @@ const X = "v1", E = Q(`/workflow/flow/def/${X}`), he = Q(`/workflow/runtime/inst
           }, {
             footer: s(() => [
               u("div", null, [
-                l(e(N), { onClick: M }, {
+                l(e(I), { onClick: M }, {
                   default: s(() => [
                     y(
                       p(e(o)("取消")),
@@ -205,7 +205,7 @@ const X = "v1", E = Q(`/workflow/flow/def/${X}`), he = Q(`/workflow/runtime/inst
                   _: 1
                   /* STABLE */
                 }),
-                l(e(N), {
+                l(e(I), {
                   btnType: "primary",
                   style: { "margin-left": "12px" },
                   onClick: ce
@@ -228,7 +228,7 @@ const X = "v1", E = Q(`/workflow/flow/def/${X}`), he = Q(`/workflow/runtime/inst
                   u("div", Se, [
                     u("div", Pe, [
                       u("div", Te, [
-                        l(e(N), {
+                        l(e(I), {
                           btnType: "primary-text",
                           size: "large",
                           block: "",
@@ -320,7 +320,7 @@ const X = "v1", E = Q(`/workflow/flow/def/${X}`), he = Q(`/workflow/runtime/inst
         }, {
           footer: s(() => [
             u("div", null, [
-              l(e(N), { onClick: e(ee) }, {
+              l(e(I), { onClick: e(ee) }, {
                 default: s(() => [
                   y(
                     p(e(o)("取消")),
@@ -331,7 +331,7 @@ const X = "v1", E = Q(`/workflow/flow/def/${X}`), he = Q(`/workflow/runtime/inst
                 _: 1
                 /* STABLE */
               }, 8, ["onClick"]),
-              l(e(N), {
+              l(e(I), {
                 btnType: "primary",
                 style: { "margin-left": "12px" },
                 onClick: ue
@@ -358,22 +358,22 @@ const X = "v1", E = Q(`/workflow/flow/def/${X}`), he = Q(`/workflow/runtime/inst
                     marginBottom: "30px",
                     marginRight: "26px",
                     ref_key: "editForm",
-                    ref: I,
+                    ref: N,
                     rules: e(Y)
                   }, {
                     default: s(() => [
                       l(e(U), {
                         label: e(o)("原流程名称"),
                         maxlength: "20",
-                        modelValue: e(D).name,
-                        "onUpdate:modelValue": a[3] || (a[3] = (t) => e(D).name = t),
+                        modelValue: e(x).name,
+                        "onUpdate:modelValue": a[3] || (a[3] = (t) => e(x).name = t),
                         disabled: ""
                       }, null, 8, ["label", "modelValue"]),
                       l(e(U), {
                         label: e(o)("原流程别名"),
                         maxlength: "20",
-                        modelValue: e(D).defKey,
-                        "onUpdate:modelValue": a[4] || (a[4] = (t) => e(D).defKey = t),
+                        modelValue: e(x).defKey,
+                        "onUpdate:modelValue": a[4] || (a[4] = (t) => e(x).defKey = t),
                         disabled: "",
                         marginRight: "0"
                       }, null, 8, ["label", "modelValue"]),
@@ -408,7 +408,7 @@ const X = "v1", E = Q(`/workflow/flow/def/${X}`), he = Q(`/workflow/runtime/inst
           /* STABLE */
         }, 8, ["modelValue", "title"]),
         L(" 删除弹窗 "),
-        u("div", je, [
+        u("div", Fe, [
           l(e(A), {
             modelValue: e(P),
             "onUpdate:modelValue": a[8] || (a[8] = (t) => W(P) ? P.value = t : null),
@@ -418,7 +418,7 @@ const X = "v1", E = Q(`/workflow/flow/def/${X}`), he = Q(`/workflow/runtime/inst
           }, {
             footer: s(() => [
               u("div", null, [
-                l(e(N), { onClick: e(le) }, {
+                l(e(I), { onClick: e(le) }, {
                   default: s(() => [
                     y(
                       p(e(o)("取消")),
@@ -429,7 +429,7 @@ const X = "v1", E = Q(`/workflow/flow/def/${X}`), he = Q(`/workflow/runtime/inst
                   _: 1
                   /* STABLE */
                 }, 8, ["onClick"]),
-                l(e(N), {
+                l(e(I), {
                   btnType: "primary",
                   style: { "margin-left": "12px" },
                   onClick: pe
@@ -447,7 +447,7 @@ const X = "v1", E = Q(`/workflow/flow/def/${X}`), he = Q(`/workflow/runtime/inst
               ])
             ]),
             default: s(() => [
-              u("div", qe, [
+              u("div", je, [
                 y(
                   p(e(o)("删除流程定义，对应的实例和任务会一起删除，")),
                   1
@@ -473,15 +473,15 @@ const X = "v1", E = Q(`/workflow/flow/def/${X}`), he = Q(`/workflow/runtime/inst
                 -1
                 /* CACHED */
               )),
-              ge((F(), q("div", Fe, [
-                e(T).length === 0 ? (F(), q(
+              ge((q(), j("div", qe, [
+                e(T).length === 0 ? (q(), j(
                   "div",
                   Le,
                   p(e(o)("dasui-process-configuration-key1", b.value, 0, 0)),
                   1
                   /* TEXT */
                 )) : L("v-if", !0),
-                e(T).length > 0 ? (F(), q(
+                e(T).length > 0 ? (q(), j(
                   "div",
                   Ue,
                   p(e(o)(