ui-process-h5 0.1.29 → 0.1.30

package/package.json

@@ -1,73 +1,72 @@
-{
-  "name": "ui-process-h5",
-  "private": false,
-  "description": "流程组件",
-  "version": "0.1.29",
-  "type": "module",
-  "scripts": {
-    "dev": "vite",
-    "build": "vue-tsc && vite build",
-    "preview": "vite preview"
-  },
-  "files": [
-    "packages/*",
-    "Readme.md",
-    "package.json"
-  ],
-  "publicConfig": {
-    "registry": "http://registry.npmjs.org/"
-  },
-  "main": "./packages/index.ts",
-  "module": "./packages/index.ts",
-  "exports": {
-    ".": {
-      "import": "./packages/index.ts",
-      "require": "./packages/index.ts"
-    }
-  },
-  "dependencies": {
-    "axios": "^1.3.6",
-    "dayjs": "^1.11.7",
-    "less-loader": "^11.1.0",
-    "sass": "^1.62.0",
-    "ui-process-h5": "^0.1.29",
-    "vue": "^3.2.47",
-    "vue-demi": "^0.14.0"
-  },
-  "devDependencies": {
-    "@commitlint/cli": "^17.0.0",
-    "@commitlint/config-conventional": "^17.0.0",
-    "@types/node": "^18.15.12",
-    "@types/sass": "^1.43.1",
-    "@typescript-eslint/eslint-plugin": "^5.27.0",
-    "@typescript-eslint/parser": "^5.27.0",
-    "@vitejs/plugin-vue": "^4.1.0",
-    "@vitejs/plugin-vue-jsx": "^2.0.0",
-    "axios": "^1.3.5",
-    "chalk": "^4.1.2",
-    "commitizen": "^4.2.4",
-    "cross-env": "^7.0.3",
-    "cz-conventional-changelog": "^3.3.0",
-    "eslint": "^8.17.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-define-config": "^1.5.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-vue": "^9.1.0",
-    "good-storage": "^1.1.1",
-    "husky": "^8.0.1",
-    "js-cookie": "^3.0.1",
-    "prettier": "^2.6.2",
-    "rimraf": "^3.0.2",
-    "sass": "^1.49.7",
-    "standard-version": "^9.5.0",
-    "typescript": "^4.9.3",
-    "vite": "^4.2.0",
-    "vite-plugin-dts": "^1.2.0",
-    "vite-plugin-md": "^0.15.0",
-    "vue": "^3.2.47",
-    "vue-tsc": "^1.2.0"
-  },
-  "engines": {
-    "node": ">=16.0.0"
-  }
-}
+{
+  "name": "ui-process-h5",
+  "private": false,
+  "description": "流程组件",
+  "version": "0.1.30",
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "vue-tsc && vite build",
+    "preview": "vite preview"
+  },
+  "files": [
+    "packages/*",
+    "Readme.md",
+    "package.json"
+  ],
+  "publicConfig": {
+    "registry": "http://registry.npmjs.org/"
+  },
+  "main": "./packages/index.ts",
+  "module": "./packages/index.ts",
+  "exports": {
+    ".": {
+      "import": "./packages/index.ts",
+      "require": "./packages/index.ts"
+    }
+  },
+  "dependencies": {
+    "axios": "^1.3.6",
+    "dayjs": "^1.11.7",
+    "less-loader": "^11.1.0",
+    "sass": "^1.62.0",
+    "vue": "^3.2.47",
+    "vue-demi": "^0.14.0"
+  },
+  "devDependencies": {
+    "@commitlint/cli": "^17.0.0",
+    "@commitlint/config-conventional": "^17.0.0",
+    "@types/node": "^18.15.12",
+    "@types/sass": "^1.43.1",
+    "@typescript-eslint/eslint-plugin": "^5.27.0",
+    "@typescript-eslint/parser": "^5.27.0",
+    "@vitejs/plugin-vue": "^4.1.0",
+    "@vitejs/plugin-vue-jsx": "^2.0.0",
+    "axios": "^1.3.5",
+    "chalk": "^4.1.2",
+    "commitizen": "^4.2.4",
+    "cross-env": "^7.0.3",
+    "cz-conventional-changelog": "^3.3.0",
+    "eslint": "^8.17.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-define-config": "^1.5.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-vue": "^9.1.0",
+    "good-storage": "^1.1.1",
+    "husky": "^8.0.1",
+    "js-cookie": "^3.0.1",
+    "prettier": "^2.6.2",
+    "rimraf": "^3.0.2",
+    "sass": "^1.49.7",
+    "standard-version": "^9.5.0",
+    "typescript": "^4.9.3",
+    "vite": "^4.2.0",
+    "vite-plugin-dts": "^1.2.0",
+    "vite-plugin-md": "^0.15.0",
+    "vue": "^3.2.47",
+    "vue-tsc": "^1.2.0"
+  },
+  "engines": {
+    "node": ">=16.0.0"
+  }
+}

