nbb-component-ui 1.3.3 → 1.3.5

package/dist/index.d.ts

@@ -2,4 +2,5 @@ import { Plugin } from 'vue';
 import { CmcProcessFlow } from './src/ProcessFlow';
 declare const plugin: Plugin<[]>;
 export { CmcProcessFlow };
+export declare function getRequest(): any;
 export default plugin;

package/dist/index.es.js

@@ -1,81 +1,84 @@
-import { defineComponent as y, ref as n, watch as k, resolveComponent as b, openBlock as P, createBlock as w, withCtx as x, createTextVNode as C } from "vue";
-import { ElMessage as l } from "element-plus";
-const A = (s) => ({
-  getApprovalDetail: async (t) => await s.get({
-    url: "/system/bpm/process-instance/get-approval-detail",
-    params: {
-      processInstanceId: t
-    }
-  })
-}), T = (s) => ({
-  getTaskListByProcessInstanceId: async (t) => await s.get({
-    url: "/system/bpm/task/list-by-process-instance-id",
-    params: {
-      processInstanceId: t
-    }
-  })
-}), B = /* @__PURE__ */ y({
+import { defineComponent as I, ref as n, watch as w, resolveComponent as k, openBlock as C, createBlock as x, withCtx as q, createTextVNode as P } from "vue";
+import { ElMessage as i } from "element-plus";
+const b = m(), F = async (s) => await b.get({
+  url: "/system/bpm/process-instance/get-approval-detail",
+  params: {
+    processInstanceId: s
+  }
+}), T = m(), B = async (s) => await T.get({
+  url: "/system/bpm/task/list-by-process-instance-id",
+  params: {
+    processInstanceId: s
+  }
+}), D = /* @__PURE__ */ I({
   __name: "CmcProcessFlow",
   props: {
     processInstanceId: {},
     request: {}
   },
   setup(s) {
-    const t = s, c = n(!1), p = n({}), i = n({}), u = n(""), m = n([]), r = n(""), _ = A(t.request), f = T(t.request), v = (o) => {
-      r.value = o, d(), g();
+    const o = s, r = n(!1), l = n({}), p = n({}), _ = n(""), f = n([]), a = n(""), v = (t) => {
+      a.value = t, d(), g();
     }, d = async () => {
-      var o, a;
+      var t, c;
       try {
-        c.value = !0;
-        const e = await _.getApprovalDetail(r.value);
+        r.value = !0;
+        const e = await F(a.value);
         if (!e) {
-          l.error("查询不到审批详情信息！");
+          i.error("查询不到审批详情信息！");
           return;
         }
         if (!e.processDefinition || !e.processInstance) {
-          l.error("查询不到流程信息！");
+          i.error("查询不到流程信息！");
           return;
         }
-        p.value = e == null ? void 0 : e.processInstance, u.value = (a = (o = e == null ? void 0 : e.processInstance) == null ? void 0 : o.formVariables) == null ? void 0 : a.applicationPrefix, i.value = e == null ? void 0 : e.todoTask;
+        l.value = e == null ? void 0 : e.processInstance, _.value = (c = (t = e == null ? void 0 : e.processInstance) == null ? void 0 : t.formVariables) == null ? void 0 : c.applicationPrefix, p.value = e == null ? void 0 : e.todoTask;
       } finally {
-        c.value = !1;
+        r.value = !1;
       }
     }, g = async () => {
-      m.value = await f.getTaskListByProcessInstanceId(r.value);
+      f.value = await B(a.value);
     };
-    k(
-      () => t.processInstanceId,
-      (o) => {
-        debugger;
-        o && o !== r.value && v(o);
+    w(
+      () => o.processInstanceId,
+      (t) => {
+        t && t !== a.value && v(t);
       },
       { immediate: !0, deep: !0 }
     );
-    const I = () => {
-      l.success("aaa!");
+    const y = () => {
+      i.success("aaa!");
     };
-    return (o, a) => {
-      const e = b("el-button");
-      return P(), w(e, { onClick: I }, {
-        default: x(() => [...a[0] || (a[0] = [
-          C("测试按钮3", -1)
+    return (t, c) => {
+      const e = k("el-button");
+      return C(), x(e, { onClick: y }, {
+        default: q(() => [...c[0] || (c[0] = [
+          P("测试按钮3", -1)
         ])]),
         _: 1
       });
     };
   }
 });
-const D = (s, t) => {
-  const c = s.__vccOpts || s;
-  for (const [p, i] of t)
-    c[p] = i;
-  return c;
-}, F = /* @__PURE__ */ D(B, [["__scopeId", "data-v-2dfb6958"]]), h = {
-  install(s) {
-    s.component("CmcProcessFlow", F);
+const L = (s, o) => {
+  const r = s.__vccOpts || s;
+  for (const [l, p] of o)
+    r[l] = p;
+  return r;
+}, h = /* @__PURE__ */ L(D, [["__scopeId", "data-v-e422ef37"]]);
+let u = null;
+const $ = {
+  install(s, o) {
+    u = o == null ? void 0 : o.request, s.component("CmcProcessFlow", h);
   }
 };
+function m() {
+  if (!u)
+    throw new Error("请在外部项目 app.use(CmcFlowCore) 传入 request");
+  return u;
+}
 export {
-  F as CmcProcessFlow,
-  h as default
+  h as CmcProcessFlow,
+  $ as default,
+  m as getRequest
 };

package/dist/index.umd.js

@@ -1 +1 @@
-(function(n,e){typeof exports=="object"&&typeof module<"u"?e(exports,require("vue"),require("element-plus")):typeof define=="function"&&define.amd?define(["exports","vue","element-plus"],e):(n=typeof globalThis<"u"?globalThis:n||self,e(n.NbbComponentUi={},n.Vue,n.ElementPlus))})(this,function(n,e,p){"use strict";const d=t=>({getApprovalDetail:async o=>await t.get({url:"/system/bpm/process-instance/get-approval-detail",params:{processInstanceId:o}})}),_=t=>({getTaskListByProcessInstanceId:async o=>await t.get({url:"/system/bpm/task/list-by-process-instance-id",params:{processInstanceId:o}})}),m=e.defineComponent({__name:"CmcProcessFlow",props:{processInstanceId:{},request:{}},setup(t){const o=t,r=e.ref(!1),l=e.ref({}),u=e.ref({}),y=e.ref(""),I=e.ref([]),i=e.ref(""),k=d(o.request),b=_(o.request),v=c=>{i.value=c,C(),P()},C=async()=>{var c,a;try{r.value=!0;const s=await k.getApprovalDetail(i.value);if(!s){p.ElMessage.error("查询不到审批详情信息！");return}if(!s.processDefinition||!s.processInstance){p.ElMessage.error("查询不到流程信息！");return}l.value=s==null?void 0:s.processInstance,y.value=(a=(c=s==null?void 0:s.processInstance)==null?void 0:c.formVariables)==null?void 0:a.applicationPrefix,u.value=s==null?void 0:s.todoTask}finally{r.value=!1}},P=async()=>{I.value=await b.getTaskListByProcessInstanceId(i.value)};e.watch(()=>o.processInstanceId,c=>{debugger;c&&c!==i.value&&v(c)},{immediate:!0,deep:!0});const T=()=>{p.ElMessage.success("aaa!")};return(c,a)=>{const s=e.resolveComponent("el-button");return e.openBlock(),e.createBlock(s,{onClick:T},{default:e.withCtx(()=>[...a[0]||(a[0]=[e.createTextVNode("测试按钮3",-1)])]),_:1})}}}),w="",f=((t,o)=>{const r=t.__vccOpts||t;for(const[l,u]of o)r[l]=u;return r})(m,[["__scopeId","data-v-2dfb6958"]]),g={install(t){t.component("CmcProcessFlow",f)}};n.CmcProcessFlow=f,n.default=g,Object.defineProperties(n,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});
+(function(t,e){typeof exports=="object"&&typeof module<"u"?e(exports,require("vue"),require("element-plus")):typeof define=="function"&&define.amd?define(["exports","vue","element-plus"],e):(t=typeof globalThis<"u"?globalThis:t||self,e(t.NbbComponentUi={},t.Vue,t.ElementPlus))})(this,function(t,e,l){"use strict";const m=u(),g=async n=>await m.get({url:"/system/bpm/process-instance/get-approval-detail",params:{processInstanceId:n}}),y=u(),w=async n=>await y.get({url:"/system/bpm/task/list-by-process-instance-id",params:{processInstanceId:n}}),C=e.defineComponent({__name:"CmcProcessFlow",props:{processInstanceId:{},request:{}},setup(n){const r=n,c=e.ref(!1),f=e.ref({}),_=e.ref({}),v=e.ref(""),k=e.ref([]),i=e.ref(""),q=o=>{i.value=o,b(),x()},b=async()=>{var o,a;try{c.value=!0;const s=await g(i.value);if(!s){l.ElMessage.error("查询不到审批详情信息！");return}if(!s.processDefinition||!s.processInstance){l.ElMessage.error("查询不到流程信息！");return}f.value=s==null?void 0:s.processInstance,v.value=(a=(o=s==null?void 0:s.processInstance)==null?void 0:o.formVariables)==null?void 0:a.applicationPrefix,_.value=s==null?void 0:s.todoTask}finally{c.value=!1}},x=async()=>{k.value=await w(i.value)};e.watch(()=>r.processInstanceId,o=>{o&&o!==i.value&&q(o)},{immediate:!0,deep:!0});const P=()=>{l.ElMessage.success("aaa!")};return(o,a)=>{const s=e.resolveComponent("el-button");return e.openBlock(),e.createBlock(s,{onClick:P},{default:e.withCtx(()=>[...a[0]||(a[0]=[e.createTextVNode("测试按钮3",-1)])]),_:1})}}}),T="",d=((n,r)=>{const c=n.__vccOpts||n;for(const[f,_]of r)c[f]=_;return c})(C,[["__scopeId","data-v-e422ef37"]]);let p=null;const I={install(n,r){p=r==null?void 0:r.request,n.component("CmcProcessFlow",d)}};function u(){if(!p)throw new Error("请在外部项目 app.use(CmcFlowCore) 传入 request");return p}t.CmcProcessFlow=d,t.default=I,t.getRequest=u,Object.defineProperties(t,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});

package/dist/src/api/processInstance.d.ts

@@ -1,3 +1 @@
-export declare const createProcessInstanceApi: (request: any) => {
-    getApprovalDetail: (processInstanceId: any) => Promise<any>;
-};
+export declare const getApprovalDetail: (processInstanceId: string) => Promise<any>;

package/dist/src/api/task.d.ts

@@ -1,3 +1 @@
-export declare const createTaskApi: (request: any) => {
-    getTaskListByProcessInstanceId: (processInstanceId: string) => Promise<any>;
-};
+export declare const getTaskListByProcessInstanceId: (processInstanceId: string) => Promise<any>;

package/dist/style.css

@@ -1 +1 @@
-@charset "UTF-8";.process-container[data-v-2dfb6958]{height:100%;box-sizing:border-box}.process-container[data-v-2dfb6958]>.el-card__body{height:100%;padding-bottom:0}.process-container[data-v-2dfb6958]>.el-card__body>div{height:100%;display:flex;flex-direction:column}.approval-actions[data-v-2dfb6958]{margin:20px 0}.approval-actions .action-buttons[data-v-2dfb6958]{display:flex;flex-direction:column;gap:12px}.approval-actions .action-buttons .basic-actions[data-v-2dfb6958]{display:flex;gap:12px}.approval-actions .action-buttons .extended-actions[data-v-2dfb6958]{display:flex;gap:12px;flex-wrap:wrap}.approval-dialogs[data-v-2dfb6958]{display:contents}
+@charset "UTF-8";.process-container[data-v-e422ef37]{height:100%;box-sizing:border-box}.process-container[data-v-e422ef37]>.el-card__body{height:100%;padding-bottom:0}.process-container[data-v-e422ef37]>.el-card__body>div{height:100%;display:flex;flex-direction:column}.approval-actions[data-v-e422ef37]{margin:20px 0}.approval-actions .action-buttons[data-v-e422ef37]{display:flex;flex-direction:column;gap:12px}.approval-actions .action-buttons .basic-actions[data-v-e422ef37]{display:flex;gap:12px}.approval-actions .action-buttons .extended-actions[data-v-e422ef37]{display:flex;gap:12px;flex-wrap:wrap}.approval-dialogs[data-v-e422ef37]{display:contents}

package/index.ts

@@ -1,14 +1,24 @@
 import type { App, Plugin } from 'vue'
 import {CmcProcessFlow} from "./src/ProcessFlow";
 
+let _request: any = null;
+
 // 定义插件对象，严格标注类型
 const plugin: Plugin<[]> = {
-  install(app: App) {
+  install(app: App, options?: {request: any}) {
+    _request = options?.request
     app.component('CmcProcessFlow', CmcProcessFlow)
   }
 }
 // 支持按需引入
 export {CmcProcessFlow }
 
+export function getRequest() {
+  if (!_request) {
+    throw new Error('请在外部项目 app.use(CmcFlowCore) 传入 request')
+  }
+  return _request
+}
+
 // 默认导出插件（必须是Plugin类型）
 export default plugin

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nbb-component-ui",
-  "version": "1.3.3",
+  "version": "1.3.5",
   "main": "./dist/index.umd.js",
   "module": "./dist/index.es.js",
   "types": "./dist/index.d.ts",

package/src/ProcessFlow/src/CmcProcessFlow.vue

@@ -11,8 +11,8 @@
 <script setup lang="ts">
 import { ElMessage } from 'element-plus'
 import {ref, watch} from "vue";
-import {createProcessInstanceApi}  from "@/api/processInstance";
-import {createTaskApi} from "@/api/task";
+import * as processInstanceApi  from "@/api/processInstance";
+import * as taskApi from "@/api/task";
 
 // import ProcessInstanceTaskList from './CmcFlowList.vue'
 
@@ -32,8 +32,6 @@ const applicationPrefix = ref('')
 const tasks = ref<any[]>([])
 
 const id = ref<string>('')
-const processInstanceApi = createProcessInstanceApi(props.request)
-const taskApi = createTaskApi(props.request)
 
 
 
@@ -48,6 +46,7 @@ const init = (processInstanceId: string) => {
 const getApprovalDetail =  async () => {
   try {
     processInstanceLoading.value = true
+
     const data = await processInstanceApi.getApprovalDetail(id.value)
     if (!data) {
       ElMessage.error('查询不到审批详情信息！')
@@ -73,7 +72,6 @@ const getTaskList = async () => {
 watch(
     () => props.processInstanceId,
     (newValue) => {
-      debugger
       if (newValue && newValue !== id.value) {
         init(newValue)
       }

package/src/api/processInstance.ts

@@ -1,12 +1,27 @@
-export const createProcessInstanceApi = (request: any) => ({
-    getApprovalDetail: async (processInstanceId: any) => {
-        return await request.get({
-            url: `/system/bpm/process-instance/get-approval-detail`,
-            params: {
-                processInstanceId
-            }
-        })
-    }
-})
+import {getRequest} from "../../index";
+
+const request = getRequest()
+
+export const getApprovalDetail = async (processInstanceId: string) => {
+    return await request.get({
+        url: `/system/bpm/process-instance/get-approval-detail`,
+        params: {
+            processInstanceId
+        }
+    })
+}
+
+
+
+// export const createProcessInstanceApi = (request: any) => ({
+//     getApprovalDetail: async (processInstanceId: any) => {
+//         return await request.get({
+//             url: `/system/bpm/process-instance/get-approval-detail`,
+//             params: {
+//                 processInstanceId
+//             }
+//         })
+//     }
+// })
 
 

package/src/api/task.ts

@@ -1,12 +1,14 @@
-export const createTaskApi = (request: any) => ({
-    getTaskListByProcessInstanceId: async (processInstanceId: string) => {
-        return await request.get({
-            url: `/system/bpm/task/list-by-process-instance-id`,
-            params: {
-                processInstanceId
-            }
-        })
-    }
-})
+import {getRequest} from "../../index";
+
+const request = getRequest()
+
+export const getTaskListByProcessInstanceId = async (processInstanceId: string) => {
+    return await request.get({
+        url: `/system/bpm/task/list-by-process-instance-id`,
+        params: {
+            processInstanceId
+        }
+    })
+}