@vunk/form 1.1.16 → 1.1.18

package/components/van-cascader/index.css

@@ -2,3 +2,6 @@
 .vkf-van-cascader .el-select{
   --el-readonly-cursor: pointer;
 }
+.vkf-van-cascader-input{
+  display: none;
+}

package/components/van-cascader/index.js

@@ -1,10 +1,11 @@
 import { _VkfCascaderCtx, _VkfCascaderUse } from '@vunk/form/components/cascader';
-import { defineComponent, ref, watch, resolveComponent, openBlock, createBlock, mergeProps, withCtx, createVNode, normalizeClass } from 'vue';
+import { defineComponent, ref, watch, resolveComponent, openBlock, createBlock, mergeProps, withCtx, createVNode } from 'vue';
 import { VkfFormItem, _VkfFormItemCtx } from '@vunk/form/components/form-item';
 import { Cascader, Popup } from 'vant';
 import { ElSelect } from 'element-plus';
 import 'vant/es/cascader/style';
 import 'vant/es/popup/style';
+import { useComputedReadonly } from '@vunk/form/composables';
 
 var __defProp = Object.defineProperty;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
@@ -49,6 +50,7 @@ const _sfc_main = defineComponent({
     const fieldValue = ref("");
     const cascaderValue = ref("");
     const options = _VkfCascaderUse.useOptions(props2, emit);
+    const readonly = useComputedReadonly(props2);
     watch(() => props2.modelValue, (val) => {
       if (Array.isArray(val) && val.length) {
         fieldValue.value = val.join("/");
@@ -64,13 +66,19 @@ const _sfc_main = defineComponent({
       popupShow.value = false;
       emit("update:modelValue", selectedOptions.map((item) => item.value));
     };
+    const preInput = () => {
+      if (readonly.value)
+        return;
+      popupShow.value = true;
+    };
     return {
       formItemBindProps,
       fieldValue,
       popupShow,
       handleFinish,
       cascaderValue,
-      options
+      options,
+      preInput
     };
   }
 });
@@ -82,24 +90,21 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createBlock(_component_VkfFormItem, mergeProps({ class: "vkf-van-cascader" }, _ctx.formItemBindProps), {
     default: withCtx(() => [
       createVNode(_component_ElSelect, {
-        disabled: true,
-        class: normalizeClass({
-          "is-readonly": true
-        }),
+        "popper-class": "vkf-van-cascader-input",
         "model-value": _ctx.fieldValue,
-        onClick: _cache[0] || (_cache[0] = ($event) => _ctx.popupShow = true)
-      }, null, 8, ["model-value"]),
+        onClick: _ctx.preInput
+      }, null, 8, ["model-value", "onClick"]),
       createVNode(_component_Popup, {
         show: _ctx.popupShow,
-        "onUpdate:show": _cache[3] || (_cache[3] = ($event) => _ctx.popupShow = $event),
+        "onUpdate:show": _cache[2] || (_cache[2] = ($event) => _ctx.popupShow = $event),
         round: "",
         position: "bottom"
       }, {
         default: withCtx(() => [
           createVNode(_component_Cascader, {
             modelValue: _ctx.cascaderValue,
-            "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => _ctx.cascaderValue = $event),
-            onClose: _cache[2] || (_cache[2] = ($event) => _ctx.popupShow = false),
+            "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.cascaderValue = $event),
+            onClose: _cache[1] || (_cache[1] = ($event) => _ctx.popupShow = false),
             options: _ctx.options,
             "field-names": {
               text: "label",

package/components/van-cascader/src/index.vue.d.ts

@@ -131,6 +131,7 @@ declare const _default: import("vue").DefineComponent<{
     }) => void;
     cascaderValue: import("vue").Ref<string>;
     options: import("vue").ComputedRef<import("element-plus").CascaderOption[] | undefined>;
+    preInput: () => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     "update:modelValue": (val: import("element-plus").CascaderValue) => boolean;
     change: (val: import("element-plus").CascaderValue) => boolean;

package/index.css

@@ -336,3 +336,6 @@
 .vkf-van-cascader .el-select{
   --el-readonly-cursor: pointer;
 }
+.vkf-van-cascader-input{
+  display: none;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vunk/form",
-  "version": "1.1.16",
+  "version": "1.1.18",
   "description": "",
   "main": "index.esm.js",
   "scripts": {

package/shared/form/index.d.ts

@@ -1,6 +1,9 @@
 /**
  * 表单验证失败, 处理方式
  * 消息提示
- * @param err
+ * @param err Record<string, {message: string}[]>
  */
-export declare const validateCatch: (err: any) => void;
+export declare const validateCatch: (err: any, init?: {
+    prefix?: string;
+    suffix?: string;
+}) => void;

package/shared/form/index.js

@@ -1,12 +1,14 @@
 import { ElMessage } from 'element-plus';
 
-const validateCatch = (err) => {
+const validateCatch = (err, init = {}) => {
   let msg = "";
+  msg += init.prefix || "";
   for (const key in err) {
     err[key].forEach((v) => {
       msg += v.message + ";";
     });
   }
+  msg += init.suffix || "";
   ElMessage({
     type: "warning",
     message: msg