ui-process-h5 0.1.40 → 1.0.1

package/src/packages/submitPopup/index.scss

@@ -15,43 +15,43 @@
     color: #1389ff;
 }
 
-.person-views {
-    .views-items {
-        width: 100%;
-        height: 48px;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        font-size: 15px;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        padding: 0 20px;
-        box-sizing: border-box;
+.person-views .views-items {
+    width: 100%;
+    height: 48px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 15px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0 20px;
+    box-sizing: border-box;
+}
+
+.person-views .views-items-set {
+    width: 50%;
+    display: flex;
+    flex-basis: fit-content;
+    align-items: center;
+}
 
-        &-set {
-            width: 50%;
-            display: flex;
-            flex-basis: fit-content;
-            align-items: center;
-            &-btn {
-                color: #1389ff;
-                margin-left: 10px;
-                min-width: 30px;
-            }
-        }
+.person-views .views-items-set-btn {
+    color: #1389ff;
+    margin-left: 10px;
+    min-width: 30px;
+}
 
-        &-name {
-            width: 50%;
-            &--re {
-                color: #ee0000;
-            }
-        }
-    }
+.person-views .views-items-name {
+    width: 50%;
+}
 
-    &-white{
-        text-align: center;
-    }
+.person-views .views-items-name--re {
+    color: #ee0000;
+}
+
+.person-views-white {
+    text-align: center;
 }
 
 .person-btn {
@@ -67,17 +67,22 @@
     position: fixed;
     bottom: 0;
     width: 100%;
+}
+
+.person-btn .top-button {
+    width: 100%;
+    border-radius: 20px;
+    height: 36px;
+    background-color: #3c9cff;
+    color: #fff;
+    font-size: 14px;
+    justify-content: center;
+    display: flex;
+    align-items: center;
+    margin: 0 5px;
+}
 
-    .top-button {
-        width: 100%;
-        border-radius: 20px;
-        height: 36px;
-        background-color: #3c9cff;
-        color: #fff;
-        font-size: 14px;
-        justify-content: center;
-        display: flex;
-        align-items: center;
-        margin: 0 5px;
-    }
+::v-deep .departPerson-main {
+    width: 100% !important;
+    height: 100% !important;
 }

package/src/packages/submitPopup/index.vue

@@ -9,19 +9,25 @@
             titleText="送审"
             isDrawer
             :isIndex="99"
+            :className="`sumbmitPopup-index sumbmitPopup-index-sumbit`"
         >
             <TopDownSelect
                 :option="option"
                 @change="handleChange"
+                :defaultValue="selectDefaultValue"
             ></TopDownSelect>
-            <div class="viewTrack" @click="taskurlshow = true">查看流程图</div>
+            <div
+                class="viewTrack"
+                v-if="checkedItem.id"
+                @click="taskurlshow = true"
+            >
+                查看流程图
+            </div>
             <div class="person-views" v-if="firstPerson && firstPerson.length">
                 <div class="views-items" v-for="(v, i) in firstPerson">
                     <div class="views-items-name">
                         {{ v.name }}
-                        <span class="views-items-name--re"
-                            >*</span
-                        >
+                        <span class="views-items-name--re">*</span>
                     </div>
                     <div class="views-items-set">
                         <div v-if="partNode[v.id] && partNode[v.id].length">
@@ -38,10 +44,19 @@
                                 >...等{{ partNode[v.id].length }}人</span
                             >
                         </div>
-                        <div v-else></div>
+                        <div v-else-if="v.routeTxt && v.routeTxt.userNames">
+                            {{ v.routeTxt.userNames }}
+                        </div>
+                        <div
+                            v-if="
+                                v.humanPerformerName == '固定账户' ||
+                                v.humanPerformerName == '与流程申请人相关'
+                            "
+                        ></div>
                         <div
                             class="views-items-set-btn"
                             @click="handleOpenPerson(v)"
+                            v-else
                         >
                             设置
                         </div>
@@ -108,6 +123,7 @@
             :isIndex="199"
         >
             <departPerson
+                :isTitle="false"
                 :visible.sync="visiblePerson"
                 v-bind="entity"
                 @callback="handleCallback"

package/src/packages/tab/index.js

@@ -65,13 +65,13 @@ export default defineComponent({
                     label: "流程图",
                     key: "b",
                     type: "default",
-                    slot: "tab2",
+                    slot: "b",
                 },
                 {
                     label: "审批记录",
                     key: "c",
                     type: "default",
-                    slot: "tab3",
+                    slot: "c",
                 },
             ],
             // 弹窗操作
@@ -86,13 +86,13 @@ export default defineComponent({
                     label: "流程图",
                     key: "b",
                     type: "default",
-                    slot: "tab2",
+                    slot: "b",
                 },
                 {
                     label: "审批记录",
                     key: "c",
                     type: "default",
-                    slot: "tab3",
+                    slot: "c",
                 },
             ],
             // 绑定tab块
@@ -102,6 +102,7 @@ export default defineComponent({
             visible: false,
             inList: [],
             visibleTack: false,
+            trackListss: [],
         };
     },
     watch: {
@@ -123,7 +124,7 @@ export default defineComponent({
                         });
                     }
                     this.active = this.isTapList[0].key;
-                    console.log("isTapList", this.isTapList);
+                    // console.log("isTapList", this.isTapList);
                 }
             },
             immediate: true,
