widget.qw 1.0.51 → 1.0.53

package/build/style.css

@@ -1,36 +1,36 @@
-@charset "UTF-8";.widget[data-v-3cac72de] {
+@charset "UTF-8";.widget[data-v-aec89184] {
   text-align: center;
   padding: 15px 15px;
 }
-.memo[data-v-3cac72de] {
+.memo[data-v-aec89184] {
   margin-bottom: 15px;
 }
-.refuse-btn[data-v-3cac72de] {
+.refuse-btn[data-v-aec89184] {
   width: 120px;
   margin-right: 15px;
 }
-.pass-btn[data-v-3cac72de] {
+.pass-btn[data-v-aec89184] {
   width: 120px;
 }
-.apply-btn[data-v-3cac72de] {
+.apply-btn[data-v-aec89184] {
   width: 60vw;
 }
-.task-list[data-v-3cac72de] {
+.task-list[data-v-aec89184] {
   margin-top: 15px;
 }
-.task-title[data-v-3cac72de] {
+.task-title[data-v-aec89184] {
   font-size: 14px;
   font-weight: bold;
   color: #333;
   text-align: left;
 }
-.task-user[data-v-3cac72de] {
+.task-user[data-v-aec89184] {
   font-size: 13px;
   color: #666;
   text-align: left;
   margin-top: 5px;
 }
-.audit-title[data-v-3cac72de] {
+.audit-title[data-v-aec89184] {
   padding: 25px 15px 0 15px;
   font-size: 16px;
   font-weight: bold;

package/build/widget.qw.es.js

@@ -15766,7 +15766,7 @@ var lodash$1 = { exports: {} };
   }).call(commonjsGlobal);
 })(lodash$1, lodash$1.exports);
 var lodash = lodash$1.exports;
-var AuditBar_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => ".widget[data-v-3cac72de] {\n  text-align: center;\n  padding: 15px 15px;\n}\n.memo[data-v-3cac72de] {\n  margin-bottom: 15px;\n}\n.refuse-btn[data-v-3cac72de] {\n  width: 120px;\n  margin-right: 15px;\n}\n.pass-btn[data-v-3cac72de] {\n  width: 120px;\n}\n.apply-btn[data-v-3cac72de] {\n  width: 60vw;\n}\n.task-list[data-v-3cac72de] {\n  margin-top: 15px;\n}\n.task-title[data-v-3cac72de] {\n  font-size: 14px;\n  font-weight: bold;\n  color: #333;\n  text-align: left;\n}\n.task-user[data-v-3cac72de] {\n  font-size: 13px;\n  color: #666;\n  text-align: left;\n  margin-top: 5px;\n}\n.audit-title[data-v-3cac72de] {\n  padding: 25px 15px 0 15px;\n  font-size: 16px;\n  font-weight: bold;\n  color: #666;\n  text-align: left;\n}")();
+var AuditBar_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => ".widget[data-v-aec89184] {\n  text-align: center;\n  padding: 15px 15px;\n}\n.memo[data-v-aec89184] {\n  margin-bottom: 15px;\n}\n.refuse-btn[data-v-aec89184] {\n  width: 120px;\n  margin-right: 15px;\n}\n.pass-btn[data-v-aec89184] {\n  width: 120px;\n}\n.apply-btn[data-v-aec89184] {\n  width: 60vw;\n}\n.task-list[data-v-aec89184] {\n  margin-top: 15px;\n}\n.task-title[data-v-aec89184] {\n  font-size: 14px;\n  font-weight: bold;\n  color: #333;\n  text-align: left;\n}\n.task-user[data-v-aec89184] {\n  font-size: 13px;\n  color: #666;\n  text-align: left;\n  margin-top: 5px;\n}\n.audit-title[data-v-aec89184] {\n  padding: 25px 15px 0 15px;\n  font-size: 16px;\n  font-weight: bold;\n  color: #666;\n  text-align: left;\n}")();
 var AuditBar_vue_vue_type_style_index_1_lang = /* @__PURE__ */ (() => "\n:root:root {\r\n  --van-popover-action-width: 70vw;\n}\r\n")();
 var _export_sfc = (sfc, props) => {
   const target = sfc.__vccOpts || sfc;
@@ -15876,6 +15876,8 @@ const _sfc_main$v = {
       const res = yield util.process_detail(params);
       if (res.code != 200)
         return;
+      if (params.processId != props.processId && props.processId && !params.processId)
+        return;
       data2.process = res.data;
     });
     const queryStepAuth = () => __async(this, null, function* () {
@@ -15890,15 +15892,16 @@ const _sfc_main$v = {
       const res = yield util.process_step_auth(params);
       if (res.code != 200)
         return;
-      if (params.processId != props.processId && !params.processId && props.processId)
+      if (params.processId != props.processId && props.processId && !params.processId)
         return;
-      if (params.mouldId != props.mouldId && !params.mouldId && props.mouldId)
+      if (params.mouldId != props.mouldId && props.mouldId && !params.mouldId)
         return;
-      if (params.userId != props.userId && !params.userId && props.userId)
+      if (params.userId != props.userId && props.user && !params.userId)
         return;
       if (params.form != props.form && !params.form && props.form)
         return;
       data2.stepAuth = res.data;
+      updateAuth();
     });
     const updateAuth = () => {
       let res = {};
@@ -15945,9 +15948,9 @@ const _sfc_main$v = {
       let res = yield util.process_can_apply(params);
       if (res.code != 200)
         return;
-      if (params.mouldId != props.mouldId && !params.mouldId && props.mouldId)
+      if (params.mouldId != props.mouldId)
         return;
-      if (params.userId != props.userId && !params.userId && props.userId)
+      if (params.userId != props.userId)
         return;
       if (params.form != props.form && !params.form && props.form)
         return;
@@ -16016,39 +16019,34 @@ const _sfc_main$v = {
         return "\u5BA1\u6279\u6D41\u7A0B:";
       }
     });
+    const refresh = () => __async(this, null, function* () {
+      yield queryDetail();
+      queryStepAuth();
+      updateCanApply();
+    });
     watch(() => props.userId, () => __async(this, null, function* () {
       if (!props.userId)
         return;
-      yield queryDetail();
-      yield queryStepAuth();
-      yield updateCanApply();
+      yield refresh();
     }), {
       immediate: true
     });
     watch(() => props.processId, () => __async(this, null, function* () {
-      yield queryDetail();
-      yield queryStepAuth();
-      yield updateCanApply();
+      yield refresh();
     }), {
       immediate: true
     });
     watch(() => props.mouldId, () => __async(this, null, function* () {
       if (!props.processId && !props.mouldId)
         return;
-      yield queryDetail();
-      yield queryStepAuth();
-      yield updateAuth();
-      yield updateCanApply();
+      yield refresh();
     }), {
       immediate: true
     });
     watch(() => JSON.stringify(props.form), () => __async(this, null, function* () {
       if (!data2.stepAuth)
         return;
-      yield queryDetail();
-      yield queryStepAuth();
-      yield updateAuth();
-      yield updateCanApply();
+      yield refresh();
     }), {
       immediate: true
     });
@@ -16127,7 +16125,7 @@ const _sfc_main$v = {
     };
   }
 };
-var AuditBar = /* @__PURE__ */ _export_sfc(_sfc_main$v, [["__scopeId", "data-v-3cac72de"]]);
+var AuditBar = /* @__PURE__ */ _export_sfc(_sfc_main$v, [["__scopeId", "data-v-aec89184"]]);
 const isClient = typeof window !== "undefined" && typeof document !== "undefined";
 typeof WorkerGlobalScope !== "undefined" && globalThis instanceof WorkerGlobalScope;
 const isDef = (val) => typeof val !== "undefined";

package/build/widget.qw.umd.js

@@ -15769,7 +15769,7 @@ var __async = (__this, __arguments, generator) => {
     }).call(commonjsGlobal);
   })(lodash$1, lodash$1.exports);
   var lodash = lodash$1.exports;
