@vunk/form 1.4.8 → 1.4.9

package/components/select/index.cjs

@@ -25,7 +25,14 @@ const props = {
     type: String,
     default: ""
   },
-  defaultModelValue: null
+  defaultModelValue: null,
+  /**
+   * multiple模式下，是否将选中的值转为字符串 
+   */
+  stringify: {
+    type: Boolean,
+    default: false
+  }
 };
 const emits = {
   ...elementPlus.selectEmits
@@ -43,8 +50,32 @@ var _sfc_main = vue.defineComponent({
   setup(props2, { emit }) {
     const formItemBindProps = formItem._VkfFormItemCtx.createBindProps(props2);
     const selectBindProps = elementPlus.createSelectBindProps(props2, ["disabled", "modelValue"]);
-    const selectOnEmits = elementPlus.createSelectOnEmits(emit);
+    const selectOnEmits = elementPlus.createSelectOnEmits(emit, ["update:modelValue"]);
     const readonly = composables.useComputedReadonly(props2);
+    const theModelValue = vue.computed({
+      get: () => {
+        if (props2.multiple && props2.stringify && typeof props2.modelValue === "string") {
+          return props2.modelValue ? props2.modelValue.split(",") : [];
+        }
+        return props2.modelValue ?? props2.defaultModelValue;
+      },
+      set: (modelValue) => {
+        if (props2.multiple && props2.stringify && Array.isArray(modelValue)) {
+          const value = modelValue.reduce((a, v) => {
+            if (typeof v === "string") {
+              a.push(v);
+            } else if (utilsObject.isNotEmptyObject(v) && v[props2.valueKey] !== void 0) {
+              a.push(v[props2.valueKey]);
+            }
+            return a;
+          }, []).join(",");
+          emit("update:modelValue", value);
+          return;
+        }
+        emit("update:modelValue", modelValue);
+      }
+    });
+    props2.modelValue === void 0 && props2.defaultModelValue && theModelValue.value === props2.defaultModelValue;
     const optionsFromUrl = vue.ref([]);
     const rUrlOptions = (url) => {
       if (url) {
@@ -89,7 +120,8 @@ var _sfc_main = vue.defineComponent({
       selectOnEmits,
       selectOptions,
       reshow,
-      readonly
+      readonly,
+      theModelValue
     };
   }
 });
@@ -104,7 +136,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     {
       default: vue.withCtx(() => [
         _ctx.reshow ? (vue.openBlock(), vue.createBlock(_component_ElSelect, vue.mergeProps({ key: 0 }, _ctx.selectBindProps, {
-          "model-value": _ctx.defaultModelValue ?? _ctx.modelValue,
+          modelValue: _ctx.theModelValue,
+          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.theModelValue = $event),
           disabled: _ctx.readonly || _ctx.disabled,
           class: {
             "is-readonly": _ctx.readonly
@@ -140,7 +173,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               ])
             };
           })
-        ]), 1040, ["model-value", "disabled", "class"])) : vue.createCommentVNode("v-if", true),
+        ]), 1040, ["modelValue", "disabled", "class"])) : vue.createCommentVNode("v-if", true),
         vue.renderSlot(_ctx.$slots, "default")
       ]),
       _: 3

package/components/select/index.mjs

@@ -1,8 +1,8 @@
 import { _VkfFormItemCtx, VkfFormItem } from '@vunk/form/components/form-item';
 import { selectProps, selectEmits, createSelectBindProps, createSelectOnEmits } from '@vunk/form/shared/element-plus';
-import { defineComponent, ref, watch, computed, nextTick, resolveComponent, openBlock, createBlock, normalizeProps, guardReactiveProps, withCtx, mergeProps, toHandlers, createSlots, createElementBlock, Fragment, renderList, resolveDynamicComponent, createCommentVNode, renderSlot } from 'vue';
+import { defineComponent, computed, ref, watch, nextTick, resolveComponent, openBlock, createBlock, normalizeProps, guardReactiveProps, withCtx, mergeProps, toHandlers, createSlots, createElementBlock, Fragment, renderList, resolveDynamicComponent, createCommentVNode, renderSlot } from 'vue';
 import { ElSelect, ElOption } from 'element-plus';
-import { isPlainObject } from '@vunk/core/shared/utils-object';
+import { isNotEmptyObject, isPlainObject } from '@vunk/core/shared/utils-object';
 import { useComputedReadonly } from '@vunk/form/composables';
 import { _ as _export_sfc } from '../_plugin-vue_export-helper.mjs';
 
@@ -21,7 +21,14 @@ const props = {
     type: String,
     default: ""
   },
