fix selelct table

2023-05-29 13:24:33 +08:00
parent 92fa833be7
commit 49d7a25529
13 changed files with 329 additions and 405 deletions
--- a/package/component/es/select/index.js
+++ b/package/component/es/select/index.js
@@ -33,7 +33,8 @@ const _sfc_main = defineComponent({
    allowClear: { type: Boolean, default: false },
    showSearch: { type: Boolean, default: false },
    contentClass: null,
-    contentStyle: null
+    contentStyle: null,
+    position: { default: "top" }
  },
  emits: ["update:modelValue", "change", "search"],
  setup(__props, { emit: emits }) {
@@ -180,6 +181,7 @@ const _sfc_main = defineComponent({
              disabledInput: !__props.showSearch,
              size: __props.size,
              class: normalizeClass({ "layui-unselect": true }),
+              position: __props.position,
              onRemove: handleRemove,
              onClear: handleClear,
              onInputValueChange: handleSearch,
@@ -199,7 +201,7 @@ const _sfc_main = defineComponent({
                }, null, 8, ["class"])
              ]),
              _: 1
-            }, 8, ["modelValue", "input-value", "allow-clear", "placeholder", "collapseTagsTooltip", "minCollapsedNum", "disabled", "disabledInput", "size"])) : (openBlock(), createBlock(_sfc_main$4, {
+            }, 8, ["modelValue", "input-value", "allow-clear", "placeholder", "collapseTagsTooltip", "minCollapsedNum", "disabled", "disabledInput", "size", "position"])) : (openBlock(), createBlock(_sfc_main$4, {
              key: 1,
              size: __props.size,
              disabled: __props.disabled,
--- a/package/component/es/slider/index.js
+++ b/package/component/es/slider/index.js
@@ -32,8 +32,7 @@ function makeDots(props) {
  return dots;
 }
 const _hoisted_1$4 = ["onMousedown"];
-const _hoisted_2$4 = /* @__PURE__ */ createElementVNode("div", { class: "layui-slider-line-v" }, null, -1);
-const _hoisted_3$4 = ["onClick"];
+const _hoisted_2$4 = ["onClick"];
 const __default__$4 = {
  name: "StandardVue"
 };
@@ -45,7 +44,8 @@ const _sfc_main$4 = defineComponent({
    step: { default: 0 },
    min: { default: 0 },
    max: { default: 100 },
-    showDots: { type: Boolean, default: false }
+    showDots: { type: Boolean, default: false },
+    backgroundColor: { default: "#ccc" }
  },
  emits: ["link-val-hook"],
  setup(__props, { emit }) {
@@ -129,14 +129,19 @@ const _sfc_main$4 = defineComponent({
          style: normalizeStyle({ width: __props.val + "%" }),
          class: normalizeClass(["layui-slider-rate-v", [__props.disabled ? "layui-slider-disabled disable-line" : ""]])
        }, null, 6),
-        _hoisted_2$4,
+        createElementVNode("div", {
+          class: "layui-slider-line-v",
+          style: normalizeStyle({
+            backgroundColor: props.backgroundColor
+          })
+        }, null, 4),
        (openBlock(true), createElementBlock(Fragment, null, renderList(unref(dots), (item, index2) => {
          return withDirectives((openBlock(), createElementBlock("div", {
            onClick: ($event) => focusDot(item),
            class: "layui-slider-dots",
            key: index2,
            style: normalizeStyle({ left: item + "%" })
-          }, null, 12, _hoisted_3$4)), [
+          }, null, 12, _hoisted_2$4)), [
            [vShow, __props.showDots]
          ]);
        }), 128))
@@ -628,7 +633,8 @@ const _sfc_main = defineComponent({
    disabled: { type: Boolean, default: false },
    range: { type: Boolean },
    rangeValue: null,
-    showDots: { type: Boolean, default: false }
+    showDots: { type: Boolean, default: false },
+    backgroundColor: { default: "#ccc" }
  },
  emits: ["update:modelValue"],
  setup(__props, { emit }) {
@@ -680,8 +686,9 @@ const _sfc_main = defineComponent({
              step: __props.step,
              min: __props.min,
              max: __props.max,
-              showDots: __props.showDots
-            }, null, 8, ["val", "disabled", "step", "min", "max", "showDots"])
+              showDots: __props.showDots,
+              backgroundColor: props.backgroundColor
+            }, null, 8, ["val", "disabled", "step", "min", "max", "showDots", "backgroundColor"])
          ]))
        ]))
      ]);