-  var AuditBar_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => ".widget[data-v-3cac72de] {\n  text-align: center;\n  padding: 15px 15px;\n}\n.memo[data-v-3cac72de] {\n  margin-bottom: 15px;\n}\n.refuse-btn[data-v-3cac72de] {\n  width: 120px;\n  margin-right: 15px;\n}\n.pass-btn[data-v-3cac72de] {\n  width: 120px;\n}\n.apply-btn[data-v-3cac72de] {\n  width: 60vw;\n}\n.task-list[data-v-3cac72de] {\n  margin-top: 15px;\n}\n.task-title[data-v-3cac72de] {\n  font-size: 14px;\n  font-weight: bold;\n  color: #333;\n  text-align: left;\n}\n.task-user[data-v-3cac72de] {\n  font-size: 13px;\n  color: #666;\n  text-align: left;\n  margin-top: 5px;\n}\n.audit-title[data-v-3cac72de] {\n  padding: 25px 15px 0 15px;\n  font-size: 16px;\n  font-weight: bold;\n  color: #666;\n  text-align: left;\n}")();
+  var AuditBar_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => ".widget[data-v-aec89184] {\n  text-align: center;\n  padding: 15px 15px;\n}\n.memo[data-v-aec89184] {\n  margin-bottom: 15px;\n}\n.refuse-btn[data-v-aec89184] {\n  width: 120px;\n  margin-right: 15px;\n}\n.pass-btn[data-v-aec89184] {\n  width: 120px;\n}\n.apply-btn[data-v-aec89184] {\n  width: 60vw;\n}\n.task-list[data-v-aec89184] {\n  margin-top: 15px;\n}\n.task-title[data-v-aec89184] {\n  font-size: 14px;\n  font-weight: bold;\n  color: #333;\n  text-align: left;\n}\n.task-user[data-v-aec89184] {\n  font-size: 13px;\n  color: #666;\n  text-align: left;\n  margin-top: 5px;\n}\n.audit-title[data-v-aec89184] {\n  padding: 25px 15px 0 15px;\n  font-size: 16px;\n  font-weight: bold;\n  color: #666;\n  text-align: left;\n}")();
   var AuditBar_vue_vue_type_style_index_1_lang = /* @__PURE__ */ (() => "\n:root:root {\r\n  --van-popover-action-width: 70vw;\n}\r\n")();
   var _export_sfc = (sfc, props) => {
     const target = sfc.__vccOpts || sfc;
@@ -15879,6 +15879,8 @@ var __async = (__this, __arguments, generator) => {
         const res = yield util.process_detail(params);
         if (res.code != 200)
           return;
+        if (params.processId != props.processId && props.processId && !params.processId)
+          return;
         data2.process = res.data;
       });
       const queryStepAuth = () => __async(this, null, function* () {
@@ -15893,15 +15895,16 @@ var __async = (__this, __arguments, generator) => {
         const res = yield util.process_step_auth(params);
         if (res.code != 200)
           return;
-        if (params.processId != props.processId && !params.processId && props.processId)
+        if (params.processId != props.processId && props.processId && !params.processId)
           return;
-        if (params.mouldId != props.mouldId && !params.mouldId && props.mouldId)
+        if (params.mouldId != props.mouldId && props.mouldId && !params.mouldId)
           return;
-        if (params.userId != props.userId && !params.userId && props.userId)
+        if (params.userId != props.userId && props.user && !params.userId)
           return;
         if (params.form != props.form && !params.form && props.form)
           return;
         data2.stepAuth = res.data;
+        updateAuth();
       });
       const updateAuth = () => {
         let res = {};
@@ -15948,9 +15951,9 @@ var __async = (__this, __arguments, generator) => {
         let res = yield util.process_can_apply(params);
         if (res.code != 200)
           return;
-        if (params.mouldId != props.mouldId && !params.mouldId && props.mouldId)
+        if (params.mouldId != props.mouldId)
           return;
-        if (params.userId != props.userId && !params.userId && props.userId)
+        if (params.userId != props.userId)
           return;
         if (params.form != props.form && !params.form && props.form)
           return;
@@ -16019,39 +16022,34 @@ var __async = (__this, __arguments, generator) => {
           return "\u5BA1\u6279\u6D41\u7A0B:";
         }
       });
+      const refresh = () => __async(this, null, function* () {
+        yield queryDetail();
+        queryStepAuth();
+        updateCanApply();
+      });
       vue.watch(() => props.userId, () => __async(this, null, function* () {
         if (!props.userId)
           return;
-        yield queryDetail();
-        yield queryStepAuth();
-        yield updateCanApply();
+        yield refresh();
       }), {
         immediate: true
       });
       vue.watch(() => props.processId, () => __async(this, null, function* () {
-        yield queryDetail();
-        yield queryStepAuth();
-        yield updateCanApply();
+        yield refresh();
       }), {
         immediate: true
       });
       vue.watch(() => props.mouldId, () => __async(this, null, function* () {
         if (!props.processId && !props.mouldId)
           return;
-        yield queryDetail();
-        yield queryStepAuth();
-        yield updateAuth();
-        yield updateCanApply();
+        yield refresh();
       }), {
         immediate: true
       });
       vue.watch(() => JSON.stringify(props.form), () => __async(this, null, function* () {
         if (!data2.stepAuth)
           return;
-        yield queryDetail();
-        yield queryStepAuth();
-        yield updateAuth();
-        yield updateCanApply();
+        yield refresh();
       }), {
         immediate: true
       });
@@ -16130,7 +16128,7 @@ var __async = (__this, __arguments, generator) => {
       };
     }
   };