-  defaultModelValue: null
+  defaultModelValue: null,
+  /**
+   * multiple模式下，是否将选中的值转为字符串 
+   */
+  stringify: {
+    type: Boolean,
+    default: false
+  }
 };
 const emits = {
   ...selectEmits
@@ -39,8 +46,32 @@ var _sfc_main = defineComponent({
   setup(props2, { emit }) {
     const formItemBindProps = _VkfFormItemCtx.createBindProps(props2);
     const selectBindProps = createSelectBindProps(props2, ["disabled", "modelValue"]);
-    const selectOnEmits = createSelectOnEmits(emit);
+    const selectOnEmits = createSelectOnEmits(emit, ["update:modelValue"]);
     const readonly = useComputedReadonly(props2);
+    const theModelValue = computed({
+      get: () => {
+        if (props2.multiple && props2.stringify && typeof props2.modelValue === "string") {
+          return props2.modelValue ? props2.modelValue.split(",") : [];
+        }
+        return props2.modelValue ?? props2.defaultModelValue;
+      },
+      set: (modelValue) => {
+        if (props2.multiple && props2.stringify && Array.isArray(modelValue)) {
+          const value = modelValue.reduce((a, v) => {
+            if (typeof v === "string") {
+              a.push(v);
+            } else if (isNotEmptyObject(v) && v[props2.valueKey] !== void 0) {
+              a.push(v[props2.valueKey]);
+            }
+            return a;
+          }, []).join(",");
+          emit("update:modelValue", value);
+          return;
+        }
+        emit("update:modelValue", modelValue);
+      }
+    });
+    props2.modelValue === void 0 && props2.defaultModelValue && theModelValue.value === props2.defaultModelValue;
     const optionsFromUrl = ref([]);
     const rUrlOptions = (url) => {
       if (url) {
@@ -85,7 +116,8 @@ var _sfc_main = defineComponent({
       selectOnEmits,
       selectOptions,
       reshow,
-      readonly
+      readonly,
+      theModelValue
     };
   }
 });
@@ -100,7 +132,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     {
       default: withCtx(() => [
         _ctx.reshow ? (openBlock(), createBlock(_component_ElSelect, mergeProps({ key: 0 }, _ctx.selectBindProps, {
-          "model-value": _ctx.defaultModelValue ?? _ctx.modelValue,
+          modelValue: _ctx.theModelValue,
+          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.theModelValue = $event),
           disabled: _ctx.readonly || _ctx.disabled,
           class: {
             "is-readonly": _ctx.readonly
@@ -136,7 +169,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               ])
             };
           })
-        ]), 1040, ["model-value", "disabled", "class"])) : createCommentVNode("v-if", true),
+        ]), 1040, ["modelValue", "disabled", "class"])) : createCommentVNode("v-if", true),
         renderSlot(_ctx.$slots, "default")
       ]),
       _: 3

package/components/select/src/ctx.d.ts

@@ -16,6 +16,13 @@ export declare const props: {
         default: string;
     };
     defaultModelValue: any;
+    /**
+     * multiple模式下，是否将选中的值转为字符串
+     */
+    stringify: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     name: StringConstructor;
     id: StringConstructor;
     modelValue: {

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

@@ -13,6 +13,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         default: string;
     };
     defaultModelValue: any;
+    stringify: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     name: StringConstructor;
     id: StringConstructor;
     modelValue: {
@@ -176,7 +180,14 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         valueKey: string;
         fitInputWidth: boolean;
     }>;
-    selectOnEmits: {};
+    selectOnEmits: {
+        clear: (...e: any[]) => void;
+        change: (...e: any[]) => void;
+        focus: (...e: any[]) => void;
+        blur: (...e: any[]) => void;
+        "visible-change": (...e: any[]) => void;
+        "remove-tag": (...e: any[]) => void;
+    };
     selectOptions: import("vue").ComputedRef<(import("@vunk/core").VueComponentPropsType<import("element-plus/es/utils").SFCWithInstall<import("vue").DefineComponent<{
         value: {
             required: true;
@@ -237,6 +248,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     })[]>;
     reshow: import("vue").Ref<boolean, boolean>;
     readonly: import("vue").ComputedRef<boolean>;
+    theModelValue: import("vue").WritableComputedRef<any, any>;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     'update:modelValue': any;
     change: any;
@@ -259,6 +271,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         default: string;
     };
     defaultModelValue: any;
+    stringify: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     name: StringConstructor;
     id: StringConstructor;
     modelValue: {
@@ -488,6 +504,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     valueKey: string;
     fitInputWidth: boolean;
     selectSlots: import("./types").SelectSlots;
+    stringify: boolean;
 }, {}, {
     VkfFormItem: {
         new (...args: any[]): any;

package/package.json

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

package/shared/element-plus/index.cjs

@@ -137,7 +137,6 @@ const selectProps = {
     type: [String, Object],
     default: arrow_down_default
   },
-  // eslint-disable-next-line vue/require-prop-types
   tagType: { ...elementPlus.tagProps.type, default: "info" }
 };
 const selectEmits = {

package/shared/element-plus/index.mjs

@@ -135,7 +135,6 @@ const selectProps = {
     type: [String, Object],
     default: arrow_down_default
   },
-  // eslint-disable-next-line vue/require-prop-types
   tagType: { ...tagProps.type, default: "info" }
 };
 const selectEmits = {