--- a/package/component/es/table/index.js
+++ b/package/component/es/table/index.js
@@ -951,7 +951,8 @@ const _sfc_main = defineComponent({
    } },
    getRadioProps: { type: Function, default: () => {
    } },
-    download: { default: "" }
+    download: { default: "" },
+    serverpage: { type: Boolean, default: false }
  },
  emits: [
    "change",
@@ -1128,8 +1129,12 @@ const _sfc_main = defineComponent({
    });
    let pagecurrent;
    const change = function(page) {
-      pagecurrent = page.current;
-      datalist.value = tableDataSource.value.slice(page.limit * (page.current - 1), page.limit * page.current);
+      if (props.serverpage) {
+        emit("change", page);
+      } else {
+        pagecurrent = page.current;
+        datalist.value = tableDataSource.value.slice(page.limit * (page.current - 1), page.limit * page.current);
+      }
    };
    const rowClick = function(data, evt) {
      emit("row", data, evt);
--- a/package/component/es/tagInput/index2.js
+++ b/package/component/es/tagInput/index2.js
@@ -34,7 +34,8 @@ const _sfc_main = defineComponent({
    collapseTagsTooltip: { type: Boolean },
    size: { default: "md" },
    tagProps: null,
-    disabledInput: { type: Boolean }
+    disabledInput: { type: Boolean },
+    position: { default: "top" }
  },
  emits: [
    "update:modelValue",
@@ -247,7 +248,8 @@ const _sfc_main = defineComponent({
            isDark: false,
            trigger: "hover",
            popperStyle: "padding:6px",
-            disabled: !__props.collapseTagsTooltip
+            disabled: !__props.collapseTagsTooltip,
+            position: __props.position
          }, {
            content: withCtx(() => [
              createElementVNode("div", _hoisted_3, [
@@ -283,7 +285,7 @@ const _sfc_main = defineComponent({
              }, 16, ["size"])
            ]),
            _: 1
-          }, 8, ["disabled"])) : createCommentVNode("", true),
+          }, 8, ["disabled", "position"])) : createCommentVNode("", true),
          createElementVNode("input", {
            ref_key: "inputRefEl",
            ref: inputRefEl,
--- a/package/component/es/tooltip/index2.js
+++ b/package/component/es/tooltip/index2.js
@@ -1,5 +1,5 @@
 import { w as withInstall } from "../badge/index2.js";
-import { defineComponent, useSlots, ref, toRef, shallowRef, computed, watch, onMounted, openBlock, createBlock, Teleport, withDirectives, createVNode, Transition, withCtx, createElementVNode, normalizeClass, normalizeStyle, renderSlot, createTextVNode, toDisplayString, vShow, createCommentVNode, nextTick, getCurrentInstance, createElementBlock, Fragment, normalizeProps, mergeProps, unref } from "vue";
+import { defineComponent, useSlots, ref, toRef, shallowRef, computed, watch, onMounted, openBlock, createBlock, Teleport, withDirectives, createVNode, Transition, withCtx, createElementVNode, normalizeClass, normalizeStyle, renderSlot, createTextVNode, toDisplayString, vShow, createCommentVNode, nextTick, getCurrentInstance, createElementBlock, Fragment, mergeProps, unref } from "vue";
 import { o as onClickOutside, a as useResizeObserver, c as useEventListener, b as useThrottleFn } from "../_chunks/@vueuse/index.js";
 var index$1 = /* @__PURE__ */ (() => ".lay-tooltip-content{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;cursor:pointer}\n")();
 var index = /* @__PURE__ */ (() => '.layui-popper{position:fixed;padding:10px;border-radius:3px;word-wrap:break-word;min-width:12px;min-height:12px;font-size:14px;box-sizing:border-box;box-shadow:0 2px 12px #00000026;background-color:#fff;color:#3a3a3a;border:1px solid #cecece;max-width:300px;z-index:99999}.layui-popper[position=top]{margin-bottom:6px}.layui-popper[position=top] .layui-popper-arrow{bottom:-6px;border-bottom-width:0;border-top-color:#cecece}.layui-popper[position=top] .layui-popper-arrow:after{bottom:1px;border-bottom-width:0;margin-left:-6px;border-top-color:#fff}.layui-popper[position=bottom]{margin-top:6px}.layui-popper[position=bottom] .layui-popper-arrow{top:-6px;border-top-width:0;border-bottom-color:#cecece}.layui-popper[position=bottom] .layui-popper-arrow:after{top:1px;border-top-width:0;margin-left:-6px;border-bottom-color:#fff}.layui-popper[position=right]{margin-left:6px}.layui-popper[position=right] .layui-popper-arrow{left:-6px;border-left-width:0;border-right-color:#cecece}.layui-popper[position=right] .layui-popper-arrow:after{left:1px;border-left-width:0;margin-top:-6px;border-right-color:#fff}.layui-popper[position=left]{margin-right:6px}.layui-popper[position=left] .layui-popper-arrow{right:-6px;border-right-width:0;border-left-color:#cecece}.layui-popper[position=left] .layui-popper-arrow:after{right:1px;border-right-width:0;margin-top:-6px;border-left-color:#fff}.layui-popper[position=top] .layui-popper-arrow,.layui-popper[position=bottom] .layui-popper-arrow{left:-moz-calc(44%);left:-webkit-calc(44%);left:calc(50% - 6px)}.layui-popper[position=left] .layui-popper-arrow,.layui-popper[position=right] .layui-popper-arrow{top:-moz-calc(44%);top:-webkit-calc(44%);top:calc(50% - 6px)}.layui-popper:after{content:" ";position:absolute;display:block}.layui-popper[position=top]:after{bottom:-7px;left:0;width:100%;height:7px}.layui-popper[position=bottom]:after{top:-7px;left:0;width:100%;height:7px}.layui-popper[position=left]:after{right:-7px;bottom:0;height:100%;width:7px}.layui-popper[position=right]:after{left:-7px;bottom:0;height:100%;width:7px}.layui-popper .layui-popper-arrow,.layui-popper .layui-popper-arrow:after{position:absolute;display:block;width:0;height:0;border-width:6px;border-style:solid;border-color:transparent}.layui-popper .layui-popper-arrow:after{content:" "}.layui-popper.layui-dark{background-color:#353535;color:#fff;border:1px solid #353535}.layui-popper.layui-dark[position=top]{margin-bottom:6px}.layui-popper.layui-dark[position=top] .layui-popper-arrow{bottom:-6px;border-bottom-width:0;border-top-color:#353535}.layui-popper.layui-dark[position=top] .layui-popper-arrow:after{bottom:1px;border-bottom-width:0;margin-left:-6px;border-top-color:#353535}.layui-popper.layui-dark[position=bottom]{margin-top:6px}.layui-popper.layui-dark[position=bottom] .layui-popper-arrow{top:-6px;border-top-width:0;border-bottom-color:#353535}.layui-popper.layui-dark[position=bottom] .layui-popper-arrow:after{top:1px;border-top-width:0;margin-left:-6px;border-bottom-color:#353535}.layui-popper.layui-dark[position=right]{margin-left:6px}.layui-popper.layui-dark[position=right] .layui-popper-arrow{left:-6px;border-left-width:0;border-right-color:#353535}.layui-popper.layui-dark[position=right] .layui-popper-arrow:after{left:1px;border-left-width:0;margin-top:-6px;border-right-color:#353535}.layui-popper.layui-dark[position=left]{margin-right:6px}.layui-popper.layui-dark[position=left] .layui-popper-arrow{right:-6px;border-right-width:0;border-left-color:#353535}.layui-popper.layui-dark[position=left] .layui-popper-arrow:after{right:1px;border-right-width:0;margin-top:-6px;border-left-color:#353535}\n')();
@@ -360,12 +360,15 @@ const _sfc_main = defineComponent({
            renderSlot(_ctx.$slots, "default")
          ])
        ], 512)) : renderSlot(_ctx.$slots, "default", { key: 1 }),
-        isMounted.value ? (openBlock(), createBlock(_sfc_main$1, normalizeProps(mergeProps({ key: 2 }, unref(innerProps))), {
+        isMounted.value ? (openBlock(), createBlock(_sfc_main$1, mergeProps({
+          key: 2,
+          positio: __props.position
+        }, unref(innerProps)), {
          default: withCtx(() => [
            renderSlot(_ctx.$slots, "content")
          ]),
          _: 3
-        }, 16)) : createCommentVNode("", true)
+        }, 16, ["positio"])) : createCommentVNode("", true)
      ], 64);
    };
  }