ui-process-h5 0.1.40 → 1.0.1

package/build/configure/README.md

@@ -39,12 +39,13 @@ export default {
         :processInstId="processInstId"
         :processDefId="processDefId"
         :formData="formData"
-        :appId="appId"
         :isView="isView"
         :userId="userId"
         :request="request"
         :tapList="tapList"
         :selfTapList="selfTapList"
+        :endFunction="endFunction"
+        :isDocument="isDocument"
     >
         <slot></slot>
     </TopProcess>
@@ -65,12 +66,13 @@ export default {
         :id="businessKey"
         :businessType="businessType"
         :todoParameter="todoParameter"
-        :isClearHistory="isClearHistory"
         :title="title"
+        @successFn="successFn"
+        :beforeFunction="beforeFunction"
     ></TopSumbitPopup>
 </template>
 <script>
-    import "ui-process-h5/ui-process-h5.css";
+    import "ui-process-h5/style.css";
     import {
         TopProcess,
         attchViews,
@@ -92,38 +94,66 @@ export default {
                     reason: reason,
                     meetingTheme: meetingTheme,
                 },
+                selfBtn: [
+                    {
+                        name: "测试",
+                        type: "danger",
+                        click: () => {
+                            console.log("当前::");
+                        },
+                    },
+                    {
+                        name: "测试2",
+                        type: "default",
+                        click: () => {
+                            console.log("当前::");
+                        },
+                    },
+                ],
             };
         },
-        methods: {},
+        methods: {
+            endFunction() {
+                console.log("endFunction");
+            },
+            beforeFunction() {
+                console.log("beforeFunction");
+            },
+        },
     };
 </script>
 ```
 
 ## 属性-Attributes (TopProcess)
 
-| 参数          | 类型     | 默认值 | 说明                                            |
-| ------------- | -------- | ------ | ----------------------------------------------- |
-| tapList       | Array    | []     | tab 节点插入、自定义附件等信息                  |
-| selfTapList   | Array    | []     | 自定义 tab 节点,传入后覆盖原本参数              |
-| processDefId  | String   | ''     | 流程 ID                                         |
-| request       | Object   | null   | axios 接口请求方法 [需要包含 get post 请求方式] |
-| processInstId | String   | ''     | 流程实例 ID                                     |
-| userId        | String   | ''     | 当前角色 id                                     |
-| formData      | Object   | {}     | 集合数据 内部存储流程相关信息                   |
-| appId         | String   | ''     | appId                                           |
-| getVars       | Function | null   | 业务方法                                        |
-| endFunction   | Function | null   | 弹窗结束后执行方法                              |
+| 参数           | 类型     | 默认值            | 说明                                            |
+| -------------- | -------- | ----------------- | ----------------------------------------------- |
+| tapList        | Array    | []                | tab 节点插入、自定义附件等信息                  |
+| selfTapList    | Array    | []                | 自定义 tab 节点,传入后覆盖原本参数              |
+| processDefId   | String   | ''                | 流程 ID                                         |
+| request        | Object   | null              | axios 接口请求方法 [需要包含 get post 请求方式] |
+| processInstId  | String   | ''                | 流程实例 ID                                     |
+| userId         | String   | ''                | 当前角色 id                                     |
+| formData       | Object   | {}                | 集合数据 内部存储流程相关信息                   |
+| isAdditional   | boolean  | false             | 自定义按钮                                      |
+| getVars        | Function | null              | 业务方法                                        |
+| endFunction    | Function | null              | 弹窗结束后执行方法                              |
+| beforeFunction | Function | null              | 弹窗开启前执行方法                              |
+| restartData    | Object   | null              | 重新提交参数                                    |
+| isDocument     | Boolean  | false             | 公文独立配置                                    |
+| selfList       | Array    | {id,name}         | 自定义流程列表                                  |
+| selfBtn        | Array    | {name,type,click} | 自定义流程按钮(查看案例 data)                   |
 
 ## 属性-Attributes (attchViews)
 
-| 参数     | 类型     | 默认值  | 说明                                            |
-| -------- | -------- | ------- | ----------------------------------------------- |
-| request  | Object   | null    | axios 接口请求方法 [需要包含 get post 请求方式] |
-| limit    | [Number  | String] | 4                                               | 最大上传数 |
-| getValue | Function | null    | 返回上传数据 url                                |
-| requires | Boolean  | false   | 必填                                            |
-| inComing | Array    | Array   | 回显已上传列表                                  |
-| deletFn  | Function | null    | 组件本身提供静态删除功能,动态删除需传入相应方法 |
+| 参数     | 类型             | 默认值 | 说明                                            |
+| -------- | ---------------- | ------ | ----------------------------------------------- |
+| request  | Object           | null   | axios 接口请求方法 [需要包含 get post 请求方式] |
+| limit    | [String, Number] | 4      | 最大上传数                                      |
+| getValue | Function         | null   | 返回上传数据 url                                |
+| requires | Boolean          | false  | 必填                                            |
+| inComing | Array            | Array  | 回显已上传列表                                  |
+| deletFn  | Function         | null   | 组件本身提供静态删除功能,动态删除需传入相应方法 |
 
 ## 属性-Attributes (ViewAttchList)
 
@@ -133,27 +163,30 @@ export default {
 
 ## 属性-Attributes (TopSumbitPopup)
 
-| 参数           | 类型             | 默认值 | 说明                                            |
-| -------------- | ---------------- | ------ | ----------------------------------------------- |
-| visible        | Boolean          | false  | 展示参数                                        |
-| isClearHistory | Boolean          | false  | 是否清除送审记录                                |
-| title          | String           | ""     | 送审提交标题参数                                |
-| todoParameter  | Object           | {}     | 发起流程时的其他参数                            |
-| businessType   | [String, Number] | null   | 业务类型                                        |
-| id             | String           | ""     | 业务 Id                                         |
-| resubmit       | Boolean          | false  | 是否为重新提交                                  |
-| request        | Object           | null   | axios 接口请求方法 [需要包含 get post 请求方式] |
-| appId          | String           | ''     | appId                                           |
+| 参数           | 类型             | 默认值    | 说明                                            |
+| -------------- | ---------------- | --------- | ----------------------------------------------- |
+| visible        | Boolean          | false     | 展示参数                                        |  |
+| title          | String           | ""        | 送审提交标题参数                                |
+| todoParameter  | Object           | {}        | 发起流程时的其他参数                            |
+| businessType   | [String, Number] | null      | 业务类型                                        |
+| id             | String           | ""        | 业务 Id                                         |
+| resubmit       | Boolean          | false     | 是否为重新提交                                  |
+| request        | Object           | null      | axios 接口请求方法 [需要包含 get post 请求方式] |
+| appId          | String           | ''        | appId                                           |
+| beforeFunction | Function         | null      | 提交前执行事件                                  |
+| successFn      | Function         | null      | 成功后回调                                      |
+| manual         | Boolean          | false     | 手动执行启动(ref 绑定后执行 handleSongshen())   |
+| selfList       | Array            | {id,name} | 自定义流程列表                                  |
 
 > ### tapList-对象说明
 >
-| 属性名 | 类型   | 说明                                                                         |
-| ------ | ------ | ---------------------------------------------------------------------------- |
-| label  | String | 选项卡 title                                                                 |
-| key    | String | 选项卡 ID 请勿重复 defaultTabList 内已拥有的默认 key(a、b、c 为默认节点 key) |
-| type   | String | 插槽类型 默认 default 插槽 slot                                              |
-| slot   | String | 插槽名                                                                       |
-| sort   | Number | 排序参数,无参数默认插入末尾                                                  |
+> | 属性名 | 类型   | 说明                                                                         |
+> | ------ | ------ | ---------------------------------------------------------------------------- |
+> | label  | String | 选项卡 title                                                                 |
+> | key    | String | 选项卡 ID 请勿重复 defaultTabList 内已拥有的默认 key(a、b、c 为默认节点 key) |
+> | type   | String | 插槽类型 默认 default 插槽 slot                                              |
+> | slot   | String | 插槽名                                                                       |
+> | sort   | Number | 排序参数,无参数默认插入末尾                                                  |
 
 ### selfTapList-对象说明 同上
 
@@ -169,3 +202,11 @@ export default {
 | userName                  | String | 姓名        |
 
 附件相关列表,参考 getValue 回调参数
+
+### restartData-对象说明
+
+| 属性名       | 类型   | 说明                 |
+| ------------ | ------ | -------------------- |
+| businessType | String | 业务 类型            |
+| showType     | String | 流程类型(all,pc,app) |
+| processName  | String | 流程查询字段         |

package/build/configure/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ui-process-h5",
-  "version": "1.0.5",
+  "version": "1.3.28",
   "description": "> app端 流程插件",
   "main": "./ui-process-h5.umd.cjs",
   "style": "./style.css",
@@ -20,7 +20,8 @@
     "postinstall": "node scripts/postinstall.mjs"
   },
   "devDependencies": {
-    "checked-pick-app": "^1.0.5"
+    "checked-pick-app": "^1.3.10",
+    "dsbridge": "^3.1.4"
   },
   "author": "",
   "license": "ISC"

package/package.json

@@ -2,7 +2,7 @@
   "name": "ui-process-h5",
   "private": false,
   "description": "流程组件",
-  "version": "0.1.40",
+  "version": "1.0.1",
   "type": "module",
   "scripts": {
     "dev": "vite --host 0.0.0.0",
@@ -22,11 +22,15 @@
     "@types/node": "^18.16.3",
     "@vue/composition-api": "^1.7.1",
     "axios": "^1.3.6",
+    "checked-pick-app": "^1.3.10",
+    "dsbridge": "^3.1.4",
     "js-cookie": "^3.0.5",
     "json-bigint": "^1.0.0",
     "npm-run-all": "^4.1.5",
     "perfect-scrollbar": "^1.5.5",
     "sass": "^1.62.1",
+    "ui-process-h5": "^1.0.36",
+    "vconsole": "^3.15.1",
     "vue-demi": "^0.13.8"
   },
   "peerDependencies": {
@@ -40,7 +44,6 @@
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^3.0.3",
-    "checked-pick-app": "1.0.5",
     "postcss-relaxed-unit": "^1.1.1",
     "rimraf": "^3.0.2",
     "rollup-plugin-copy": "^3.4.0",

package/src/App.vue

@@ -1,38 +1,53 @@
 <template>
     <TopProcess
-        processInstId="572405e4-e0dc-40fc-9a95-2b20f5bdfbf1"
-        processDefId="obj_f81cf369ac6e4bf889fc69be430ca6da"
+        :processInstId="formData.processInstId"
+        :processDefId="formData.processDefId"
         :formData="formData"
-        appId="com.awspaas.user.apps.leave"
-        :isView="false"
-        
-        userId="8c7d012761a680dff78b19e10e794c99"
+        :appId="appId"
+        :uid="formData.uid"
         :request="request"
+        :tapList="tapList"
+        :endFunction="endFunction"
+        :beforeFunction="beforeFunction"
+        :restartData="restartData"
+        :selfBtn="selfBtn"
+        :isDocument="false"
+        :isMsg="true"
+        :isView="false"
     >
-    <!-- :getVars="getVars" -->
-        <div>展示当前形态</div>
+        <!-- :isDocument="true" -->
+        <!-- :isAdditional="true" -->
+        <!-- :getVars="getVars" -->
+        <template #default>展示当前形态</template>
+        <template #attch>attch</template>
+        <template #fsList>fsList</template>
+        <template #documentPage>documentPage</template>
+        <template v-slot:btn="data">
+            <div>123{{ data.data.status }}</div>
+        </template>
     </TopProcess>
 </template>
 <script>
 import { TopProcess } from "@/packages/index.js";
 import request from "@/assets/js/request";
 import { defineComponent } from "vue-demi";
-import { setToken } from "@/assets/js/auth";
-import { departPerson } from "checked-pick-app";
+import { setToken, setSubject, setProject } from "@/assets/js/auth";
+// import departPerson from "@/packages/checked-pick-app";
 export default {
     data() {
         return {
             formData: {
-                businessKey: "6a9aaf5742572e82b5d89d6f7e52e2f2",
-                processInstId: "572405e4-e0dc-40fc-9a95-2b20f5bdfbf1",
-                processDefId: "obj_f81cf369ac6e4bf889fc69be430ca6da",
+                businessKey: "db6bf1d242f940d0cef14eb775cab458",
+                processInstId: "0fff228a-eb2b-4ce6-8127-aa27c6dfbc1c",
+                processDefId: "obj_6534ff52252941f280a87516a9754b77",
                 title: "测试",
                 subjectId: "3a4ef115e32c85a78239e3f5f76b9637",
                 tel: "15107910151",
                 userId: "8c7d012761a680dff78b19e10e794c99",
                 userName: "刘博文",
+                uid:"2a8e7180ea1666679d3052f26f3fa8ee",
             },
-            appId: "com.awspaas.user.apps.leave",
+            appId: "com.awspaas.user.apps.recevie.document",
             isView: false,
             info: {},
             bizId: "",
@@ -60,12 +75,56 @@ export default {
                 codeType: [1, 2, 3], // 可选类型 1-主体 2-部门 3-人员
                 multiple: true, // 是否多选
             },
+            tapList: [
+                {
+                    label: "附件",
+                    key: "attch",
+                    type: "slot",
+                    sort: 2,
+                    slot: "attch",
+                },
+                {
+                    label: "分送记录",
+                    key: "fsList",
+                    type: "slot",
+                    slot: "fsList",
+                },
+                {
+                    label: "正文",
+                    key: "documentPage",
+                    type: "slot",
+                    sort: 3,
+                    slot: "documentPage",
+                },
+            ],
+            restartData: {
+                businessType: "4",
+                title: "测试送审",
+                showType: "all",
+                processName: "",
+            },
+            selfBtn: [
+                {
+                    name: "测试",
+                    type: "danger",
+                    click: () => {
+                        console.log("当前::");
+                    },
+                },
+                {
+                    name: "测试2",
+                    type: "default",
+                    click: () => {
+                        console.log("当前::");
+                    },
+                },
+            ],
         };
     },
     components: {
         /* topProcess, */
         TopProcess,
-        departPerson,
+        // departPerson,
     },
     onLoad(e) {
         this.bizId = e.bizId;
@@ -75,7 +134,11 @@ export default {
     },
     mounted() {
         console.log("this.request", this.request);
-        setToken("7d9af038-caae-46b7-b93a-e7a7fcb7d4a4");
+        setToken("b2cd4a4d-200a-4ac3-bee5-8842f39233c3");
+        // 7369abf4-e2b4-44d0-87b2-7c46a444d3b5
+        // da6bab4f-fa42-4730-b0fe-c5e022123c0c
+        setSubject("9f13a9c9c400fa6e6228848ce1f131ee");
+        /*  setProject("4b23dd7dcb9cf7cb548fbd087ce9d748"); */
         console.log("processIDS", request);
     },
     methods: {
@@ -83,6 +146,14 @@ export default {
             console.log("getVars");
             return true;
         },
+        endFunction(val) {
+            console.log("endFunction:::",val);
+            /*  location.reload(); */
+        },
+        beforeFunction() {
+            console.log("beforeFunction111");
+            return true;
+        },
     },
 };
 </script>

package/src/assets/js/auth.js

@@ -1,41 +1,65 @@
-import Cookies from 'js-cookie'
+import Cookies from "js-cookie";
 
-const TokenKey = 'Admin-Token'
+const TokenKey = "Admin-Token";
 
-const ExpiresInKey = 'Admin-Expires-In'
+const ExpiresInKey = "Admin-Expires-In";
 
 export function getToken() {
-  return Cookies.get(TokenKey)
+    return Cookies.get(TokenKey);
 }
 
 export function setToken(token) {
-  return Cookies.set(TokenKey, token)
+    return Cookies.set(TokenKey, token);
 }
 
 export function removeToken() {
-  return Cookies.remove(TokenKey)
+    return Cookies.remove(TokenKey);
 }
 
 export function getExpiresIn() {
-  return Cookies.get(ExpiresInKey) || -1
+    return Cookies.get(ExpiresInKey) || -1;
 }
 
 export function setExpiresIn(time) {
-  return Cookies.set(ExpiresInKey, time)
+    return Cookies.set(ExpiresInKey, time);
 }
 
 export function removeExpiresIn() {
-  return Cookies.remove(ExpiresInKey)
+    return Cookies.remove(ExpiresInKey);
 }
 
 export function setSystemId(systemId) {
-  return Cookies.set('systemId', systemId)
+    return Cookies.set("systemId", systemId);
 }
 
 export function getSystemId() {
-  return Cookies.get('systemId') || 'oa'
+    return Cookies.get("systemId") || "oa";
 }
 
 export function removeSystemId() {
-  return Cookies.remove('systemId')
+    return Cookies.remove("systemId");
+}
+
+export function getSubject() {
+    return Cookies.get("subjectId");
+}
+
+export function setSubject(token) {
+    return Cookies.set("subjectId", token);
+}
+
+export function removeSubject() {
+    return Cookies.remove("subjectId");
+}
+
+export function getProject() {
+    return Cookies.get("projectId");
+}
+
+export function setProject(token) {
+    return Cookies.set("projectId", token);
+}
+
+export function removeProject() {
+    return Cookies.remove("projectId");
 }

package/src/assets/js/request.js

@@ -1,90 +1,99 @@
-import axios from 'axios';
-import { messageBox } from './message'
-import { getToken } from './auth';
-import errorCode from './errorCode';
-import { tansParams } from './top';
+import axios from "axios";
+import { messageBox } from "./message";
+import { getToken, getProject, getSubject } from "./auth";
+import errorCode from "./errorCode";
+import { tansParams } from "./top";
 import JSONbig from "json-bigint";
-import { baseConfig } from './utils'
-axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8';
+import { baseConfig } from "./utils";
+axios.defaults.headers["Content-Type"] = "application/json;charset=utf-8";
 const opts = {
-  baseURL: baseConfig.apiUrl,
-  timeout: 999999999,
-  errorTip: true,
-  transformResponse: [function (data) {
-    if (typeof data === 'string') {
-      try {
-        data = JSONbig.parse(data);
-      } catch (e) { console.log(e) }
-    }
-    return data;
-  }]
+    baseURL: baseConfig.apiUrl,
+    timeout: 999999999,
+    errorTip: true,
+    transformResponse: [
+        function (data) {
+            if (typeof data === "string") {
+                try {
+                    data = JSONbig.parse(data);
+                } catch (e) {
+                    console.log(e);
+                }
+            }
+            return data;
+        },
+    ],
 };
 opts.headers = {
-  'X-Tag': sessionStorage.getItem("tag")
+    "X-Tag": sessionStorage.getItem("tag"),
 };
 const service = axios.create(opts);
 
 service.interceptors.request.use(
-  (config) => {
-    const isToken = (config.headers || {}).isToken === false;
-    if (getToken() && !isToken) {
-      config.headers['Authorization'] = 'Bearer ' + getToken(); // 让每个请求携带自定义token 请根据实际情况自行修改
-    }
+    (config) => {
+        const isToken = (config.headers || {}).isToken === false;
+        if (getToken() && !isToken) {
+            config.headers["Authorization"] = "Bearer " + getToken(); // 让每个请求携带自定义token 请根据实际情况自行修改
+            config.headers["Subjectid"] = getSubject();
+            // config.headers["Projectid"] = getProject();
+        }
 
-    if (config.method === 'get' && config.params) {
-      let url = config.url + '?' + tansParams(config.params);
-      url = url.slice(0, -1);
-      config.params = {};
-      config.url = url;
+        if (config.method === "get" && config.params) {
+            let url = config.url + "?" + tansParams(config.params);
+            url = url.slice(0, -1);
+            config.params = {};
+            config.url = url;
+        }
+        return config;
+    },
+    (error) => {
+        Promise.reject(error);
     }
-    return config;
-  },
-  (error) => {
-    Promise.reject(error);
-  }
 );
 
 // 响应拦截器
 service.interceptors.response.use(
-  (response) => {
-    if (Object.prototype.toString.call(response.data) === '[object Blob]') {
-      return response;
-    }
-    const { data, config } = response;
-    const { code, success } = data;
-    const message = response.data.msg || errorCode[code] || errorCode['default'];
-    // 增加失败判断
-    data.fail = code !== 200 && success !== true;
+    (response) => {
+        if (Object.prototype.toString.call(response.data) === "[object Blob]") {
+            return response;
+        }
+        const { data, config } = response;
+        const { code, success } = data;
+        const message =
+            response.data.msg || errorCode[code] || errorCode["default"];
+        // 增加失败判断
+        data.fail = code !== 200 && success !== true;
 
-    if (code === 401) {
-      new messageBox().message({ content: '登录状态已过期，您可以继续留在该页面，或者重新登录', type: 'error' })
-      return data;
-    } else if (code !== 200 && code !== '0' && config.errorTip) {
-
-      new messageBox().message({ content: message, type: 'error' })
-      return data;
-    }
-    return data;
-  },
-  (error) => {
-    let { message } = error;
-    if (message === 'Network Error') {
-      message = '后端接口连接异常';
-    } else if (message.includes('timeout')) {
-      message = '系统接口请求超时';
-    } else if (message.includes('Request failed with status code')) {
-      message = '系统接口' + message.substr(message.length - 3) + '异常';
+        if (code === 401) {
+            new messageBox().message({
+                content: "登录状态已过期，您可以继续留在该页面，或者重新登录",
+                type: "error",
+            });
+            return data;
+        } else if (code !== 200 && code !== "0" && config.errorTip) {
+            new messageBox().message({ content: message, type: "error" });
+            return data;
+        }
+        return data;
+    },
+    (error) => {
+        let { message } = error;
+        if (message === "Network Error") {
+            message = "后端接口连接异常";
+        } else if (message.includes("timeout")) {
+            message = "系统接口请求超时";
+        } else if (message.includes("Request failed with status code")) {
+            message = "系统接口" + message.substr(message.length - 3) + "异常";
+        }
+        new messageBox().message({ content: message, type: "error" });
+        // if (config.errorTip) {
+        //   Message({
+        //     message: message,
+        //     type: 'error',
+        //     duration: 5 * 1000
+        //   });
+        // }
+        return Promise.reject(error);
     }
-    new messageBox().message({ content: message, type: 'error' })
-    // if (config.errorTip) {
-    //   Message({
-    //     message: message,
-    //     type: 'error',
-    //     duration: 5 * 1000
-    //   });
-    // }
-    return Promise.reject(error);
-  }
 );
 
 export default service;

package/src/assets/js/utils.js

@@ -77,6 +77,7 @@ export function lastString(str, unit) {
   return str.slice(str.lastIndexOf(unit) + 1)
 }
 const baseConfig = {
-  apiUrl: '/stage-api'
+  apiUrl: '/prod-api'
+  // apiUrl: '/stage-api'
 }
 export { lastNumber, phoneNumberHiding, isNull, baseConfig }