-  var AuditBar = /* @__PURE__ */ _export_sfc(_sfc_main$v, [["__scopeId", "data-v-3cac72de"]]);
+  var AuditBar = /* @__PURE__ */ _export_sfc(_sfc_main$v, [["__scopeId", "data-v-aec89184"]]);
   const isClient = typeof window !== "undefined" && typeof document !== "undefined";
   typeof WorkerGlobalScope !== "undefined" && globalThis instanceof WorkerGlobalScope;
   const isDef = (val) => typeof val !== "undefined";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "widget.qw",
   "private": false,
-  "version": "1.0.51",
+  "version": "1.0.53",
   "description": "marqstree Vue3组件库",
   "main": "build/widget.qw.es.js",
   "keywords": [

package/src/components/AuditBar.vue

@@ -35,24 +35,24 @@ import lodash from 'lodash'
 
 const props = defineProps({
   processId: {
-    type:Number,
-    default:0
+    type: Number,
+    default: 0
   },
   mouldId: {
-    type:Number,
-    default:0
+    type: Number,
+    default: 0
   },
   userId: {
-    type:String,
-    default:''
+    type: String,
+    default: ''
   },
   form: {
-    type:Object,
-    default:null
+    type: Object,
+    default: null
   },
   process_detail: {
-    type:Function,
-    default:null
+    type: Function,
+    default: null
   }
 })
 const emit = defineEmits(['pass', 'refuse', 'apply', 'auth'])
@@ -122,12 +122,18 @@ const queryDetail = async () => {
     id: props.processId
   }
 
-  if(!util.process_detail)
+  if (!util.process_detail)
     return
 
   const res = await util.process_detail(params)
-  if(res.code!=200)
+  if (res.code != 200)
     return
+
+  //防止网络请求先发后返回
+  //参数变化时,扔掉返回
+  if (params.processId != props.processId && props.processId && !params.processId)
+    return
+
   data.process = res.data
 }
 
