@vunk/form 1.1.15 → 1.1.17

package/components/upload/src/index.vue.d.ts

@@ -161,6 +161,10 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: undefined;
     };
+    labelPosition: {
+        type: import("vue").PropType<"right">;
+        default: string;
+    };
 }, {
     formItemBindProps: import("vue").ComputedRef<{
         required: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown> | undefined;
@@ -178,6 +182,7 @@ declare const _default: import("vue").DefineComponent<{
         elRef: any;
         inline: boolean;
         readonly: boolean | undefined;
+        labelPosition: "right";
     }>;
     pickObject: <T extends import("@vunk/core").NormalObject, EX extends (keyof T)[] | undefined, KI extends keyof T>(data: T, opts?: {
         excludes?: EX | undefined;
@@ -375,6 +380,10 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: undefined;
     };
+    labelPosition: {
+        type: import("vue").PropType<"right">;
+        default: string;
+    };
 }>> & {
     onRemove?: ((e: UploadFile) => any) | undefined;
     "onUpdate:fileList"?: ((...args: any[]) => any) | undefined;
@@ -388,6 +397,7 @@ declare const _default: import("vue").DefineComponent<{
     formItemSlots: import("../../form-item/src/types").FormItemSlots;
     inline: boolean;
     readonly: boolean;
+    labelPosition: "right";
     name: string;
     data: Record<string, any>;
     disabled: boolean;

package/components/upload-plus/src/ctx.d.ts

@@ -55,5 +55,9 @@ export declare const props: {
         type: BooleanConstructor;
         default: undefined;
     };
+    labelPosition: {
+        type: import("vue").PropType<"right">;
+        default: string;
+    };
 };
 export declare const emits: {};

package/components/upload-plus/src/index.vue.d.ts

@@ -53,6 +53,10 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: undefined;
     };
+    labelPosition: {
+        type: import("vue").PropType<"right">;
+        default: string;
+    };
 }, {
     formItemBindProps: import("vue").ComputedRef<{
         required: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown> | undefined;
@@ -70,6 +74,7 @@ declare const _default: import("vue").DefineComponent<{
         elRef: any;
         inline: boolean;
         readonly: boolean | undefined;
+        labelPosition: "right";
     }>;
     handleFileChange: (e: Event) => void;
     uuid: string;
@@ -148,6 +153,10 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: undefined;
     };
+    labelPosition: {
+        type: import("vue").PropType<"right">;
+        default: string;
+    };
 }>>, {
     required: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
     labelWidth: import("element-plus/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown>;
@@ -158,6 +167,7 @@ declare const _default: import("vue").DefineComponent<{
     formItemSlots: import("../../form-item/src/types").FormItemSlots;
     inline: boolean;
     readonly: boolean;
+    labelPosition: "right";
     dictId: string;
 }>;
 export default _default;

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/ctx.d.ts

@@ -48,6 +48,10 @@ export declare const props: {
         type: BooleanConstructor;
         default: boolean;
     };
+    labelPosition: {
+        type: import("vue").PropType<"right">;
+        default: string;
+    };
     size: {
         readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
         readonly required: false;

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

@@ -50,6 +50,10 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    labelPosition: {
+        type: import("vue").PropType<"right">;
+        default: string;
+    };
     size: {
         readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
         readonly required: false;
@@ -118,6 +122,7 @@ declare const _default: import("vue").DefineComponent<{
         elRef: any;
         inline: boolean;
         readonly: boolean | undefined;
+        labelPosition: "right";
     }>;
     fieldValue: import("vue").Ref<string>;
     popupShow: import("vue").Ref<boolean>;
@@ -126,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;
@@ -184,6 +190,10 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    labelPosition: {
+        type: import("vue").PropType<"right">;
+        default: string;
+    };
     size: {
         readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
         readonly required: false;
@@ -252,6 +262,7 @@ declare const _default: import("vue").DefineComponent<{
     formItemSlots: import("../../form-item/src/types").FormItemSlots;
     inline: boolean;
     readonly: boolean;
+    labelPosition: "right";
     props: import("element-plus").CascaderProps;
     disabled: boolean;
     clearable: boolean;

package/index.css

@@ -49,6 +49,23 @@
 }
 
 
+
+.vkf-form-item.vkf-form-item--label-right.el-form-item{
+  display: flex;
+}
+.vkf-form-item.vkf-form-item--label-right.el-form-item .el-form-item__label{
+  display: inline-flex;
+
+
+}
+.vkf-form-item.vkf-form-item--label-right.el-form-item.el-form-item--default .el-form-item__label{
+  height: 32px;
+  line-height: 32px;
+  margin-bottom: 0;
+}
+
+
+
 .vkf-form-item--inline{
   display: inline-flex;
 }
@@ -319,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.15",
+  "version": "1.1.17",
   "description": "",
   "main": "index.esm.js",
   "scripts": {

package/shared/element-plus/ctx.d.ts

@@ -13,7 +13,7 @@ export declare const createInputOnEmits: <T2 extends import("@vunk/core").AnyFun
     compositionupdate: (...e: import("@vunk/core").RestParameters<T2>) => void;
     compositionend: (...e: import("@vunk/core").RestParameters<T2>) => void;
 }[P]; };
-export declare const createFormBindProps: <T2 extends import("@vunk/core").NormalObject, EX extends (Extract<"size", keyof T2> | Extract<"inline", keyof T2> | Extract<"labelWidth", keyof T2> | Extract<"rules", keyof T2> | Extract<"inlineMessage", keyof T2> | Extract<"showMessage", keyof T2> | Extract<"disabled", keyof T2> | Extract<"model", keyof T2> | Extract<"labelPosition", keyof T2> | Extract<"requireAsteriskPosition", keyof T2> | Extract<"labelSuffix", keyof T2> | Extract<"statusIcon", keyof T2> | Extract<"validateOnRuleChange", keyof T2> | Extract<"hideRequiredAsterisk", keyof T2> | Extract<"scrollToError", keyof T2> | Extract<"scrollIntoViewOptions", keyof T2>)[] | undefined>(propsArg: T2, excludes?: EX | undefined) => import("vue").ComputedRef<{ [P in EX extends (infer KE)[] ? Exclude<Extract<"size", keyof T2>, KE> | Exclude<Extract<"inline", keyof T2>, KE> | Exclude<Extract<"labelWidth", keyof T2>, KE> | Exclude<Extract<"rules", keyof T2>, KE> | Exclude<Extract<"inlineMessage", keyof T2>, KE> | Exclude<Extract<"showMessage", keyof T2>, KE> | Exclude<Extract<"disabled", keyof T2>, KE> | Exclude<Extract<"model", keyof T2>, KE> | Exclude<Extract<"labelPosition", keyof T2>, KE> | Exclude<Extract<"requireAsteriskPosition", keyof T2>, KE> | Exclude<Extract<"labelSuffix", keyof T2>, KE> | Exclude<Extract<"statusIcon", keyof T2>, KE> | Exclude<Extract<"validateOnRuleChange", keyof T2>, KE> | Exclude<Extract<"hideRequiredAsterisk", keyof T2>, KE> | Exclude<Extract<"scrollToError", keyof T2>, KE> | Exclude<Extract<"scrollIntoViewOptions", keyof T2>, KE> : Extract<"size", keyof T2> | Extract<"inline", keyof T2> | Extract<"labelWidth", keyof T2> | Extract<"rules", keyof T2> | Extract<"inlineMessage", keyof T2> | Extract<"showMessage", keyof T2> | Extract<"disabled", keyof T2> | Extract<"model", keyof T2> | Extract<"labelPosition", keyof T2> | Extract<"requireAsteriskPosition", keyof T2> | Extract<"labelSuffix", keyof T2> | Extract<"statusIcon", keyof T2> | Extract<"validateOnRuleChange", keyof T2> | Extract<"hideRequiredAsterisk", keyof T2> | Extract<"scrollToError", keyof T2> | Extract<"scrollIntoViewOptions", keyof T2>]: { [k in Extract<"size", keyof T2> | Extract<"inline", keyof T2> | Extract<"labelWidth", keyof T2> | Extract<"rules", keyof T2> | Extract<"inlineMessage", keyof T2> | Extract<"showMessage", keyof T2> | Extract<"disabled", keyof T2> | Extract<"model", keyof T2> | Extract<"labelPosition", keyof T2> | Extract<"requireAsteriskPosition", keyof T2> | Extract<"labelSuffix", keyof T2> | Extract<"statusIcon", keyof T2> | Extract<"validateOnRuleChange", keyof T2> | Extract<"hideRequiredAsterisk", keyof T2> | Extract<"scrollToError", keyof T2> | Extract<"scrollIntoViewOptions", keyof T2>]: T2[k]; }[P]; }>;
+export declare const createFormBindProps: <T2 extends import("@vunk/core").NormalObject, EX extends (Extract<"size", keyof T2> | Extract<"inline", keyof T2> | Extract<"labelPosition", keyof T2> | Extract<"labelWidth", keyof T2> | Extract<"rules", keyof T2> | Extract<"inlineMessage", keyof T2> | Extract<"showMessage", keyof T2> | Extract<"disabled", keyof T2> | Extract<"model", keyof T2> | Extract<"requireAsteriskPosition", keyof T2> | Extract<"labelSuffix", keyof T2> | Extract<"statusIcon", keyof T2> | Extract<"validateOnRuleChange", keyof T2> | Extract<"hideRequiredAsterisk", keyof T2> | Extract<"scrollToError", keyof T2> | Extract<"scrollIntoViewOptions", keyof T2>)[] | undefined>(propsArg: T2, excludes?: EX | undefined) => import("vue").ComputedRef<{ [P in EX extends (infer KE)[] ? Exclude<Extract<"size", keyof T2>, KE> | Exclude<Extract<"inline", keyof T2>, KE> | Exclude<Extract<"labelPosition", keyof T2>, KE> | Exclude<Extract<"labelWidth", keyof T2>, KE> | Exclude<Extract<"rules", keyof T2>, KE> | Exclude<Extract<"inlineMessage", keyof T2>, KE> | Exclude<Extract<"showMessage", keyof T2>, KE> | Exclude<Extract<"disabled", keyof T2>, KE> | Exclude<Extract<"model", keyof T2>, KE> | Exclude<Extract<"requireAsteriskPosition", keyof T2>, KE> | Exclude<Extract<"labelSuffix", keyof T2>, KE> | Exclude<Extract<"statusIcon", keyof T2>, KE> | Exclude<Extract<"validateOnRuleChange", keyof T2>, KE> | Exclude<Extract<"hideRequiredAsterisk", keyof T2>, KE> | Exclude<Extract<"scrollToError", keyof T2>, KE> | Exclude<Extract<"scrollIntoViewOptions", keyof T2>, KE> : Extract<"size", keyof T2> | Extract<"inline", keyof T2> | Extract<"labelPosition", keyof T2> | Extract<"labelWidth", keyof T2> | Extract<"rules", keyof T2> | Extract<"inlineMessage", keyof T2> | Extract<"showMessage", keyof T2> | Extract<"disabled", keyof T2> | Extract<"model", keyof T2> | Extract<"requireAsteriskPosition", keyof T2> | Extract<"labelSuffix", keyof T2> | Extract<"statusIcon", keyof T2> | Extract<"validateOnRuleChange", keyof T2> | Extract<"hideRequiredAsterisk", keyof T2> | Extract<"scrollToError", keyof T2> | Extract<"scrollIntoViewOptions", keyof T2>]: { [k in Extract<"size", keyof T2> | Extract<"inline", keyof T2> | Extract<"labelPosition", keyof T2> | Extract<"labelWidth", keyof T2> | Extract<"rules", keyof T2> | Extract<"inlineMessage", keyof T2> | Extract<"showMessage", keyof T2> | Extract<"disabled", keyof T2> | Extract<"model", keyof T2> | Extract<"requireAsteriskPosition", keyof T2> | Extract<"labelSuffix", keyof T2> | Extract<"statusIcon", keyof T2> | Extract<"validateOnRuleChange", keyof T2> | Extract<"hideRequiredAsterisk", keyof T2> | Extract<"scrollToError", keyof T2> | Extract<"scrollIntoViewOptions", keyof T2>]: T2[k]; }[P]; }>;
 export declare const createFormOnEmits: <T2 extends import("@vunk/core").AnyFunc, EX extends "validate"[] | undefined>(emit: T2, excludes?: EX | undefined) => { [P in EX extends (infer KE)[] ? Exclude<"validate", KE> : "validate"]: {
     validate: (...e: import("@vunk/core").RestParameters<T2>) => void;
 }[P]; };