package/packages/component.ts

@@ -1,5 +1,4 @@
-import TopTab from "./components/tab";
 import TopProcess from "./components/process";
 
-export default [TopTab, TopProcess];
-export { TopTab, TopProcess };
+export default [TopProcess];
+export { TopProcess };

package/packages/components/process/index.ts

@@ -1,4 +1,4 @@
-import { App } from "vue";
+import { App } from "vue-demi";
 import TopProcess from "./src/index.vue";
 
 TopProcess.install = function (app: App) {

package/packages/components/{button/src/index.vue → process/src/button.vue}

@@ -13,32 +13,30 @@ export default defineComponent({
     props: {
         type: { default: "default", type: String },
     },
-    data() {
-        return {
-            style: {
-                type: Object,
-                default: {
-                    textColor: "#fff",
-                    bckColor: "3c9cff",
-                },
-            },
-        };
-    },
-    created() {
-        switch (this.type) {
+    setup(props) {
+        const style = ref({
+            textColor: "#fff",
+            bckColor: "3c9cff",
+        });
+
+        switch (props.type) {
             case "primary":
-                this.style.textColor = "#fff";
-                this.style.bckColor = "#3c9cff";
+                style.value.textColor = "#fff";
+                style.value.bckColor = "#3c9cff";
                 break;
             case "danger":
-                this.style.textColor = "rgb(255, 96, 96)";
-                this.style.bckColor = "rgb(255, 230, 230)";
+                style.value.textColor = "rgb(255, 96, 96)";
+                style.value.bckColor = "rgb(255, 230, 230)";
                 break;
             case "default":
-                this.style.textColor = "rgb(51, 51, 51)";
-                this.style.bckColor = "rgb(241, 241, 241)";
+                style.value.textColor = "rgb(51, 51, 51)";
+                style.value.bckColor = "rgb(241, 241, 241)";
                 break;
         }
+
+        return {
+            style,
+        };
     },
 });
 </script>

package/packages/components/process/src/index.vue

@@ -84,12 +84,12 @@
 
 <script lang="ts">
 import { defineComponent, ref, watch, computed } from "vue-demi";
-import TopTab from "../../tab";
-import TopPopup from "../../popup";
-import TopButton from "../../button";
+import TopTab from "./tab.vue";
+import TopPopup from "./popup.vue";
+import TopButton from "./button.vue";
 // import { getProcessStatus } from "../../utils/request/api";
 
-export default {
+export default defineComponent({
     name: "TopProcess",
     components: {
         TopTab,
@@ -103,8 +103,9 @@ export default {
         taskId: { require: true, default: "", type: String },
         isAdditional: { require: false, default: false, type: Boolean },
         isView: { default: false, type: Boolean },
+        userId: { default: "", type: String}
     },
-    setup(props: any) {
+    setup(props) {
         const processStatus = ref<any>({});
 
         const TopPopup1 = ref<any>();
@@ -202,7 +203,7 @@ export default {
             }
         );
 
-        /* getProcessStatus({
+       /*  getProcessStatus({
             processInstId: "4ac28800-7056-483b-8d38-a4932daf055b",
         }).then((res) => {
             console.log("res", res);
@@ -348,7 +349,7 @@ export default {
             return "#1389FF";
         },
     },
-}
+});
 </script>
 
 <style scoped>

package/packages/components/{popup/src/index.vue → process/src/popup.vue}

@@ -24,10 +24,10 @@
         @click="isMaskClose && handleClose()"
     ></div>
 </template>
-<script lang="ts">
+<script>
 import { defineComponent, ref, watch, computed, onMounted } from "vue-demi";
 
-export default {
+export default defineComponent({
     name: "TopPopup",
     props: {
         titleText: { default: "top-popup", type: String },
@@ -35,11 +35,11 @@ export default {
         comfigText: { default: "确定", type: String },
         comfig: { default: null, type: Function },
         cancel: { default: null, type: Function },
-        isMask: { require: false, default: true, type: Boolean },
-        isMaskClose: { require: false, default: true, type: Boolean },
+        isMask: { default: true, type: Boolean },
+        isMaskClose: { default: true, type: Boolean },
     },
     setup(props) {
-        const show = ref<boolean>(false);
+        const show = ref(false);
 
         const handleOpen = () => {
             show.value = true;
@@ -70,7 +70,7 @@ export default {
             show,
         };
     },
-}
+});
 </script>
 <style scoped>
 .top-popup {

package/packages/components/{tab/src/index.vue → process/src/tab.vue}

@@ -92,11 +92,11 @@
     </div>
 </template>
 
-<script lang="ts">
+<script >
 import { defineComponent, ref, watch, onMounted, computed } from "vue-demi";
 // import { getProcessStatus } from "../../utils/request/api";
 
-export default {
+export default defineComponent({
     name: "TopTab",
     props: {
         /**
@@ -117,14 +117,14 @@ export default {
             default: () => [],
         },
     },
-    setup(props: any) {
+    setup(props) {
         // 流程图
-        const trackUrl = ref<string>(
+        const trackUrl = ref(
             "http://59.53.91.231:8088/portal/r/w?sid=6f714ec1-7570-4525-ac51-b092402d8295&cmd=CLIENT_BPM_FORM_TRACK_OPEN&processInstId=1f6e7196-e1ea-428e-b295-aa23a54a2402&supportCanvas=true&formInfo="
         );
 
         // 审批信息
-        const taskCommentList = ref<any>([
+        const taskCommentList = ref([
             {
                 actionName: "提交",
                 activityName: "部门负责人",
@@ -143,10 +143,10 @@ export default {
         ]);
 
         // 选中
-        const active = ref<string>("");
+        const active = ref("");
 
         // tab 渲染
-        const defaultTabList = ref<any>([
+        const defaultTabList = ref([
             {
                 label: "基本信息",
                 key: "a",
@@ -167,7 +167,7 @@ export default {
             },
         ]);
 
-        const isTapList = ref<any>([
+        const isTapList = ref([
             {
                 label: "基本信息",
                 key: "a",
@@ -188,13 +188,13 @@ export default {
             },
         ]);
 
-        const label = ref<any>();
+        const label = ref();
 
         // taskNode taskObj
 
         /* method */
         // 选中方法
-        const handleActive = (e: string, i: number) => {
+        const handleActive = (e, i) => {
             if (e === active.value) {
                 return;
             }
@@ -203,9 +203,9 @@ export default {
             tabAnimation(i);
         };
 
-        const tabAnimation = (i: number) => {
+        const tabAnimation = (i) => {
             if (label.value.length) {
-                let doc = <any>(
+                let doc = (
                     document.getElementsByClassName("bottom-line")[0]
                 );
                 let left;
@@ -250,7 +250,7 @@ export default {
                     isTapList.value = [].concat(defaultTabList.value);
                     if (val.length > 0) {
                         /* return [] */
-                        val.forEach((v: any, i: number) => {
+                        val.forEach((v, i) => {
                             if (v.sort && v.sort > 1) {
                                 isTapList.value.splice(v.sort - 1, 0, v);
                             } else if (v.sort == 1) {
@@ -287,7 +287,7 @@ export default {
             trackUrl,
         };
     },
-};
+});
 </script>
 
 <style scoped>

package/packages/components/utils/request/api.ts

@@ -1,6 +1,6 @@
 import request from "./request";
 
-const proxyStr = "/aws";
+const proxyStr = "/prod-api/aws";
 
 export function getProcessStatus(query: any) {
     return request({

package/packages/components/utils/request/request.ts

@@ -7,14 +7,12 @@ import axios, {
 import { ACCESS_TOKEN, loadStorage } from "./cache";
 
 const host = process.env.VUE_APP_BASE_URL;
-// const api = process.env.VUE_APP_BASE_API;
-// const host = "http://59.53.91.231:2100/";
-const api = "prod-api"
+// const host = "http://59.53.91.231:2106";
 
 axios.defaults.headers["Content-Type"] = "application/json;charset=utf-8";
 
 const opts = {
-    baseURL: `${host}${api}`,
+    baseURL: host,
     timeout: 999999999,
     errorTip: true,
     transformResponse: [

package/packages/index.ts

@@ -1,6 +1,5 @@
 import { App } from "vue";
 import components from "./component";
-// import Design from 'ui-process-h5/lib/design.js'
 
 // 完整引入组件
 const install = function (app: App) {

package/packages/components/button/index.ts

@@ -1,9 +0,0 @@
-import { App, createApp } from "vue";
-import TopButton from "./src/index.vue";
-
-TopButton.install = function (app: App) {
-    // 组件注册，按需引入
-    app.component(TopButton.name, TopButton);
-    return app;
-};
-export default TopButton;

package/packages/components/popup/index.ts

@@ -1,11 +0,0 @@
-import { App, createApp } from "vue";
-import TopPopup from "./src/index.vue";
-
-TopPopup.install = function (app: App) {
-    // 组件注册，按需引入
-    console.log("TopPopup.install",app)
-    app.mount(TopPopup)
-    app.component(TopPopup.name, TopPopup);
-    return app;
-};
-export default TopPopup;

package/packages/components/tab/index.ts

@@ -1,9 +0,0 @@
-import { App } from "vue";
-import TopTab from "./src/index.vue";
-
-TopTab.install = function (app: App) {
-    // 组件注册，按需引入
-    app.component(TopTab.name, TopTab);
-    return app;
-};
-export default TopTab;