@@ -142,22 +148,26 @@ const queryStepAuth = async () => {
     form: props.form
   }
   const res = await util.process_step_auth(params)
-  if(res.code!=200)
+  if (res.code != 200)
     return
 
-  if(params.processId!=props.processId && !params.processId && props.processId)
+  //防止网络请求先发后返回
+  //参数变化时,扔掉返回
+  if (params.processId != props.processId && props.processId && !params.processId)
     return
 
-  if(params.mouldId!=props.mouldId && !params.mouldId && props.mouldId)
+  if (params.mouldId != props.mouldId && props.mouldId && !params.mouldId)
     return
 
-  if(params.userId!=props.userId && !params.userId && props.userId)
+  if (params.userId != props.userId && props.user && !params.userId)
     return
 
-  if(params.form!=props.form && !params.form && props.form)
+  if (params.form != props.form && !params.form && props.form)
     return
 
   data.stepAuth = res.data
+
+  updateAuth()
 }
 
 const updateAuth = () => {
@@ -204,7 +214,7 @@ const getAuth = (fieldAuth) => {
 }
 
 const updateCanApply = async () => {
-  if (props.processId){
+  if (props.processId) {
     data.canApply = false
     return
   }
@@ -215,16 +225,18 @@ const updateCanApply = async () => {
     form: props.form
   }
   let res = await util.process_can_apply(params)
-  if(res.code!=200)
+  if (res.code != 200)
     return
 
-  if(params.mouldId!=props.mouldId && !params.mouldId && props.mouldId)
+  //防止网络请求先发后返回
+  //参数变化时,扔掉返回
+  if (params.mouldId != props.mouldId)
     return
 
-  if(params.userId!=props.userId && !params.userId && props.userId)
+  if (params.userId != props.userId)
     return
 
-  if(params.form!=props.form && !params.form && props.form)
+  if (params.form != props.form && !params.form && props.form)
     return
 
   data.canApply = res.data
@@ -298,39 +310,34 @@ const formatProcessTitle = computed(() => {
   }
 })
 
-watch(() => props.userId, async() => {
+const refresh = async() => {
+  await queryDetail()
+  queryStepAuth()
+  updateCanApply()
+}
+
+watch(() => props.userId, async () => {
   if (!props.userId)
     return
 
-  await queryDetail()
-  await queryStepAuth()
-  await updateCanApply()
+  await refresh()
 }, { immediate: true })
 
-watch(() => props.processId, async() => {
-  await queryDetail()
-  await queryStepAuth()
-  await updateCanApply()
+watch(() => props.processId, async () => {
+  await refresh()
 }, { immediate: true })
 
 watch(() => props.mouldId, async () => {
   if (!props.processId && !props.mouldId)
     return
-
-  await queryDetail()
-  await queryStepAuth()
-  await updateAuth()
-  await updateCanApply()
+  await refresh()
 }, { immediate: true })
 
 watch(() => JSON.stringify(props.form), async () => {
   if (!data.stepAuth)
     return
 
-  await queryDetail()
-  await queryStepAuth()
-  await updateAuth()
-  await updateCanApply()
+  await refresh()
 }, { immediate: true })
 </script>