widget.qw 1.0.29 → 1.0.31

package/build/style.css

@@ -1,36 +1,36 @@
-@charset "UTF-8";.widget[data-v-5ad893b4] {
+@charset "UTF-8";.widget[data-v-78443471] {
   text-align: center;
   padding: 15px 15px;
 }
-.memo[data-v-5ad893b4] {
+.memo[data-v-78443471] {
   margin-bottom: 15px;
 }
-.refuse-btn[data-v-5ad893b4] {
+.refuse-btn[data-v-78443471] {
   width: 120px;
   margin-right: 15px;
 }
-.pass-btn[data-v-5ad893b4] {
+.pass-btn[data-v-78443471] {
   width: 120px;
 }
-.apply-btn[data-v-5ad893b4] {
+.apply-btn[data-v-78443471] {
   width: 60vw;
 }
-.task-list[data-v-5ad893b4] {
+.task-list[data-v-78443471] {
   margin-top: 15px;
 }
-.task-title[data-v-5ad893b4] {
+.task-title[data-v-78443471] {
   font-size: 14px;
   font-weight: bold;
   color: #333;
   text-align: left;
 }
-.task-user[data-v-5ad893b4] {
+.task-user[data-v-78443471] {
   font-size: 13px;
   color: #666;
   text-align: left;
   margin-top: 5px;
 }
-.audit-title[data-v-5ad893b4] {
+.audit-title[data-v-78443471] {
   padding: 25px 15px 0 15px;
   font-size: 16px;
   font-weight: bold;
@@ -40,10 +40,10 @@
 :root:root {
   --van-popover-action-width: 70vw;
 }
-[data-v-beab1d9e] .label {
+[data-v-ec78c334] .label {
   color: #000 !important;
 }
-[data-v-beab1d9e] .van-field__control:disabled {
+[data-v-ec78c334] .van-field__control:disabled {
   color: #000 !important;
   cursor: not-allowed;
   opacity: 1;

package/build/widget.qw.es.js

@@ -15755,7 +15755,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-5ad893b4] {\n  text-align: center;\n  padding: 15px 15px;\n}\n.memo[data-v-5ad893b4] {\n  margin-bottom: 15px;\n}\n.refuse-btn[data-v-5ad893b4] {\n  width: 120px;\n  margin-right: 15px;\n}\n.pass-btn[data-v-5ad893b4] {\n  width: 120px;\n}\n.apply-btn[data-v-5ad893b4] {\n  width: 60vw;\n}\n.task-list[data-v-5ad893b4] {\n  margin-top: 15px;\n}\n.task-title[data-v-5ad893b4] {\n  font-size: 14px;\n  font-weight: bold;\n  color: #333;\n  text-align: left;\n}\n.task-user[data-v-5ad893b4] {\n  font-size: 13px;\n  color: #666;\n  text-align: left;\n  margin-top: 5px;\n}\n.audit-title[data-v-5ad893b4] {\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-78443471] {\n  text-align: center;\n  padding: 15px 15px;\n}\n.memo[data-v-78443471] {\n  margin-bottom: 15px;\n}\n.refuse-btn[data-v-78443471] {\n  width: 120px;\n  margin-right: 15px;\n}\n.pass-btn[data-v-78443471] {\n  width: 120px;\n}\n.apply-btn[data-v-78443471] {\n  width: 60vw;\n}\n.task-list[data-v-78443471] {\n  margin-top: 15px;\n}\n.task-title[data-v-78443471] {\n  font-size: 14px;\n  font-weight: bold;\n  color: #333;\n  text-align: left;\n}\n.task-user[data-v-78443471] {\n  font-size: 13px;\n  color: #666;\n  text-align: left;\n  margin-top: 5px;\n}\n.audit-title[data-v-78443471] {\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;
@@ -15966,41 +15966,43 @@ const _sfc_main$u = {
         return "\u5BA1\u6279\u6D41\u7A0B:";
       }
     });
-    watch(() => props.userId, () => {
+    watch(() => props.userId, () => __async(this, null, function* () {
       if (!props.userId)
         return;
-      queryDetail();
-      queryStepAuth();
-      updateCanApply();
-    }, {
+      yield queryDetail();
+      yield queryStepAuth();
+      yield updateCanApply();
+    }), {
       immediate: true
     });
-    watch(() => props.processId, () => {
-      queryDetail();
-      queryStepAuth();
-      updateCanApply();
-    }, {
+    watch(() => props.processId, () => __async(this, null, function* () {
+      yield queryDetail();
+      yield queryStepAuth();
+      yield updateCanApply();
+    }), {
       immediate: true
     });
     watch(() => props.mouldId, () => __async(this, null, function* () {
       if (!props.processId && !props.mouldId)
         return;
-      queryDetail();
+      yield queryDetail();
       yield queryStepAuth();
-      updateAuth();
-      updateCanApply();
+      yield updateAuth();
+      yield updateCanApply();
     }), {
       immediate: true
     });
-    watch(() => JSON.stringify(props.form), () => __async(this, null, function* () {
+    watch(() => props.form, () => __async(this, null, function* () {
       if (!data2.stepAuth)
         return;
-      queryDetail();
+      yield queryDetail();
       yield queryStepAuth();
-      updateAuth();
-      updateCanApply();
+      yield updateAuth();
+      yield updateCanApply();
     }), {
       immediate: true
+    }, {
+      deep: true
     });
     return (_ctx, _cache) => {
       const _component_van_field = resolveComponent("van-field");
@@ -16077,7 +16079,7 @@ const _sfc_main$u = {
     };
   }
 };
-var AuditBar = /* @__PURE__ */ _export_sfc(_sfc_main$u, [["__scopeId", "data-v-5ad893b4"]]);
+var AuditBar = /* @__PURE__ */ _export_sfc(_sfc_main$u, [["__scopeId", "data-v-78443471"]]);
 const isClient = typeof window !== "undefined" && typeof document !== "undefined";
 typeof WorkerGlobalScope !== "undefined" && globalThis instanceof WorkerGlobalScope;
 const isDef = (val) => typeof val !== "undefined";
@@ -16144,14 +16146,18 @@ function useVModel(props, key, emit, options = {}) {
     });
   }
 }
-var Input_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => "[data-v-beab1d9e] .label {\n  color: #000 !important;\n}\n[data-v-beab1d9e] .van-field__control:disabled {\n  color: #000 !important;\n  cursor: not-allowed;\n  opacity: 1;\n  -webkit-text-fill-color: #000;\n}")();
+var Input_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => "[data-v-ec78c334] .label {\n  color: #000 !important;\n}\n[data-v-ec78c334] .van-field__control:disabled {\n  color: #000 !important;\n  cursor: not-allowed;\n  opacity: 1;\n  -webkit-text-fill-color: #000;\n}")();
 const _sfc_main$t = {
   __name: "Input",
   props: {
     modelValue: {
-      type: String,
+      type: [String, Number],
       default: null
     },
+    modelModifiers: {
+      type: Object,
+      default: () => ({})
+    },
     label: {
       type: String,
       default: ""
@@ -16236,7 +16242,7 @@ const _sfc_main$t = {
     };
   }
 };
-var Input = /* @__PURE__ */ _export_sfc(_sfc_main$t, [["__scopeId", "data-v-beab1d9e"]]);
+var Input = /* @__PURE__ */ _export_sfc(_sfc_main$t, [["__scopeId", "data-v-ec78c334"]]);
 var SinglePicker_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => "[data-v-24e62c3a] .label {\n  color: #000 !important;\n}\n[data-v-24e62c3a] .van-field__control:disabled {\n  color: #000 !important;\n  cursor: not-allowed;\n  opacity: 1;\n  -webkit-text-fill-color: #000;\n}")();
 const _sfc_main$s = {
   __name: "SinglePicker",

package/build/widget.qw.umd.js

@@ -15758,7 +15758,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-5ad893b4] {\n  text-align: center;\n  padding: 15px 15px;\n}\n.memo[data-v-5ad893b4] {\n  margin-bottom: 15px;\n}\n.refuse-btn[data-v-5ad893b4] {\n  width: 120px;\n  margin-right: 15px;\n}\n.pass-btn[data-v-5ad893b4] {\n  width: 120px;\n}\n.apply-btn[data-v-5ad893b4] {\n  width: 60vw;\n}\n.task-list[data-v-5ad893b4] {\n  margin-top: 15px;\n}\n.task-title[data-v-5ad893b4] {\n  font-size: 14px;\n  font-weight: bold;\n  color: #333;\n  text-align: left;\n}\n.task-user[data-v-5ad893b4] {\n  font-size: 13px;\n  color: #666;\n  text-align: left;\n  margin-top: 5px;\n}\n.audit-title[data-v-5ad893b4] {\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-78443471] {\n  text-align: center;\n  padding: 15px 15px;\n}\n.memo[data-v-78443471] {\n  margin-bottom: 15px;\n}\n.refuse-btn[data-v-78443471] {\n  width: 120px;\n  margin-right: 15px;\n}\n.pass-btn[data-v-78443471] {\n  width: 120px;\n}\n.apply-btn[data-v-78443471] {\n  width: 60vw;\n}\n.task-list[data-v-78443471] {\n  margin-top: 15px;\n}\n.task-title[data-v-78443471] {\n  font-size: 14px;\n  font-weight: bold;\n  color: #333;\n  text-align: left;\n}\n.task-user[data-v-78443471] {\n  font-size: 13px;\n  color: #666;\n  text-align: left;\n  margin-top: 5px;\n}\n.audit-title[data-v-78443471] {\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;
@@ -15969,41 +15969,43 @@ var __async = (__this, __arguments, generator) => {
           return "\u5BA1\u6279\u6D41\u7A0B:";
         }
       });
-      vue.watch(() => props.userId, () => {
+      vue.watch(() => props.userId, () => __async(this, null, function* () {
         if (!props.userId)
           return;
-        queryDetail();
-        queryStepAuth();
-        updateCanApply();
-      }, {
+        yield queryDetail();
+        yield queryStepAuth();
+        yield updateCanApply();
+      }), {
         immediate: true
       });
-      vue.watch(() => props.processId, () => {
-        queryDetail();
-        queryStepAuth();
-        updateCanApply();
-      }, {
+      vue.watch(() => props.processId, () => __async(this, null, function* () {
+        yield queryDetail();
+        yield queryStepAuth();
+        yield updateCanApply();
+      }), {
         immediate: true
       });
       vue.watch(() => props.mouldId, () => __async(this, null, function* () {
         if (!props.processId && !props.mouldId)
           return;
-        queryDetail();
+        yield queryDetail();
         yield queryStepAuth();
-        updateAuth();
-        updateCanApply();
+        yield updateAuth();
+        yield updateCanApply();
       }), {
         immediate: true
       });
-      vue.watch(() => JSON.stringify(props.form), () => __async(this, null, function* () {
+      vue.watch(() => props.form, () => __async(this, null, function* () {
         if (!data2.stepAuth)
           return;
-        queryDetail();
+        yield queryDetail();
         yield queryStepAuth();
-        updateAuth();
-        updateCanApply();
+        yield updateAuth();
+        yield updateCanApply();
       }), {
         immediate: true
+      }, {
+        deep: true
       });
       return (_ctx, _cache) => {
         const _component_van_field = vue.resolveComponent("van-field");
@@ -16080,7 +16082,7 @@ var __async = (__this, __arguments, generator) => {
       };
     }
   };
-  var AuditBar = /* @__PURE__ */ _export_sfc(_sfc_main$u, [["__scopeId", "data-v-5ad893b4"]]);
+  var AuditBar = /* @__PURE__ */ _export_sfc(_sfc_main$u, [["__scopeId", "data-v-78443471"]]);
   const isClient = typeof window !== "undefined" && typeof document !== "undefined";
   typeof WorkerGlobalScope !== "undefined" && globalThis instanceof WorkerGlobalScope;
   const isDef = (val) => typeof val !== "undefined";
@@ -16147,14 +16149,18 @@ var __async = (__this, __arguments, generator) => {
       });
     }
   }
-  var Input_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => "[data-v-beab1d9e] .label {\n  color: #000 !important;\n}\n[data-v-beab1d9e] .van-field__control:disabled {\n  color: #000 !important;\n  cursor: not-allowed;\n  opacity: 1;\n  -webkit-text-fill-color: #000;\n}")();
+  var Input_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => "[data-v-ec78c334] .label {\n  color: #000 !important;\n}\n[data-v-ec78c334] .van-field__control:disabled {\n  color: #000 !important;\n  cursor: not-allowed;\n  opacity: 1;\n  -webkit-text-fill-color: #000;\n}")();
   const _sfc_main$t = {
     __name: "Input",
     props: {
       modelValue: {
-        type: String,
+        type: [String, Number],
         default: null
       },
+      modelModifiers: {
+        type: Object,
+        default: () => ({})
+      },
       label: {
         type: String,
         default: ""
@@ -16239,7 +16245,7 @@ var __async = (__this, __arguments, generator) => {
       };
     }
   };
-  var Input = /* @__PURE__ */ _export_sfc(_sfc_main$t, [["__scopeId", "data-v-beab1d9e"]]);
+  var Input = /* @__PURE__ */ _export_sfc(_sfc_main$t, [["__scopeId", "data-v-ec78c334"]]);
   var SinglePicker_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => "[data-v-24e62c3a] .label {\n  color: #000 !important;\n}\n[data-v-24e62c3a] .van-field__control:disabled {\n  color: #000 !important;\n  cursor: not-allowed;\n  opacity: 1;\n  -webkit-text-fill-color: #000;\n}")();
   const _sfc_main$s = {
     __name: "SinglePicker",

package/package.json

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

package/src/components/AuditBar.vue

@@ -11,7 +11,8 @@
 
     <van-button v-if="canPass" class="pass-btn" type="primary" native-type="submit" @click="onPass">同意</van-button>
 
-    <van-button class="apply-btn" v-if="data.canApply" type="primary" native-type="submit" @click="onApply">申请</van-button>
+    <van-button class="apply-btn" v-if="data.canApply" type="primary" native-type="submit"
+      @click="onApply">申请</van-button>
 
     <div class="audit-title" v-if="data.process && data.process.id">{{ formatProcessTitle }}</div>
 
@@ -37,7 +38,7 @@ const props = defineProps({
   mouldId: Number,
   userId: String,
   form: Object,
-  process_detail:Function,
+  process_detail: Function,
 })
 const emit = defineEmits(['pass', 'refuse', 'apply', 'auth'])
 const data = reactive({
@@ -110,7 +111,7 @@ const queryDetail = async () => {
 }
 
 const queryStepAuth = async () => {
-  if(!props.processId && !props.mouldId)
+  if (!props.processId && !props.mouldId)
     return
 
   const params = {
@@ -215,21 +216,21 @@ const formatTitle = (task) => {
 
 const formatExecutor = (executor, task) => {
   let action = ''
-  let username =''
+  let username = ''
   let memo = executor.memo
   if (executor.state == 'pass') {
     if (task.category == 'notify')
-        action = `已抄送 ${executor.updatedAt}`
+      action = `已抄送 ${executor.updatedAt}`
     else
       action = `已审核 ${executor.updatedAt}`
-  }else if(data.process.state == 'finish_refuse'){
+  } else if (data.process.state == 'finish_refuse') {
     action = `已撤销 ${executor.updatedAt}`
   } else if (executor.state == 'refuse') {
     action = `已驳回 ${executor.updatedAt}`
   }
 
-  if(executor.user.name!=executor.submiterName && executor.submiterName)
-    username =`${executor.user.name}/${executor.submiterName}`
+  if (executor.user.name != executor.submiterName && executor.submiterName)
+    username = `${executor.user.name}/${executor.submiterName}`
   else
     username = `${executor.user.name}`
 
@@ -248,40 +249,42 @@ const formatProcessTitle = computed(() => {
   }
 })
 
-watch(() => props.userId, () => {
+watch(() => props.userId, async() => {
   if (!props.userId)
     return
 
-  queryDetail()
-  queryStepAuth()
-  updateCanApply()
+  await queryDetail()
+  await queryStepAuth()
+  await updateCanApply()
 }, { immediate: true })
 
-watch(() => props.processId, () => {
-  queryDetail()
-  queryStepAuth()
-  updateCanApply()
+watch(() => props.processId, async() => {
+  await queryDetail()
+  await queryStepAuth()
+  await updateCanApply()
 }, { immediate: true })
 
 watch(() => props.mouldId, async () => {
   if (!props.processId && !props.mouldId)
     return
 
-  queryDetail()
+  await queryDetail()
   await queryStepAuth()
-  updateAuth()
-  updateCanApply()
+  await updateAuth()
+  await updateCanApply()
 }, { immediate: true })
 
-watch(() => JSON.stringify(props.form), async () => {
+watch(() => props.form, async () => {
   if (!data.stepAuth)
     return
 
-  queryDetail()
+  await queryDetail()
   await queryStepAuth()
-  updateAuth()
-  updateCanApply()
-}, { immediate: true })
+  await updateAuth()
+  await updateCanApply()
+}, { immediate: true }, {
+  deep: true
+})
 </script>
 
 <style lang="scss" scoped>

package/src/components/Input.vue

@@ -1,8 +1,10 @@
 <template>
-    <van-field :label="props.label" v-model.number="modelValue" v-if="!isGone && props.type==='number'" :disabled="isDisabled" :required="isRequired"
-        :placeholder="props.placeholder" :type="props.type" :rows="props.rows" :autosize="props.autosize" :rules="props.rules"/>
-    <van-field :label="props.label" v-model="modelValue" v-if="!isGone && props.type!='number'" :disabled="isDisabled" :required="isRequired"
-        :placeholder="props.placeholder" :type="props.type" :rows="props.rows" :autosize="props.autosize" :rules="props.rules"/>
+    <van-field :label="props.label" v-model.number="modelValue" v-if="!isGone && props.type === 'number'"
+        :disabled="isDisabled" :required="isRequired" :placeholder="props.placeholder" :type="props.type"
+        :rows="props.rows" :autosize="props.autosize" :rules="props.rules" />
+    <van-field :label="props.label" v-model="modelValue" v-if="!isGone && props.type != 'number'" :disabled="isDisabled"
+        :required="isRequired" :placeholder="props.placeholder" :type="props.type" :rows="props.rows"
+        :autosize="props.autosize" :rules="props.rules" />
 </template>
 
 <script setup>
@@ -12,24 +14,29 @@ import util from '../util'
 
 const props = defineProps({
     modelValue: {
-        type:String,
-        default:null
+        type: [String, Number],
+        default: null
+    },
+    // 支持v-model.number写法
+    modelModifiers: {
+        type: Object,
+        default: () => ({})
     },
     label: {
-        type:String,
+        type: String,
         default: ''
     },
     type: {
         type: String,
         default: 'text'
     },
-    rows:{
-        type:Number,
-        default:1
+    rows: {
+        type: Number,
+        default: 1
     },
-    autosize:{
-        type:Boolean,
-        default:false
+    autosize: {
+        type: Boolean,
+        default: false
     },
     placeholder: {
         type: String,
@@ -47,14 +54,14 @@ const props = defineProps({
         type: String,
         default: ''
     },
-    rules:{
+    rules: {
         type: Array,
-        default:null
+        default: null
     }
 })
 const emit = defineEmits(['update:modelValue'])
 const modelValue = useVModel(props, 'modelValue', emit)
-const {isRequired, isReadonly, isGone, isDisabled} = util.props2auth(props)
+const { isRequired, isReadonly, isGone, isDisabled } = util.props2auth(props)
 
 onMounted(() => {
 })