ele-admin-plus 1.2.1-beta.2 → 1.2.1-beta.4

package/lib/ele-table-select/index.cjs

@@ -1,8 +1,8 @@
 "use strict";
 const vue = require("vue");
-const util = require("../ele-pro-layout/util");
+const util$1 = require("../ele-pro-layout/util");
 const EleBasicSelect = require("../ele-basic-select/index");
-const util$1 = require("../ele-basic-select/util");
+const util = require("../ele-basic-select/util");
 const EleProTable = require("../ele-pro-table/index");
 const util$2 = require("../ele-data-table/util");
 const props = require("./props");
@@ -12,7 +12,8 @@ const _sfc_main = vue.defineComponent({
   props: props.tableSelectProps,
   emits: props.tableSelectEmits,
   setup(props2, { emit }) {
-    const isResponsive = util.useResponsive(props2);
+    const { validateChange } = util.useFormValidate();
+    const isResponsive = util$1.useResponsive(props2);
     const selectRef = vue.ref(null);
     const tableRef = vue.ref(null);
     const selectVisible = vue.ref(false);
@@ -22,13 +23,13 @@ const _sfc_main = vue.defineComponent({
       return !props2.multiple && selected.length ? selected[0].label : "";
     });
     const currentRowKey = vue.computed(() => {
-      if (props2.multiple || util$1.isEmptyValue(props2.modelValue)) {
+      if (props2.multiple || util.isEmptyValue(props2.modelValue)) {
         return;
       }
       return props2.modelValue;
     });
     const selectedRowKeys = vue.computed(() => {
-      if (!props2.multiple || util$1.isEmptyValue(props2.modelValue)) {
+      if (!props2.multiple || util.isEmptyValue(props2.modelValue)) {
         return;
       }
       return props2.modelValue;
@@ -47,7 +48,7 @@ const _sfc_main = vue.defineComponent({
       selectRef.value && selectRef.value.updatePopper();
     };
     const getItemByValue = (value) => {
-      if (util$1.isEmptyValue(value)) {
+      if (util.isEmptyValue(value)) {
         return;
       }
       if (props2.cacheData != null) {
@@ -56,7 +57,7 @@ const _sfc_main = vue.defineComponent({
           return temp;
         }
       }
-      if (!util$1.isEmptyValue(props2.initValue)) {
+      if (!util.isEmptyValue(props2.initValue)) {
         if (!props2.multiple) {
           return props2.initValue;
         }
@@ -81,7 +82,7 @@ const _sfc_main = vue.defineComponent({
     };
     const getMultipleItems = () => {
       const modelValue = props2.modelValue;
-      if (util$1.isEmptyValue(modelValue, true)) {
+      if (util.isEmptyValue(modelValue, true)) {
         return [];
       }
       const selected = [];
@@ -125,7 +126,7 @@ const _sfc_main = vue.defineComponent({
       if (!props2.multiple) {
         const value = props2.modelValue;
         const d = selectedItems.value.length ? selectedItems.value[0] : null;
-        if (util$1.isEmptyValue(value)) {
+        if (util.isEmptyValue(value)) {
           if (d != null) {
             selectedItems.value = [];
           }
@@ -140,7 +141,7 @@ const _sfc_main = vue.defineComponent({
         }
         return;
       }
-      if (util$1.isEmptyValue(props2.modelValue, true)) {
+      if (util.isEmptyValue(props2.modelValue, true)) {
         if (selectedItems.value.length) {
           selectedItems.value = [];
           vue.nextTick(() => {
@@ -150,7 +151,7 @@ const _sfc_main = vue.defineComponent({
         return;
       }
       const keys = selectedItems.value.map((d) => d.value);
-      if (force || util$1.valueIsChanged(props2.modelValue, keys, true)) {
+      if (force || util.valueIsChanged(props2.modelValue, keys, true)) {
         selectedItems.value = getMultipleItems();
         vue.nextTick(() => {
           updatePopover();
@@ -172,15 +173,16 @@ const _sfc_main = vue.defineComponent({
         return;
       }
       const keys = initValue.map((d) => d[valueKey]);
-      if (!util$1.valueIsChanged(props2.modelValue, keys, true)) {
+      if (!util.valueIsChanged(props2.modelValue, keys, true)) {
         updateSelectedItems();
       } else {
         updateModelValue(keys);
       }
     };
     const updateModelValue = (modelValue) => {
-      if (util$1.valueIsChanged(modelValue, props2.modelValue, props2.multiple)) {
+      if (util.valueIsChanged(modelValue, props2.modelValue, props2.multiple)) {
         emit("update:modelValue", modelValue);
+        validateChange();
         emit("change", modelValue);
       }
     };
@@ -281,7 +283,7 @@ const _sfc_main = vue.defineComponent({
     vue.watch(
       () => props2.initValue,
       (initValue) => {
-        if (!util$1.isEmptyValue(initValue)) {
+        if (!util.isEmptyValue(initValue)) {
           handleInitValueChange(initValue);
         }
       },
@@ -296,9 +298,9 @@ const _sfc_main = vue.defineComponent({
       }
     );
     vue.onMounted(() => {
-      if (!util$1.isEmptyValue(props2.initValue, props2.multiple)) {
+      if (!util.isEmptyValue(props2.initValue, props2.multiple)) {
         handleInitValueChange(props2.initValue);
-      } else if (!util$1.isEmptyValue(props2.modelValue, props2.multiple)) {
+      } else if (!util.isEmptyValue(props2.modelValue, props2.multiple)) {
         updateSelectedItems();
       }
     });
@@ -363,6 +365,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     popperClass: _ctx.selectPopperClass,
     selectStyle: _ctx.selectStyle,
     inputStyle: _ctx.inputStyle,
+    selectTagsStyle: _ctx.selectTagsStyle,
     selectedLabel: _ctx.selectedLabel,
     selected: _ctx.selectedItems,
     visible: _ctx.selectVisible,
@@ -414,7 +417,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       ]),
       key: "0"
     } : void 0
-  ]), 1032, ["value", "multiple", "disabled", "size", "clearable", "placeholder", "maxTagCount", "maxTagTextLength", "tagType", "automaticDropdown", "filterable", "teleported", "persistent", "placement", "transition", "popperWidth", "popperOptions", "popperClass", "selectStyle", "inputStyle", "selectedLabel", "selected", "visible", "onUpdate:visible", "onFilterChange", "onRemoveTag", "onClear", "onFocus", "onBlur"]);
+  ]), 1032, ["value", "multiple", "disabled", "size", "clearable", "placeholder", "maxTagCount", "maxTagTextLength", "tagType", "automaticDropdown", "filterable", "teleported", "persistent", "placement", "transition", "popperWidth", "popperOptions", "popperClass", "selectStyle", "inputStyle", "selectTagsStyle", "selectedLabel", "selected", "visible", "onUpdate:visible", "onFilterChange", "onRemoveTag", "onClear", "onFocus", "onBlur"]);
 }
 const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 module.exports = index;

package/lib/ele-table-select/index.d.ts

@@ -9,7 +9,7 @@ declare const _default: import('vue').DefineComponent<{
     };
     multiple: BooleanConstructor;
     disabled: BooleanConstructor;
-    size: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never> | undefined>;
+    size: import('vue').PropType<import('../ele-app/el').ElInputProps["size"]>;
     clearable: BooleanConstructor;
     placeholder: StringConstructor;
     valueKey: {
@@ -27,34 +27,35 @@ declare const _default: import('vue').DefineComponent<{
         required: boolean;
     };
     maxTagCount: NumberConstructor;
-    maxTagTextLength: NumberConstructor; /** 选中的标签 */
+    maxTagTextLength: NumberConstructor;
     tagType: {
-        type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "success" | "warning" | "info" | "primary" | "danger", unknown> | undefined>;
+        type: import('vue').PropType<import('../ele-app/el').ElTagProps["type"]>;
         default: string;
     };
     automaticDropdown: BooleanConstructor;
     filterable: BooleanConstructor;
     teleported: {
         type: BooleanConstructor;
-        default: boolean; /** 表格单选选中值 */
-    }; /** 表格单选选中值 */
+        default: boolean;
+    };
     persistent: {
         type: BooleanConstructor;
         default: boolean;
     };
     placement: {
-        type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, import('element-plus').Placement, unknown> | undefined>;
+        type: import('vue').PropType<import('../ele-app/plus').EleTooltipProps["placement"]>;
         default: string;
     };
     transition: {
         type: StringConstructor;
         default: string;
     };
-    popperOptions: import('vue').PropType<Partial<import('element-plus').Options> | undefined>;
+    popperOptions: import('vue').PropType<import('../ele-app/plus').EleTooltipProps["popperOptions"]>;
     popperClass: StringConstructor;
     popperWidth: (StringConstructor | NumberConstructor)[];
-    selectStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    inputStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    selectStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    inputStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    selectTagsStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     responsive: {
         type: BooleanConstructor;
         default: null;
@@ -107,7 +108,7 @@ declare const _default: import('vue').DefineComponent<{
     };
     multiple: BooleanConstructor;
     disabled: BooleanConstructor;
-    size: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never> | undefined>;
+    size: import('vue').PropType<import('../ele-app/el').ElInputProps["size"]>;
     clearable: BooleanConstructor;
     placeholder: StringConstructor;
     valueKey: {
@@ -125,45 +126,46 @@ declare const _default: import('vue').DefineComponent<{
         required: boolean;
     };
     maxTagCount: NumberConstructor;
-    maxTagTextLength: NumberConstructor; /** 选中的标签 */
+    maxTagTextLength: NumberConstructor;
     tagType: {
-        type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "success" | "warning" | "info" | "primary" | "danger", unknown> | undefined>;
+        type: import('vue').PropType<import('../ele-app/el').ElTagProps["type"]>;
         default: string;
     };
     automaticDropdown: BooleanConstructor;
     filterable: BooleanConstructor;
     teleported: {
         type: BooleanConstructor;
-        default: boolean; /** 表格单选选中值 */
-    }; /** 表格单选选中值 */
+        default: boolean;
+    };
     persistent: {
         type: BooleanConstructor;
         default: boolean;
     };
     placement: {
-        type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, import('element-plus').Placement, unknown> | undefined>;
+        type: import('vue').PropType<import('../ele-app/plus').EleTooltipProps["placement"]>;
         default: string;
     };
     transition: {
         type: StringConstructor;
         default: string;
     };
-    popperOptions: import('vue').PropType<Partial<import('element-plus').Options> | undefined>;
+    popperOptions: import('vue').PropType<import('../ele-app/plus').EleTooltipProps["popperOptions"]>;
     popperClass: StringConstructor;
     popperWidth: (StringConstructor | NumberConstructor)[];
-    selectStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    inputStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    selectStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    inputStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    selectTagsStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     responsive: {
         type: BooleanConstructor;
         default: null;
     };
 }>> & {
-    onChange?: ((_value: SelectValue) => any) | undefined;
     "onUpdate:modelValue"?: ((_value: SelectValue) => any) | undefined;
+    onChange?: ((_value: SelectValue) => any) | undefined;
     onFocus?: ((_e: FocusEvent) => any) | undefined;
     onBlur?: ((_e: FocusEvent) => any) | undefined;
-    onClear?: (() => any) | undefined;
     onSelect?: ((_item: DataItem | DataItem[]) => any) | undefined;
+    onClear?: (() => any) | undefined;
     onVisibleChange?: ((_visible: boolean) => any) | undefined;
     onRemoveTag?: ((_value: SingleValue) => any) | undefined;
     onFilterChange?: ((_value: string) => any) | undefined;
@@ -176,9 +178,9 @@ declare const _default: import('vue').DefineComponent<{
     disabled: boolean;
     filterable: boolean;
     tagType: import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "success" | "warning" | "info" | "primary" | "danger", unknown> | undefined;
-    multiple: boolean;
-    transition: string;
     persistent: boolean;
+    transition: string;
+    multiple: boolean;
     responsive: boolean;
     automaticDropdown: boolean;
     labelKey: string;

package/lib/ele-table-select/props.cjs

@@ -80,6 +80,8 @@ const tableSelectProps = {
   selectStyle: Object,
   /** 自定义输入框样式 */
   inputStyle: Object,
+  /** 自定义多选标签容器样式 */
+  selectTagsStyle: Object,
   /** 是否开启响应式 */
   responsive: {
     type: Boolean,

package/lib/ele-table-select/props.d.ts

@@ -1,5 +1,7 @@
 import { PropType, ExtractPropTypes } from 'vue';
-import { EleProTableProps } from '../ele-app/plus';
+import { StyleValue } from '../ele-app/types';
+import { ElInputProps, ElTagProps } from '../ele-app/el';
+import { EleTooltipProps, EleProTableProps } from '../ele-app/plus';
 import { DataItem } from '../ele-data-table/types';
 import { SelectValue, SingleValue } from '../ele-basic-select/types';
 
@@ -17,7 +19,7 @@ export declare const tableSelectProps: {
     /** 是否禁用 */
     disabled: BooleanConstructor;
     /** 尺寸 */
-    size: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never> | undefined>;
+    size: PropType<ElInputProps["size"]>;
     /** 是否支持清除 */
     clearable: BooleanConstructor;
     /** 无选中时提示文本 */
@@ -47,7 +49,7 @@ export declare const tableSelectProps: {
     maxTagTextLength: NumberConstructor;
     /** 多选标签类型 */
     tagType: {
-        type: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "success" | "warning" | "info" | "primary" | "danger", unknown> | undefined>;
+        type: PropType<ElTagProps["type"]>;
         default: string;
     };
     /** 是否在输入框获得焦点后自动弹出选项菜单 */
@@ -66,7 +68,7 @@ export declare const tableSelectProps: {
     };
     /** 下拉框位置 */
     placement: {
-        type: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, import('element-plus').Placement, unknown> | undefined>;
+        type: PropType<EleTooltipProps["placement"]>;
         default: string;
     };
     /** 下拉框渐变动画 */
@@ -75,15 +77,17 @@ export declare const tableSelectProps: {
         default: string;
     };
     /** popper.js 参数 */
-    popperOptions: PropType<Partial<import('element-plus').Options> | undefined>;
+    popperOptions: PropType<EleTooltipProps["popperOptions"]>;
     /** 下拉框类名 */
     popperClass: StringConstructor;
     /** 下拉框宽度 */
     popperWidth: (StringConstructor | NumberConstructor)[];
     /** 自定义样式 */
-    selectStyle: PropType<Partial<import('vue').CSSProperties>>;
+    selectStyle: PropType<StyleValue>;
     /** 自定义输入框样式 */
-    inputStyle: PropType<Partial<import('vue').CSSProperties>>;
+    inputStyle: PropType<StyleValue>;
+    /** 自定义多选标签容器样式 */
+    selectTagsStyle: PropType<StyleValue>;
     /** 是否开启响应式 */
     responsive: {
         type: BooleanConstructor;