@@ -144,7 +145,26 @@ export default defineComponent({
         track: {
             handler(val, preVal) {
                 if (val) {
+                    console.log("流程图:::", val);
                     this.trackUrl = val;
+                    if (window.location.protocol == "https:") {
+                        this.trackUrl = this.trackUrl.replace(
+                            "http://59.53.91.230:8088/",
+                            "https://kq.ddzg.cn:8093/"
+                        );
+                        this.trackUrl = this.trackUrl.replace(
+                            "http://59.53.91.231:8088/",
+                            "https://qt.ddzg.cn:2119/"
+                        );
+                        this.trackUrl = this.trackUrl.replace(
+                            "http://121.40.143.183:80/",
+                            "https://www.ddzg.cn:2119/"
+                        );
+                        this.trackUrl = this.trackUrl.replace(
+                            "http://121.40.143.183/",
+                            "https://www.ddzg.cn:2119/"
+                        );
+                    }
                 }
             },
             immediate: true,
@@ -160,6 +180,15 @@ export default defineComponent({
             immediate: true,
             deep: true,
         },
+        trackList: {
+            handler(val, preVal) {
+                if (val) {
+                    this.trackListss = val;
+                }
+            },
+            immediate: true,
+            deep: true,
+        },
     },
 
     mounted() {

package/src/packages/tab/index.scss

@@ -49,7 +49,7 @@
     align-items: center;
 }
 
-.tops-tab-header-items:last-child {
+.tops-tab-header-items:nth-last-child(2) {
     padding-right: 0;
     margin-right: 0;
 }
@@ -74,6 +74,7 @@
 }
 .tops-tab-body {
     height: calc(100% - 45px);
+    overflow-y: auto;
 }
 
 .seal-list__item {

package/src/packages/tab/index.vue

@@ -25,7 +25,7 @@
                     v-if="item.key === 'a' && item.type === 'default'"
                     name="default"
                 ></slot>
-                <slot
+                <div style="height:100%;"
                     v-if="item.key === 'b' && item.type === 'default'"
                     :name="item.slot"
                 >
@@ -50,10 +50,9 @@
                     <div v-else class="textnone">
                         暂无流程图
                     </div>
-                </slot>
-                <slot
+                </div>
+                <div style="height:100%;"
                     v-if="item.key === 'c' && item.type === 'default'"
-                    :name="item.slot"
                 >
                     <template v-if="taskCommentList.length > 0">
                         <div
@@ -96,7 +95,7 @@
                         </div>
                     </template>
                     <div v-else class="textnone">暂无数据</div>
-                </slot>
+                </div>
                 <slot v-if="item.type == 'slot'" :name="item.slot"></slot>
             </div>
         </div>
@@ -106,6 +105,7 @@
             ref="TopPopup"
             titleText="附件列表"
             isDrawer
+            :isIndex="5"
         >
             <ViewAttchList :inList="inList"></ViewAttchList>
         </TopPopup>
@@ -117,9 +117,9 @@
             isDrawer
             width="60vw"
         >
-            <template v-if="trackList && trackList.length">
+            <template v-if="trackListss && trackListss.length">
                 <div
-                    v-for="(item, index) in trackList"
+                    v-for="(item, index) in trackListss"
                     :key="item.id"
                     class="seal-list__item"
                 >

package/src/packages/tip/index.js

@@ -4,11 +4,13 @@ import loading from "@/assets/status/loading.png";
 import success from "@/assets/status/success.png";
 
 export default defineComponent({
-    name:"TopTips",
+    name: "TopTips",
     props: {
         text: { default: "", type: String }, // tips文本展示
         type: { default: "default", type: String }, // tips 类型 (success, error, loading)
         statusTips: { default: false, type: Boolean }, // 开启状态展示
+        domNode: { default: "", type: String },
+        visible: { default: false, type: Boolean },
     },
     data() {
         return {
@@ -46,7 +48,11 @@ export default defineComponent({
     },
     mounted() {
         this.$nextTick(() => {
-            const body = document.querySelector("body");
+            const body = document.getElementsByClassName("process-warp")[0]
+                ? document.getElementsByClassName("process-warp")[0]
+                : document
+                      .getElementsByClassName("sumbmitPopup-index-sumbit")[0]
+                      .getElementsByClassName("top-popup-drawer")[0];
             if (body.append) {
                 body.append(this.$el);
             } else {

package/src/packages/tip/index.scss

@@ -8,6 +8,12 @@
     text-align: center;
     max-width: 80%;
     transition: all 0.3s ease;
+    visibility: hidden;
+    opacity: 0;
+}
+
+.top-tipss-animal {
+    animation: shows 1.5s ease;
 }
 
 .top-tipss-mask {
@@ -80,3 +86,36 @@
         transform: rotate(360deg);
     }
 }
+
+.fade-enter,
+.fade-leave-to {
+    visibility: hidden;
+    opacity: 0;
+}
+.fade-enter-active,
+.fade-leave-active {
+    transition: opacity 2s;
+}
+
+@keyframes shows {
+    0% {
+        visibility: hidden;
+        opacity: 0;
+    }
+    25% {
+        visibility: hidden;
+        opacity: 0.5;
+    }
+    50% {
+        visibility: visible;
+        opacity: 1;
+    }
+    75% {
+        visibility: hidden;
+        opacity: 0.5;
+    }
+    100% {
+        visibility: hidden;
+        opacity: 0.5;
+    }
+}

package/src/packages/tip/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div v-if="show">
         <div
             v-if="!statusTips"
             class="top-tipss"

package/src/packages/viewAttchList/index.js

@@ -1,5 +1,5 @@
 import { defineComponent } from "vue-demi";
-// import dsBridge from "dsbridge";
+import dsBridge from "dsbridge";
 
 import PreView from "../preview/index.vue";
 import TopPopup from "../popup/index.vue";
@@ -112,20 +112,22 @@ export default defineComponent({
             }
         },
         loadFile(val) {
-            console.log("loadFile", val);
-            if (val.url) {
-                if (navigator.userAgent.match(/(iPhone|iPod|iPad);?/i)) {
-                    window.open("CnSellersApp://"); //ios app协议
-                    window.setTimeout(function () {
-                        window.location.href = val.url;
-                    }, 2000);
-                }
-                if (navigator.userAgent.match(/android/i)) {
-                    window.open("sellingworldapp://"); //android app协议
-                    window.setTimeout(function () {
-                        window.location.href = val.url; // 下载地址
-                    }, 2000);
+            // console.log("loadFile", val);
+
+            if (dsBridge.hasNativeMethod("vueUpLoadFile")) {
+                let res = dsBridge.call("vueUpLoadFile", val.url);
+            } else {
+                if (
+                    "undefined" != typeof nativeMethod &&
+                    nativeMethod?.vueUpLoadFile
+                ) {
+                    nativeMethod.vueUpLoadFile(val.url);
+                    return false;
                 }
+                const a = document.createElement("a");
+                a.download = val.url?.match(/([^\/]+)$/g)[0];
+                a.href = val.url;
+                a.click();
             }
         },
     },

package/vite.config.ts

@@ -1,78 +1,107 @@
-import { defineConfig } from 'vite'
-import { createVuePlugin } from 'vite-plugin-vue2'
-import * as compiler from '@vue/compiler-sfc'
-import vue3 from '@vitejs/plugin-vue'
-import path from 'path'
-import { getLibDir } from './build/scripts/utils.mjs'
-import { isVue2, version } from 'vue-demi'
-import { baseConfig } from './src/assets/js/utils.js'
-import copy from 'rollup-plugin-copy'
-import relaxedUnit from 'postcss-relaxed-unit'
-console.log({ version })
+import { defineConfig } from "vite";
+import { createVuePlugin } from "vite-plugin-vue2";
+import * as compiler from "@vue/compiler-sfc";
+import vue3 from "@vitejs/plugin-vue";
+import path from "path";
+import { getLibDir } from "./build/scripts/utils.mjs";
+import { isVue2, version } from "vue-demi";
+import { baseConfig } from "./src/assets/js/utils.js";
+import copy from "rollup-plugin-copy";
+import relaxedUnit from "postcss-relaxed-unit";
+console.log("version", { version });
 const resolve = (str) => {
-  return path.resolve(__dirname, str)
-}
-let isVueCode = 1
-if (version.startsWith('2.7.')) isVueCode = 2
-else if (version.startsWith('2.')) isVueCode = 1
-else isVueCode = 3
+    return path.resolve(__dirname, str);
+};
+let isVueCode = 1;
+if (version.startsWith("2.7.")) isVueCode = 2;
+else if (version.startsWith("2.")) isVueCode = 1;
+else isVueCode = 3;
 
 // https://vitejs.dev/config/
 export default defineConfig({
-  resolve: {
-    alias: {
-      '@': resolve('src'),
-      vue: isVueCode === 1 ? path.resolve('./node_modules/vue2')
-        : isVueCode === 2 ? path.resolve('./node_modules/vue2.7')
-          : path.resolve('./node_modules/vue3'),
-      '@vue/composition-api': resolve('./node_modules/@vue/composition-api')
-    }
-  },
-  build: {
-    lib: {
-      entry: resolve('./src/packages/index.js'),
-      name: 'ui-process-h5',
-      fileName: 'ui-process-h5'
+    resolve: {
+        alias: {
+            "@": resolve("src"),
+            vue:
+                isVueCode === 1
+                    ? path.resolve("./node_modules/vue2")
+                    : isVueCode === 2
+                    ? path.resolve("./node_modules/vue2.7")
+                    : path.resolve("./node_modules/vue3"),
+            "@vue/composition-api": resolve(
+                "./node_modules/@vue/composition-api"
+            ),
+            "checked-pick-app":
+                isVueCode === 1
+                    ? path.resolve(
+                          "./node_modules/checked-pick-app/v2/checked-pick-app.umd.cjs"
+                      )
+                    : isVueCode === 2
+                    ? path.resolve(
+                          "./node_modules/checked-pick-app/v2.7/checked-pick-app.umd.cjs"
+                      )
+                    : path.resolve(
+                          "./node_modules/checked-pick-app/v3/checked-pick-app.umd.cjs"
+                      ),
+            "checked-pick-app-style":
+                isVueCode === 1
+                    ? path.resolve(
+                          "./node_modules/checked-pick-app/v2/style.css"
+                      )
+                    : isVueCode === 2
+                    ? path.resolve(
+                          "./node_modules/checked-pick-app/v2.7/style.css"
+                      )
+                    : path.resolve(
+                          "./node_modules/checked-pick-app/v3/style.css"
+                      ),
+            "dsbridge":path.resolve("./node_modules/dsbridge"),
+        },
     },
-    cssTarget: 'chrome61',
-    rollupOptions: {
-      // external: ['vue-demi', 'vue'],
-      external: ['vue'],
-      output: {
-        dir: getLibDir(version),
-        globals: {
-          vue: 'Vue',
-          // 'vue-demi': 'VueDemi'
-        }
-      }
-    }
-  },
-  optimizeDeps: {
-    // exclude: ['vue-demi']
-  },
-  plugins: [
-    isVue2 ? createVuePlugin() : vue3({ compiler: compiler }),
-    copy({
-      targets: [
-        { src: './build/configure/*', dest: './ui-process-h5' },
-        { src: './build/scripts/*', dest: './ui-process-h5/scripts' },
-      ]
-    })
-  ],
-  css: {
-    postcss: {                          // 配置自定义组件插件
-      plugins: [
-        relaxedUnit({ rules: { rpx: "div(2).unit(px)" } }),
-      ]
-    }
-  },
-  server: {
-    proxy: {
-      [baseConfig.apiUrl]: {
-        target: process.env.domain || `http://59.53.91.231:2100`,
-        changeOrigin: true,
-        //rewrite: (path) => path.replace(/^\/api/, ""),
-      },
+    build: {
+        lib: {
+            entry: resolve("./src/packages/index.js"),
+            name: "ui-process-h5",
+            fileName: "ui-process-h5",
+        },
+        cssTarget: "chrome61",
+        rollupOptions: {
+            // external: ['vue-demi', 'vue'],
+            external: ["vue"],
+            output: {
+                dir: getLibDir(version),
+                globals: {
+                    vue: "Vue",
+                    // 'vue-demi': 'VueDemi'
+                },
+            },
+        },
     },
-  },
-})
+    optimizeDeps: {
+        // exclude: ['vue-demi']
+    },
+    plugins: [
+        isVue2 ? createVuePlugin() : vue3({ compiler: compiler }),
+        copy({
+            targets: [
+                { src: "./build/configure/*", dest: "./ui-process-h5" },
+                { src: "./build/scripts/*", dest: "./ui-process-h5/scripts" },
+            ],
+        }),
+    ],
+    css: {
+        postcss: {
+            // 配置自定义组件插件
+            plugins: [relaxedUnit({ rules: { rpx: "div(2).unit(px)" } })],
+        },
+    },
+    server: {
+        proxy: {
+            [baseConfig.apiUrl]: {
+                target: process.env.domain || `http://59.53.91.231:2100`,
+                changeOrigin: true,
+                //rewrite: (path) => path.replace(/^\/api/, ""),
+            },
+        },
+    },
+});