ll-plus 2.5.2 → 2.5.4

package/lib/packages/components/new-drawer/src/drawer.js

@@ -4,6 +4,7 @@ require('../../../utils/index.js');
 var runtime = require('../../../utils/props/runtime.js');
 
 "use strict";
+const footerShadowPlacement = ["inner", "outer"];
 const newDrawerProps = runtime.buildProps({
   /**
    * @description 对话框外层容器的类名
@@ -67,18 +68,19 @@ const newDrawerProps = runtime.buildProps({
     default: true
   },
   /**
-   * @description 容器内容的顶部的阴影 设置为false标记可能是外部其他元素滚动
+   * @description 滚动是否显示底部阴影
    */
-  isShowTopShadow: {
+  isShowFooterShadow: {
     type: Boolean,
     default: true
   },
   /**
-   * @description 容器内容底部的阴影
+   * @description 决定底部阴影的方向(外部和内部）,默认由内容区域来决定
    */
-  isShowFooterShadow: {
-    type: Boolean,
-    default: true
+  footerShadowPlacement: {
+    type: String,
+    values: footerShadowPlacement,
+    default: "inner"
   }
 });
 const newDrawerEmits = {
@@ -97,6 +99,7 @@ const newDrawerEmits = {
   "update:open": () => true
 };
 
+exports.footerShadowPlacement = footerShadowPlacement;
 exports.newDrawerEmits = newDrawerEmits;
 exports.newDrawerProps = newDrawerProps;
 //# sourceMappingURL=drawer.js.map

package/lib/packages/components/new-drawer/src/drawer.js.map

@@ -1 +1 @@
-{"version":3,"file":"drawer.js","sources":["../../../../../../packages/components/new-drawer/src/drawer.ts"],"sourcesContent":["import { buildProps, definePropType } from '@ll-plus/utils'\n\nimport type { ExtractPropTypes } from 'vue'\nimport type Drawer from './drawer.vue'\nimport type { ButtonProps } from '@ll-plus/components'\n\nexport const newDrawerProps = buildProps({\n  /**\n   * @description 对话框外层容器的类名\n   */\n  rootClassName: {\n    type: String,\n    default: ''\n  },\n  /**\n   * @description 抽屉是否可见\n   */\n  open: {\n    type: Boolean,\n    default: false\n  },\n  /**\n   * @description 标题\n   */\n  title: {\n    type: String,\n    default: '新增'\n  },\n  /**\n   * @description  确认/知道了按钮loading\n   */\n  confirmLoading: {\n    type: Boolean,\n    default: false\n  },\n  /**\n   * @description 取消按钮的配置信息\n   */\n  cancelButtonProps: {\n    type: definePropType<ButtonProps>(Object)\n  },\n  /**\n   * @description 确认按钮的配置信息\n   */\n  okButtonProps: {\n    type: definePropType<ButtonProps>(Object)\n  },\n  /**\n   * @description 确认按钮文字\n   */\n  confirmText: {\n    type: String,\n    default: '确认'\n  },\n  /**\n   * @description 取消按钮文字\n   */\n  cancelText: {\n    type: String,\n    default: '取消'\n  },\n  /**\n   * @description 显示底部\n   */\n  showFooter: {\n    type: Boolean,\n    default: true\n  },\n  /**\n   * @description 容器内容的顶部的阴影 设置为false标记可能是外部其他元素滚动\n   */\n  isShowTopShadow: {\n    type: Boolean,\n    default: true\n  },\n  /**\n   * @description 容器内容底部的阴影\n   */\n  isShowFooterShadow: {\n    type: Boolean,\n    default: true\n  }\n} as const)\n\nexport const newDrawerEmits = {\n  /**\n   * @description 点击取消时触发\n   */\n  cancel: () => true,\n  /**\n   * @description 点击确认时触发\n   */\n  confirm: () => true,\n  /**\n   * @description 抽屉关闭时触发\n   */\n  close: () => true,\n  'update:open': () => true\n} as const\n\n// props\nexport type NewDrawerProps = ExtractPropTypes<typeof newDrawerProps>\n\n// emits\nexport type NewDrawerEmits = typeof newDrawerEmits\n\n// instance\nexport type NewDrawerInstance = InstanceType<typeof Drawer>\n"],"names":["buildProps","definePropType"],"mappings":";;;;;;AAMO,MAAM,iBAAiBA,kBAAW,CAAA;AAAA;AAAA;AAAA;AAAA,EAIvC,aAAe,EAAA;AAAA,IACb,IAAM,EAAA,MAAA;AAAA,IACN,OAAS,EAAA,EAAA;AAAA,GACX;AAAA;AAAA;AAAA;AAAA,EAIA,IAAM,EAAA;AAAA,IACJ,IAAM,EAAA,OAAA;AAAA,IACN,OAAS,EAAA,KAAA;AAAA,GACX;AAAA;AAAA;AAAA;AAAA,EAIA,KAAO,EAAA;AAAA,IACL,IAAM,EAAA,MAAA;AAAA,IACN,OAAS,EAAA,cAAA;AAAA,GACX;AAAA;AAAA;AAAA;AAAA,EAIA,cAAgB,EAAA;AAAA,IACd,IAAM,EAAA,OAAA;AAAA,IACN,OAAS,EAAA,KAAA;AAAA,GACX;AAAA;AAAA;AAAA;AAAA,EAIA,iBAAmB,EAAA;AAAA,IACjB,IAAA,EAAMC,uBAA4B,MAAM,CAAA;AAAA,GAC1C;AAAA;AAAA;AAAA;AAAA,EAIA,aAAe,EAAA;AAAA,IACb,IAAA,EAAMA,uBAA4B,MAAM,CAAA;AAAA,GAC1C;AAAA;AAAA;AAAA;AAAA,EAIA,WAAa,EAAA;AAAA,IACX,IAAM,EAAA,MAAA;AAAA,IACN,OAAS,EAAA,cAAA;AAAA,GACX;AAAA;AAAA;AAAA;AAAA,EAIA,UAAY,EAAA;AAAA,IACV,IAAM,EAAA,MAAA;AAAA,IACN,OAAS,EAAA,cAAA;AAAA,GACX;AAAA;AAAA;AAAA;AAAA,EAIA,UAAY,EAAA;AAAA,IACV,IAAM,EAAA,OAAA;AAAA,IACN,OAAS,EAAA,IAAA;AAAA,GACX;AAAA;AAAA;AAAA;AAAA,EAIA,eAAiB,EAAA;AAAA,IACf,IAAM,EAAA,OAAA;AAAA,IACN,OAAS,EAAA,IAAA;AAAA,GACX;AAAA;AAAA;AAAA;AAAA,EAIA,kBAAoB,EAAA;AAAA,IAClB,IAAM,EAAA,OAAA;AAAA,IACN,OAAS,EAAA,IAAA;AAAA,GACX;AACF,CAAU,EAAA;AAEH,MAAM,cAAiB,GAAA;AAAA;AAAA;AAAA;AAAA,EAI5B,QAAQ,MAAM,IAAA;AAAA;AAAA;AAAA;AAAA,EAId,SAAS,MAAM,IAAA;AAAA;AAAA;AAAA;AAAA,EAIf,OAAO,MAAM,IAAA;AAAA,EACb,eAAe,MAAM,IAAA;AACvB;;;;;"}
+{"version":3,"file":"drawer.js","sources":["../../../../../../packages/components/new-drawer/src/drawer.ts"],"sourcesContent":["import { buildProps, definePropType } from '@ll-plus/utils'\n\nimport type { ExtractPropTypes } from 'vue'\nimport type Drawer from './drawer.vue'\nimport type { ButtonProps } from '@ll-plus/components'\n\nexport const footerShadowPlacement = ['inner', 'outer'] as const\n\nexport const newDrawerProps = buildProps({\n  /**\n   * @description 对话框外层容器的类名\n   */\n  rootClassName: {\n    type: String,\n    default: ''\n  },\n  /**\n   * @description 抽屉是否可见\n   */\n  open: {\n    type: Boolean,\n    default: false\n  },\n  /**\n   * @description 标题\n   */\n  title: {\n    type: String,\n    default: '新增'\n  },\n  /**\n   * @description  确认/知道了按钮loading\n   */\n  confirmLoading: {\n    type: Boolean,\n    default: false\n  },\n  /**\n   * @description 取消按钮的配置信息\n   */\n  cancelButtonProps: {\n    type: definePropType<ButtonProps>(Object)\n  },\n  /**\n   * @description 确认按钮的配置信息\n   */\n  okButtonProps: {\n    type: definePropType<ButtonProps>(Object)\n  },\n  /**\n   * @description 确认按钮文字\n   */\n  confirmText: {\n    type: String,\n    default: '确认'\n  },\n  /**\n   * @description 取消按钮文字\n   */\n  cancelText: {\n    type: String,\n    default: '取消'\n  },\n  /**\n   * @description 显示底部\n   */\n  showFooter: {\n    type: Boolean,\n    default: true\n  },\n  /**\n   * @description 滚动是否显示底部阴影\n   */\n  isShowFooterShadow: {\n    type: Boolean,\n    default: true\n  },\n  /**\n   * @description 决定底部阴影的方向(外部和内部）,默认由内容区域来决定\n   */\n  footerShadowPlacement: {\n    type: String,\n    values: footerShadowPlacement,\n    default: 'inner'\n  }\n} as const)\n\nexport const newDrawerEmits = {\n  /**\n   * @description 点击取消时触发\n   */\n  cancel: () => true,\n  /**\n   * @description 点击确认时触发\n   */\n  confirm: () => true,\n  /**\n   * @description 抽屉关闭时触发\n   */\n  close: () => true,\n  'update:open': () => true\n} as const\n\n// props\nexport type NewDrawerProps = ExtractPropTypes<typeof newDrawerProps>\nexport type FooterShadowPlacementType = NewDrawerProps['footerShadowPlacement']\n\n// emits\nexport type NewDrawerEmits = typeof newDrawerEmits\n\n// instance\nexport type NewDrawerInstance = InstanceType<typeof Drawer>\n"],"names":["buildProps","definePropType"],"mappings":";;;;;;AAMa,MAAA,qBAAA,GAAwB,CAAC,OAAA,EAAS,OAAO,EAAA;AAE/C,MAAM,iBAAiBA,kBAAW,CAAA;AAAA;AAAA;AAAA;AAAA,EAIvC,aAAe,EAAA;AAAA,IACb,IAAM,EAAA,MAAA;AAAA,IACN,OAAS,EAAA,EAAA;AAAA,GACX;AAAA;AAAA;AAAA;AAAA,EAIA,IAAM,EAAA;AAAA,IACJ,IAAM,EAAA,OAAA;AAAA,IACN,OAAS,EAAA,KAAA;AAAA,GACX;AAAA;AAAA;AAAA;AAAA,EAIA,KAAO,EAAA;AAAA,IACL,IAAM,EAAA,MAAA;AAAA,IACN,OAAS,EAAA,cAAA;AAAA,GACX;AAAA;AAAA;AAAA;AAAA,EAIA,cAAgB,EAAA;AAAA,IACd,IAAM,EAAA,OAAA;AAAA,IACN,OAAS,EAAA,KAAA;AAAA,GACX;AAAA;AAAA;AAAA;AAAA,EAIA,iBAAmB,EAAA;AAAA,IACjB,IAAA,EAAMC,uBAA4B,MAAM,CAAA;AAAA,GAC1C;AAAA;AAAA;AAAA;AAAA,EAIA,aAAe,EAAA;AAAA,IACb,IAAA,EAAMA,uBAA4B,MAAM,CAAA;AAAA,GAC1C;AAAA;AAAA;AAAA;AAAA,EAIA,WAAa,EAAA;AAAA,IACX,IAAM,EAAA,MAAA;AAAA,IACN,OAAS,EAAA,cAAA;AAAA,GACX;AAAA;AAAA;AAAA;AAAA,EAIA,UAAY,EAAA;AAAA,IACV,IAAM,EAAA,MAAA;AAAA,IACN,OAAS,EAAA,cAAA;AAAA,GACX;AAAA;AAAA;AAAA;AAAA,EAIA,UAAY,EAAA;AAAA,IACV,IAAM,EAAA,OAAA;AAAA,IACN,OAAS,EAAA,IAAA;AAAA,GACX;AAAA;AAAA;AAAA;AAAA,EAIA,kBAAoB,EAAA;AAAA,IAClB,IAAM,EAAA,OAAA;AAAA,IACN,OAAS,EAAA,IAAA;AAAA,GACX;AAAA;AAAA;AAAA;AAAA,EAIA,qBAAuB,EAAA;AAAA,IACrB,IAAM,EAAA,MAAA;AAAA,IACN,MAAQ,EAAA,qBAAA;AAAA,IACR,OAAS,EAAA,OAAA;AAAA,GACX;AACF,CAAU,EAAA;AAEH,MAAM,cAAiB,GAAA;AAAA;AAAA;AAAA;AAAA,EAI5B,QAAQ,MAAM,IAAA;AAAA;AAAA;AAAA;AAAA,EAId,SAAS,MAAM,IAAA;AAAA;AAAA;AAAA;AAAA,EAIf,OAAO,MAAM,IAAA;AAAA,EACb,eAAe,MAAM,IAAA;AACvB;;;;;;"}

package/lib/packages/components/new-drawer/src/drawer.vue2.js

@@ -30,12 +30,9 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
         result.footer = null;
       return result;
     });
-    const isShowContentTopBox = vue.computed(() => {
-      return props.isShowTopShadow && scrollPosition.value && isHasScrollBar.value && scrollPosition.value !== "top";
-    });
     const isShowContentBottomBox = vue.computed(() => {
-      if (props.isShowTopShadow) {
-        return isHasScrollBar.value && scrollPosition.value !== "bottom";
+      if (props.footerShadowPlacement === "inner") {
+        return props.isShowFooterShadow && isHasScrollBar.value && scrollPosition.value !== "bottom";
       } else {
         return props.isShowFooterShadow;
       }
@@ -82,18 +79,6 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
                   class: vue.normalizeClass([vue.unref(bem).e("content")])
                 },
                 [
-                  vue.createCommentVNode(" \u5185\u5BB9\u533A\u57DF\u9876\u90E8\u7684\u76D2\u5B50\u7528\u4E8E\u6EDA\u52A8\u906E\u76D6/\u9634\u5F71 \u53EA\u6709\u6EDA\u52A8\u72B6\u6001\u4E0B\u624D\u6709\uFF0C\u6EDA\u52A8\u5230\u9876\u90E8\u9700\u8981 "),
-                  vue.withDirectives(vue.createElementVNode(
-                    "div",
-                    {
-                      class: vue.normalizeClass(vue.unref(bem).e("content-top-shadow"))
-                    },
-                    null,
-                    2
-                    /* CLASS */
-                  ), [
-                    [vue.vShow, isShowContentTopBox.value]
-                  ]),
                   vue.renderSlot(_ctx.$slots, "default")
                 ],
                 2

package/lib/packages/components/new-drawer/src/drawer.vue2.js.map

@@ -1 +1 @@
-{"version":3,"file":"drawer.vue2.js","sources":["../../../../../../packages/components/new-drawer/src/drawer.vue"],"sourcesContent":["<template>\n  <Drawer\n    v-bind=\"getBindValue\"\n    :title=\"title\"\n    :open=\"open\"\n    :root-class-name=\"`${bem.b()} ${rootClassName}`\"\n    @close=\"handleClose\"\n  >\n    <template #title>\n      <slot name=\"title\" />\n    </template>\n    <template #extra>\n      <slot name=\"extra\" />\n    </template>\n    <div :class=\"[bem.e('container')]\">\n      <!-- 内容区域 -->\n      <div ref=\"scrollRef\" :class=\"[bem.e('content')]\">\n        <!-- 内容区域顶部的盒子用于滚动遮盖/阴影 只有滚动状态下才有，滚动到顶部需要 -->\n        <div\n          v-show=\"isShowContentTopBox\"\n          :class=\"bem.e('content-top-shadow')\"\n        ></div>\n        <slot />\n      </div>\n    </div>\n    <!-- 底部区域 -->\n    <template v-if=\"showFooter\" #footer>\n      <div\n        :class=\"`${bem.e('footer')} ${\n          isShowContentBottomBox ? bem.e('footer-shadow') : ''\n        }`\"\n      >\n        <slot name=\"footer\">\n          <div :class=\"bem.e('footer-left')\">\n            <slot name=\"footer-left\" />\n          </div>\n          <div :class=\"bem.e('footer-right')\">\n            <slot name=\"footer-right\">\n              <ll-button\n                :class=\"bem.m('cancel')\"\n                :label=\"cancelText\"\n                v-bind=\"cancelButtonProps\"\n                @click=\"handleCancel\"\n              >\n              </ll-button>\n              <ll-button\n                type=\"primary\"\n                :loading=\"confirmLoading\"\n                :label=\"confirmText\"\n                v-bind=\"okButtonProps\"\n                @click=\"handleConfirm\"\n              >\n              </ll-button>\n            </slot>\n          </div>\n        </slot>\n      </div>\n    </template>\n  </Drawer>\n</template>\n\n<script setup lang=\"ts\">\nimport { computed, useAttrs } from 'vue'\n\nimport { Drawer } from 'ant-design-vue'\n\nimport { createNamespace } from '@ll-plus/utils'\nimport { useScroll } from '@ll-plus/hooks'\nimport { omit } from 'lodash-es'\nimport { newDrawerProps, newDrawerEmits } from './drawer'\n\nimport type { DrawerProps } from 'ant-design-vue'\n\ndefineOptions({ name: 'LlNewDrawer' })\n\n// 1.props/emits\nconst props = defineProps(newDrawerProps)\nconst emits = defineEmits(newDrawerEmits)\n\n// 2.hooks\nconst attrs = useAttrs()\nconst { scrollPosition, isHasScrollBar, scrollRef } = useScroll()\n\n// 3.ref/computed/const\nconst getBindValue = computed(() => {\n  const result: DrawerProps = {\n    ...omit({ ...attrs }, [...Object.keys(newDrawerProps), 'rootClassName'])\n  }\n  if (!props.showFooter) result.footer = null\n  return result\n})\n// 是否现实内容区域顶部的阴影div\nconst isShowContentTopBox = computed(() => {\n  return (\n    props.isShowTopShadow &&\n    scrollPosition.value &&\n    isHasScrollBar.value &&\n    scrollPosition.value !== 'top'\n  )\n})\n// 是否现实内容区域底部的阴影div\nconst isShowContentBottomBox = computed(() => {\n  // 如果顶部的阴影为true则说明是内部的容器在滚动产品的阴影 则由容器的滚动情况来决定阴影\n  if (props.isShowTopShadow) {\n    return isHasScrollBar.value && scrollPosition.value !== 'bottom'\n  } else {\n    // 如果顶部的阴影为false，则说明不是内部容器滚动，则底部的阴影由 外部的isShowFooterShadow来决定\n    return props.isShowFooterShadow\n  }\n})\nconst bem = createNamespace('new-drawer')\n\n// 4.methods\n// 点击关闭icon\nconst handleClose = (): void => {\n  emits('close')\n  emits('update:open')\n}\n// 点击取消按钮\nconst handleCancel = (): void => {\n  emits('cancel')\n  emits('update:open')\n}\n// 点击确定按钮\nconst handleConfirm = (): void => {\n  emits('confirm')\n}\n</script>\n"],"names":["useAttrs","useScroll","computed","omit","newDrawerProps","createNamespace"],"mappings":";;;;;;;;;;;;;;;;;;;;AA4EA,IAAA,MAAM,KAAQ,GAAA,OAAA,CAAA;AACd,IAAA,MAAM,KAAQ,GAAA,MAAA,CAAA;AAGd,IAAA,MAAM,QAAQA,YAAS,EAAA,CAAA;AACvB,IAAA,MAAM,EAAE,cAAA,EAAgB,cAAgB,EAAA,SAAA,KAAcC,eAAU,EAAA,CAAA;AAGhE,IAAM,MAAA,YAAA,GAAeC,aAAS,MAAM;AAClC,MAAA,MAAM,MAAsB,GAAA;AAAA,QAC1B,GAAGC,aAAA,CAAK,EAAE,GAAG,KAAM,EAAA,EAAG,CAAC,GAAG,MAAO,CAAA,IAAA,CAAKC,qBAAc,CAAA,EAAG,eAAe,CAAC,CAAA;AAAA,OACzE,CAAA;AACA,MAAA,IAAI,CAAC,KAAM,CAAA,UAAA;AAAY,QAAA,MAAA,CAAO,MAAS,GAAA,IAAA,CAAA;AACvC,MAAO,OAAA,MAAA,CAAA;AAAA,KACR,CAAA,CAAA;AAED,IAAM,MAAA,mBAAA,GAAsBF,aAAS,MAAM;AACzC,MAAA,OACE,MAAM,eACN,IAAA,cAAA,CAAe,SACf,cAAe,CAAA,KAAA,IACf,eAAe,KAAU,KAAA,KAAA,CAAA;AAAA,KAE5B,CAAA,CAAA;AAED,IAAM,MAAA,sBAAA,GAAyBA,aAAS,MAAM;AAE5C,MAAA,IAAI,MAAM,eAAiB,EAAA;AACzB,QAAO,OAAA,cAAA,CAAe,KAAS,IAAA,cAAA,CAAe,KAAU,KAAA,QAAA,CAAA;AAAA,OACnD,MAAA;AAEL,QAAA,OAAO,KAAM,CAAA,kBAAA,CAAA;AAAA,OACf;AAAA,KACD,CAAA,CAAA;AACD,IAAM,MAAA,GAAA,GAAMG,gCAAgB,YAAY,CAAA,CAAA;AAIxC,IAAA,MAAM,cAAc,MAAY;AAC9B,MAAA,KAAA,CAAM,OAAO,CAAA,CAAA;AACb,MAAA,KAAA,CAAM,aAAa,CAAA,CAAA;AAAA,KACrB,CAAA;AAEA,IAAA,MAAM,eAAe,MAAY;AAC/B,MAAA,KAAA,CAAM,QAAQ,CAAA,CAAA;AACd,MAAA,KAAA,CAAM,aAAa,CAAA,CAAA;AAAA,KACrB,CAAA;AAEA,IAAA,MAAM,gBAAgB,MAAY;AAChC,MAAA,KAAA,CAAM,SAAS,CAAA,CAAA;AAAA,KACjB,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"drawer.vue2.js","sources":["../../../../../../packages/components/new-drawer/src/drawer.vue"],"sourcesContent":["<template>\n  <Drawer\n    v-bind=\"getBindValue\"\n    :title=\"title\"\n    :open=\"open\"\n    :root-class-name=\"`${bem.b()} ${rootClassName}`\"\n    @close=\"handleClose\"\n  >\n    <!-- title插槽 -->\n    <template #title>\n      <slot name=\"title\" />\n    </template>\n    <!-- extra插槽 -->\n    <template #extra>\n      <slot name=\"extra\" />\n    </template>\n    <!-- 内容区域 -->\n    <div :class=\"[bem.e('container')]\">\n      <!-- 内容区域 -->\n      <div ref=\"scrollRef\" :class=\"[bem.e('content')]\">\n        <slot />\n      </div>\n    </div>\n    <!-- 底部区域 -->\n    <template v-if=\"showFooter\" #footer>\n      <div\n        :class=\"`${bem.e('footer')} ${\n          isShowContentBottomBox ? bem.e('footer-shadow') : ''\n        }`\"\n      >\n        <slot name=\"footer\">\n          <div :class=\"bem.e('footer-left')\">\n            <slot name=\"footer-left\" />\n          </div>\n          <div :class=\"bem.e('footer-right')\">\n            <slot name=\"footer-right\">\n              <ll-button\n                :class=\"bem.m('cancel')\"\n                :label=\"cancelText\"\n                v-bind=\"cancelButtonProps\"\n                @click=\"handleCancel\"\n              >\n              </ll-button>\n              <ll-button\n                type=\"primary\"\n                :loading=\"confirmLoading\"\n                :label=\"confirmText\"\n                v-bind=\"okButtonProps\"\n                @click=\"handleConfirm\"\n              >\n              </ll-button>\n            </slot>\n          </div>\n        </slot>\n      </div>\n    </template>\n  </Drawer>\n</template>\n\n<script setup lang=\"ts\">\nimport { computed, useAttrs } from 'vue'\n\nimport { Drawer } from 'ant-design-vue'\n\nimport { createNamespace } from '@ll-plus/utils'\nimport { useScroll } from '@ll-plus/hooks'\nimport { omit } from 'lodash-es'\nimport { newDrawerProps, newDrawerEmits } from './drawer'\n\nimport type { DrawerProps } from 'ant-design-vue'\n\ndefineOptions({ name: 'LlNewDrawer' })\n\n// 1.props/emits\nconst props = defineProps(newDrawerProps)\nconst emits = defineEmits(newDrawerEmits)\n\n// 2.hooks\nconst attrs = useAttrs()\nconst { scrollPosition, isHasScrollBar, scrollRef } = useScroll()\n\n// 3.ref/computed/const\nconst getBindValue = computed(() => {\n  const result: DrawerProps = {\n    ...omit({ ...attrs }, [...Object.keys(newDrawerProps), 'rootClassName'])\n  }\n  if (!props.showFooter) result.footer = null\n  return result\n})\n// 是否显示底部的阴影div\nconst isShowContentBottomBox = computed(() => {\n  // 如果顶部的阴影为true则说明是内部的容器在滚动产品的阴影 则由容器的滚动情况来决定阴影\n  if (props.footerShadowPlacement === 'inner') {\n    return (\n      props.isShowFooterShadow &&\n      isHasScrollBar.value &&\n      scrollPosition.value !== 'bottom'\n    )\n  } else {\n    // 如果顶部的阴影为false，则说明不是内部容器滚动，则底部的阴影由 外部的isShowFooterShadow来决定\n    return props.isShowFooterShadow\n  }\n})\nconst bem = createNamespace('new-drawer')\n\n// 4.methods\n// 点击关闭icon\nconst handleClose = (): void => {\n  emits('close')\n  emits('update:open')\n}\n// 点击取消按钮\nconst handleCancel = (): void => {\n  emits('cancel')\n  emits('update:open')\n}\n// 点击确定按钮\nconst handleConfirm = (): void => {\n  emits('confirm')\n}\n</script>\n"],"names":["useAttrs","useScroll","computed","omit","newDrawerProps","createNamespace"],"mappings":";;;;;;;;;;;;;;;;;;;;AA0EA,IAAA,MAAM,KAAQ,GAAA,OAAA,CAAA;AACd,IAAA,MAAM,KAAQ,GAAA,MAAA,CAAA;AAGd,IAAA,MAAM,QAAQA,YAAS,EAAA,CAAA;AACvB,IAAA,MAAM,EAAE,cAAA,EAAgB,cAAgB,EAAA,SAAA,KAAcC,eAAU,EAAA,CAAA;AAGhE,IAAM,MAAA,YAAA,GAAeC,aAAS,MAAM;AAClC,MAAA,MAAM,MAAsB,GAAA;AAAA,QAC1B,GAAGC,aAAA,CAAK,EAAE,GAAG,KAAM,EAAA,EAAG,CAAC,GAAG,MAAO,CAAA,IAAA,CAAKC,qBAAc,CAAA,EAAG,eAAe,CAAC,CAAA;AAAA,OACzE,CAAA;AACA,MAAA,IAAI,CAAC,KAAM,CAAA,UAAA;AAAY,QAAA,MAAA,CAAO,MAAS,GAAA,IAAA,CAAA;AACvC,MAAO,OAAA,MAAA,CAAA;AAAA,KACR,CAAA,CAAA;AAED,IAAM,MAAA,sBAAA,GAAyBF,aAAS,MAAM;AAE5C,MAAI,IAAA,KAAA,CAAM,0BAA0B,OAAS,EAAA;AAC3C,QAAA,OACE,KAAM,CAAA,kBAAA,IACN,cAAe,CAAA,KAAA,IACf,eAAe,KAAU,KAAA,QAAA,CAAA;AAAA,OAEtB,MAAA;AAEL,QAAA,OAAO,KAAM,CAAA,kBAAA,CAAA;AAAA,OACf;AAAA,KACD,CAAA,CAAA;AACD,IAAM,MAAA,GAAA,GAAMG,gCAAgB,YAAY,CAAA,CAAA;AAIxC,IAAA,MAAM,cAAc,MAAY;AAC9B,MAAA,KAAA,CAAM,OAAO,CAAA,CAAA;AACb,MAAA,KAAA,CAAM,aAAa,CAAA,CAAA;AAAA,KACrB,CAAA;AAEA,IAAA,MAAM,eAAe,MAAY;AAC/B,MAAA,KAAA,CAAM,QAAQ,CAAA,CAAA;AACd,MAAA,KAAA,CAAM,aAAa,CAAA,CAAA;AAAA,KACrB,CAAA;AAEA,IAAA,MAAM,gBAAgB,MAAY;AAChC,MAAA,KAAA,CAAM,SAAS,CAAA,CAAA;AAAA,KACjB,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/lib/packages/components/new-modal/src/modal.js

@@ -1,7 +1,9 @@
 'use strict';
 
 require('../../../utils/index.js');
+require('../../new-drawer/index.js');
 var runtime = require('../../../utils/props/runtime.js');
+var drawer = require('../../new-drawer/src/drawer.js');
 
 "use strict";
 const modalType = ["confirm", "operate"];
@@ -55,18 +57,19 @@ const newModalProps = runtime.buildProps({
     default: ""
   },
   /**
-   * @description 容器内容的顶部的阴影 设置为false标记可能是外部其他元素滚动
+   * @description 滚动是否显示底部阴影
    */
-  isShowTopShadow: {
+  isShowFooterShadow: {
     type: Boolean,
     default: true
   },
   /**
-   * @description 容器内容底部的阴影
+   * @description 决定底部阴影的方向(外部和内部）,默认由内容区域来决定
    */
-  isShowFooterShadow: {
-    type: Boolean,
-    default: true
+  footerShadowPlacement: {
+    type: String,
+    values: drawer.footerShadowPlacement,
+    default: "inner"
   },
   /**
    * @description 确认按钮文字

package/lib/packages/components/new-modal/src/modal.js.map

@@ -1 +1 @@
-{"version":3,"file":"modal.js","sources":["../../../../../../packages/components/new-modal/src/modal.ts"],"sourcesContent":["import { buildProps, definePropType } from '@ll-plus/utils'\n\nimport type { ExtractPropTypes } from 'vue'\nimport type Modal from './modal.vue'\nimport type { ButtonProps } from '@ll-plus/components'\n\n// modal的类型 确认框和操作框\nexport const modalType = ['confirm', 'operate'] as const\n\nexport const newModalProps = buildProps({\n  /**\n   * @description 弹窗是否可见\n   */\n  open: {\n    type: Boolean,\n    default: false\n  },\n  /**\n   * @description 标题\n   */\n  title: {\n    type: String,\n    default: '提示'\n  },\n  /**\n   * @description  确认/知道了按钮loading\n   */\n  confirmLoading: {\n    type: Boolean,\n    default: false\n  },\n  /**\n   * @description 取消按钮的配置信息\n   */\n  cancelButtonProps: {\n    type: definePropType<ButtonProps>(Object)\n  },\n  /**\n   * @description 确认按钮的配置信息\n   */\n  okButtonProps: {\n    type: definePropType<ButtonProps>(Object)\n  },\n  /**\n   * @description 弹窗类型 确认/操作框\n   */\n  type: {\n    type: String,\n    values: modalType,\n    default: 'operate'\n  },\n  /**\n   * @description 弹窗外层容器的类名\n   */\n  wrapClassName: {\n    type: String,\n    default: ''\n  },\n  /**\n   * @description 容器内容的顶部的阴影 设置为false标记可能是外部其他元素滚动\n   */\n  isShowTopShadow: {\n    type: Boolean,\n    default: true\n  },\n  /**\n   * @description 容器内容底部的阴影\n   */\n  isShowFooterShadow: {\n    type: Boolean,\n    default: true\n  },\n  /**\n   * @description 确认按钮文字\n   */\n  confirmText: {\n    type: String,\n    default: ''\n  },\n  /**\n   * @description 取消按钮文字\n   */\n  cancelText: {\n    type: String,\n    default: '取消'\n  },\n  /**\n   * @description 显示底部\n   */\n  showFooter: {\n    type: Boolean,\n    default: true\n  }\n} as const)\n\nexport const newModalEmits = {\n  /**\n   * @description 点击取消时触发\n   */\n  cancel: () => true,\n  /**\n   * @description 点击确认时触发\n   */\n  ok: () => true,\n  'update:open': () => true\n} as const\n\n// props\nexport type NewModalProps = ExtractPropTypes<typeof newModalProps>\n\n// emits\nexport type NewModalEmits = typeof newModalEmits\nexport type ModalType = NewModalProps['type']\n\n// instance\nexport type NewModalInstance = InstanceType<typeof Modal>\n"],"names":["buildProps","definePropType"],"mappings":";;;;;;AAOa,MAAA,SAAA,GAAY,CAAC,SAAA,EAAW,SAAS,EAAA;AAEvC,MAAM,gBAAgBA,kBAAW,CAAA;AAAA;AAAA;AAAA;AAAA,EAItC,IAAM,EAAA;AAAA,IACJ,IAAM,EAAA,OAAA;AAAA,IACN,OAAS,EAAA,KAAA;AAAA,GACX;AAAA;AAAA;AAAA;AAAA,EAIA,KAAO,EAAA;AAAA,IACL,IAAM,EAAA,MAAA;AAAA,IACN,OAAS,EAAA,cAAA;AAAA,GACX;AAAA;AAAA;AAAA;AAAA,EAIA,cAAgB,EAAA;AAAA,IACd,IAAM,EAAA,OAAA;AAAA,IACN,OAAS,EAAA,KAAA;AAAA,GACX;AAAA;AAAA;AAAA;AAAA,EAIA,iBAAmB,EAAA;AAAA,IACjB,IAAA,EAAMC,uBAA4B,MAAM,CAAA;AAAA,GAC1C;AAAA;AAAA;AAAA;AAAA,EAIA,aAAe,EAAA;AAAA,IACb,IAAA,EAAMA,uBAA4B,MAAM,CAAA;AAAA,GAC1C;AAAA;AAAA;AAAA;AAAA,EAIA,IAAM,EAAA;AAAA,IACJ,IAAM,EAAA,MAAA;AAAA,IACN,MAAQ,EAAA,SAAA;AAAA,IACR,OAAS,EAAA,SAAA;AAAA,GACX;AAAA;AAAA;AAAA;AAAA,EAIA,aAAe,EAAA;AAAA,IACb,IAAM,EAAA,MAAA;AAAA,IACN,OAAS,EAAA,EAAA;AAAA,GACX;AAAA;AAAA;AAAA;AAAA,EAIA,eAAiB,EAAA;AAAA,IACf,IAAM,EAAA,OAAA;AAAA,IACN,OAAS,EAAA,IAAA;AAAA,GACX;AAAA;AAAA;AAAA;AAAA,EAIA,kBAAoB,EAAA;AAAA,IAClB,IAAM,EAAA,OAAA;AAAA,IACN,OAAS,EAAA,IAAA;AAAA,GACX;AAAA;AAAA;AAAA;AAAA,EAIA,WAAa,EAAA;AAAA,IACX,IAAM,EAAA,MAAA;AAAA,IACN,OAAS,EAAA,EAAA;AAAA,GACX;AAAA;AAAA;AAAA;AAAA,EAIA,UAAY,EAAA;AAAA,IACV,IAAM,EAAA,MAAA;AAAA,IACN,OAAS,EAAA,cAAA;AAAA,GACX;AAAA;AAAA;AAAA;AAAA,EAIA,UAAY,EAAA;AAAA,IACV,IAAM,EAAA,OAAA;AAAA,IACN,OAAS,EAAA,IAAA;AAAA,GACX;AACF,CAAU,EAAA;AAEH,MAAM,aAAgB,GAAA;AAAA;AAAA;AAAA;AAAA,EAI3B,QAAQ,MAAM,IAAA;AAAA;AAAA;AAAA;AAAA,EAId,IAAI,MAAM,IAAA;AAAA,EACV,eAAe,MAAM,IAAA;AACvB;;;;;;"}
+{"version":3,"file":"modal.js","sources":["../../../../../../packages/components/new-modal/src/modal.ts"],"sourcesContent":["import { buildProps, definePropType } from '@ll-plus/utils'\nimport { footerShadowPlacement } from '../../new-drawer'\n\nimport type { ExtractPropTypes } from 'vue'\nimport type Modal from './modal.vue'\nimport type { ButtonProps } from '@ll-plus/components'\n\n// modal的类型 确认框和操作框\nexport const modalType = ['confirm', 'operate'] as const\n\nexport const newModalProps = buildProps({\n  /**\n   * @description 弹窗是否可见\n   */\n  open: {\n    type: Boolean,\n    default: false\n  },\n  /**\n   * @description 标题\n   */\n  title: {\n    type: String,\n    default: '提示'\n  },\n  /**\n   * @description  确认/知道了按钮loading\n   */\n  confirmLoading: {\n    type: Boolean,\n    default: false\n  },\n  /**\n   * @description 取消按钮的配置信息\n   */\n  cancelButtonProps: {\n    type: definePropType<ButtonProps>(Object)\n  },\n  /**\n   * @description 确认按钮的配置信息\n   */\n  okButtonProps: {\n    type: definePropType<ButtonProps>(Object)\n  },\n  /**\n   * @description 弹窗类型 确认/操作框\n   */\n  type: {\n    type: String,\n    values: modalType,\n    default: 'operate'\n  },\n  /**\n   * @description 弹窗外层容器的类名\n   */\n  wrapClassName: {\n    type: String,\n    default: ''\n  },\n  /**\n   * @description 滚动是否显示底部阴影\n   */\n  isShowFooterShadow: {\n    type: Boolean,\n    default: true\n  },\n  /**\n   * @description 决定底部阴影的方向(外部和内部）,默认由内容区域来决定\n   */\n  footerShadowPlacement: {\n    type: String,\n    values: footerShadowPlacement,\n    default: 'inner'\n  },\n  /**\n   * @description 确认按钮文字\n   */\n  confirmText: {\n    type: String,\n    default: ''\n  },\n  /**\n   * @description 取消按钮文字\n   */\n  cancelText: {\n    type: String,\n    default: '取消'\n  },\n  /**\n   * @description 显示底部\n   */\n  showFooter: {\n    type: Boolean,\n    default: true\n  }\n} as const)\n\nexport const newModalEmits = {\n  /**\n   * @description 点击取消时触发\n   */\n  cancel: () => true,\n  /**\n   * @description 点击确认时触发\n   */\n  ok: () => true,\n  'update:open': () => true\n} as const\n\n// props\nexport type NewModalProps = ExtractPropTypes<typeof newModalProps>\n\n// emits\nexport type NewModalEmits = typeof newModalEmits\nexport type ModalType = NewModalProps['type']\n\n// instance\nexport type NewModalInstance = InstanceType<typeof Modal>\n"],"names":["buildProps","definePropType","footerShadowPlacement"],"mappings":";;;;;;;;AAQa,MAAA,SAAA,GAAY,CAAC,SAAA,EAAW,SAAS,EAAA;AAEvC,MAAM,gBAAgBA,kBAAW,CAAA;AAAA;AAAA;AAAA;AAAA,EAItC,IAAM,EAAA;AAAA,IACJ,IAAM,EAAA,OAAA;AAAA,IACN,OAAS,EAAA,KAAA;AAAA,GACX;AAAA;AAAA;AAAA;AAAA,EAIA,KAAO,EAAA;AAAA,IACL,IAAM,EAAA,MAAA;AAAA,IACN,OAAS,EAAA,cAAA;AAAA,GACX;AAAA;AAAA;AAAA;AAAA,EAIA,cAAgB,EAAA;AAAA,IACd,IAAM,EAAA,OAAA;AAAA,IACN,OAAS,EAAA,KAAA;AAAA,GACX;AAAA;AAAA;AAAA;AAAA,EAIA,iBAAmB,EAAA;AAAA,IACjB,IAAA,EAAMC,uBAA4B,MAAM,CAAA;AAAA,GAC1C;AAAA;AAAA;AAAA;AAAA,EAIA,aAAe,EAAA;AAAA,IACb,IAAA,EAAMA,uBAA4B,MAAM,CAAA;AAAA,GAC1C;AAAA;AAAA;AAAA;AAAA,EAIA,IAAM,EAAA;AAAA,IACJ,IAAM,EAAA,MAAA;AAAA,IACN,MAAQ,EAAA,SAAA;AAAA,IACR,OAAS,EAAA,SAAA;AAAA,GACX;AAAA;AAAA;AAAA;AAAA,EAIA,aAAe,EAAA;AAAA,IACb,IAAM,EAAA,MAAA;AAAA,IACN,OAAS,EAAA,EAAA;AAAA,GACX;AAAA;AAAA;AAAA;AAAA,EAIA,kBAAoB,EAAA;AAAA,IAClB,IAAM,EAAA,OAAA;AAAA,IACN,OAAS,EAAA,IAAA;AAAA,GACX;AAAA;AAAA;AAAA;AAAA,EAIA,qBAAuB,EAAA;AAAA,IACrB,IAAM,EAAA,MAAA;AAAA,IACN,MAAQ,EAAAC,4BAAA;AAAA,IACR,OAAS,EAAA,OAAA;AAAA,GACX;AAAA;AAAA;AAAA;AAAA,EAIA,WAAa,EAAA;AAAA,IACX,IAAM,EAAA,MAAA;AAAA,IACN,OAAS,EAAA,EAAA;AAAA,GACX;AAAA;AAAA;AAAA;AAAA,EAIA,UAAY,EAAA;AAAA,IACV,IAAM,EAAA,MAAA;AAAA,IACN,OAAS,EAAA,cAAA;AAAA,GACX;AAAA;AAAA;AAAA;AAAA,EAIA,UAAY,EAAA;AAAA,IACV,IAAM,EAAA,OAAA;AAAA,IACN,OAAS,EAAA,IAAA;AAAA,GACX;AACF,CAAU,EAAA;AAEH,MAAM,aAAgB,GAAA;AAAA;AAAA;AAAA;AAAA,EAI3B,QAAQ,MAAM,IAAA;AAAA;AAAA;AAAA;AAAA,EAId,IAAI,MAAM,IAAA;AAAA,EACV,eAAe,MAAM,IAAA;AACvB;;;;;;"}

package/lib/packages/components/new-modal/src/modal.vue2.js

@@ -33,12 +33,9 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
         result.footer = null;
       return result;
     });
-    const isShowContentTopBox = vue.computed(() => {
-      return props.isShowTopShadow && scrollPosition.value && isHasScrollBar.value && scrollPosition.value !== "top";
-    });
     const isShowContentBottomBox = vue.computed(() => {
-      if (props.isShowTopShadow) {
-        return isHasScrollBar.value && scrollPosition.value !== "bottom";
+      if (props.footerShadowPlacement === "inner") {
+        return props.isShowFooterShadow && isHasScrollBar.value && scrollPosition.value !== "bottom";
       } else {
         return props.isShowFooterShadow;
       }
@@ -71,18 +68,6 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
               class: vue.normalizeClass([vue.unref(bem).e("container")])
             },
             [
-              vue.createCommentVNode(" \u5185\u5BB9\u533A\u57DF\u9876\u90E8\u7684\u76D2\u5B50\u7528\u4E8E\u6EDA\u52A8\u906E\u76D6/\u9634\u5F71 \u53EA\u6709\u6EDA\u52A8\u72B6\u6001\u4E0B\u624D\u6709\uFF0C\u6EDA\u52A8\u5230\u9876\u90E8\u9700\u8981 "),
-              vue.withDirectives(vue.createElementVNode(
-                "div",
-                {
-                  class: vue.normalizeClass(vue.unref(bem).e("content-top-shadow"))
-                },
-                null,
-                2
-                /* CLASS */
-              ), [
-                [vue.vShow, isShowContentTopBox.value]
-              ]),
               vue.renderSlot(_ctx.$slots, "default")
             ],
             2

package/lib/packages/components/new-modal/src/modal.vue2.js.map

@@ -1 +1 @@
-{"version":3,"file":"modal.vue2.js","sources":["../../../../../../packages/components/new-modal/src/modal.vue"],"sourcesContent":["<template>\n  <Modal\n    v-bind=\"getBindValue\"\n    ref=\"modal\"\n    :open=\"open\"\n    :title=\"title\"\n    :wrap-class-name=\"`${bem.b()} ${wrapClassName}`\"\n    :class=\"[bem.is(type === 'confirm' ? 'confirm-modal' : '')]\"\n    @cancel=\"handleCancel\"\n    @ok=\"handleOk\"\n  >\n    <!-- 内容区域 -->\n    <div ref=\"scrollRef\" :class=\"[bem.e('container')]\">\n      <!-- 内容区域顶部的盒子用于滚动遮盖/阴影 只有滚动状态下才有，滚动到顶部需要 -->\n      <div\n        v-show=\"isShowContentTopBox\"\n        :class=\"bem.e('content-top-shadow')\"\n      ></div>\n      <slot />\n    </div>\n    <!-- 底部区域 -->\n    <template v-if=\"showFooter\" #footer>\n      <div\n        :class=\"`${bem.e('footer')} ${\n          isShowContentBottomBox ? bem.e('footer-shadow') : ''\n        }`\"\n      >\n        <slot name=\"footer\">\n          <ll-button\n            v-if=\"type !== 'confirm'\"\n            :label=\"cancelText\"\n            size=\"middle\"\n            v-bind=\"cancelButtonProps\"\n            @click=\"handleCancel\"\n          >\n          </ll-button>\n          <ll-button\n            type=\"primary\"\n            :loading=\"props.confirmLoading\"\n            size=\"middle\"\n            :label=\"\n              props.confirmText\n                ? props.confirmText\n                : props.type === 'confirm'\n                ? '知道了'\n                : '确认'\n            \"\n            v-bind=\"okButtonProps\"\n            @click=\"handleOk\"\n          />\n        </slot>\n      </div>\n    </template>\n  </Modal>\n</template>\n\n<script lang=\"ts\" setup>\nimport { useAttrs, ref, computed } from 'vue'\n\nimport { Modal } from 'ant-design-vue'\nimport { LlButton } from '@ll-plus/components'\n\nimport { createNamespace } from '@ll-plus/utils'\nimport { omit } from 'lodash-es'\nimport { newModalProps, newModalEmits } from './modal'\nimport { useScroll } from '@ll-plus/hooks'\n\nimport type { ModalProps } from 'ant-design-vue'\n\ndefineOptions({ name: 'LlNewModal' })\n\n// 1.props/emits\nconst props = defineProps(newModalProps)\nconst emits = defineEmits(newModalEmits)\n\n// 2.hooks\nconst attrs = useAttrs()\nconst { scrollPosition, isHasScrollBar, scrollRef } = useScroll()\n\n// 3.ref/computed/const\nconst modal = ref<HTMLElement>()\nconst getBindValue = computed(() => {\n  const result: ModalProps = {\n    ...omit({ ...attrs }, [...Object.keys(newModalProps), 'wrapClassName'])\n  }\n  if (!props.showFooter) result.footer = null\n  return result\n})\n// 是否现实内容区域顶部的阴影div\nconst isShowContentTopBox = computed(() => {\n  return (\n    props.isShowTopShadow &&\n    scrollPosition.value &&\n    isHasScrollBar.value &&\n    scrollPosition.value !== 'top'\n  )\n})\n// 是否现实内容区域底部的阴影div\nconst isShowContentBottomBox = computed(() => {\n  // 如果顶部的阴影为true则说明是内部的容器在滚动产品的阴影 则由容器的滚动情况来决定阴影\n  if (props.isShowTopShadow) {\n    return isHasScrollBar.value && scrollPosition.value !== 'bottom'\n  } else {\n    // 如果顶部的阴影为false，则说明不是内部容器滚动，则底部的阴影由 外部的isShowFooterShadow来决定\n    return props.isShowFooterShadow\n  }\n})\nconst bem = createNamespace('new-modal')\n\n// 3.methods\nconst handleCancel = () => {\n  emits('cancel')\n  emits('update:open')\n}\nconst handleOk = () => {\n  emits('ok')\n}\n</script>\n"],"names":["useAttrs","useScroll","modal","ref","computed","omit","newModalProps","createNamespace"],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAwEA,IAAA,MAAM,KAAQ,GAAA,OAAA,CAAA;AACd,IAAA,MAAM,KAAQ,GAAA,MAAA,CAAA;AAGd,IAAA,MAAM,QAAQA,YAAS,EAAA,CAAA;AACvB,IAAA,MAAM,EAAE,cAAA,EAAgB,cAAgB,EAAA,SAAA,KAAcC,eAAU,EAAA,CAAA;AAGhE,IAAA,MAAMC,UAAQC,OAAiB,EAAA,CAAA;AAC/B,IAAM,MAAA,YAAA,GAAeC,aAAS,MAAM;AAClC,MAAA,MAAM,MAAqB,GAAA;AAAA,QACzB,GAAGC,aAAA,CAAK,EAAE,GAAG,KAAM,EAAA,EAAG,CAAC,GAAG,MAAO,CAAA,IAAA,CAAKC,mBAAa,CAAA,EAAG,eAAe,CAAC,CAAA;AAAA,OACxE,CAAA;AACA,MAAA,IAAI,CAAC,KAAM,CAAA,UAAA;AAAY,QAAA,MAAA,CAAO,MAAS,GAAA,IAAA,CAAA;AACvC,MAAO,OAAA,MAAA,CAAA;AAAA,KACR,CAAA,CAAA;AAED,IAAM,MAAA,mBAAA,GAAsBF,aAAS,MAAM;AACzC,MAAA,OACE,MAAM,eACN,IAAA,cAAA,CAAe,SACf,cAAe,CAAA,KAAA,IACf,eAAe,KAAU,KAAA,KAAA,CAAA;AAAA,KAE5B,CAAA,CAAA;AAED,IAAM,MAAA,sBAAA,GAAyBA,aAAS,MAAM;AAE5C,MAAA,IAAI,MAAM,eAAiB,EAAA;AACzB,QAAO,OAAA,cAAA,CAAe,KAAS,IAAA,cAAA,CAAe,KAAU,KAAA,QAAA,CAAA;AAAA,OACnD,MAAA;AAEL,QAAA,OAAO,KAAM,CAAA,kBAAA,CAAA;AAAA,OACf;AAAA,KACD,CAAA,CAAA;AACD,IAAM,MAAA,GAAA,GAAMG,gCAAgB,WAAW,CAAA,CAAA;AAGvC,IAAA,MAAM,eAAe,MAAM;AACzB,MAAA,KAAA,CAAM,QAAQ,CAAA,CAAA;AACd,MAAA,KAAA,CAAM,aAAa,CAAA,CAAA;AAAA,KACrB,CAAA;AACA,IAAA,MAAM,WAAW,MAAM;AACrB,MAAA,KAAA,CAAM,IAAI,CAAA,CAAA;AAAA,KACZ,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"modal.vue2.js","sources":["../../../../../../packages/components/new-modal/src/modal.vue"],"sourcesContent":["<template>\n  <Modal\n    v-bind=\"getBindValue\"\n    ref=\"modal\"\n    :open=\"open\"\n    :title=\"title\"\n    :wrap-class-name=\"`${bem.b()} ${wrapClassName}`\"\n    :class=\"[bem.is(type === 'confirm' ? 'confirm-modal' : '')]\"\n    @cancel=\"handleCancel\"\n    @ok=\"handleOk\"\n  >\n    <!-- 内容区域 -->\n    <div ref=\"scrollRef\" :class=\"[bem.e('container')]\">\n      <slot />\n    </div>\n    <!-- 底部区域 -->\n    <template v-if=\"showFooter\" #footer>\n      <div\n        :class=\"`${bem.e('footer')} ${\n          isShowContentBottomBox ? bem.e('footer-shadow') : ''\n        }`\"\n      >\n        <slot name=\"footer\">\n          <ll-button\n            v-if=\"type !== 'confirm'\"\n            :label=\"cancelText\"\n            size=\"middle\"\n            v-bind=\"cancelButtonProps\"\n            @click=\"handleCancel\"\n          >\n          </ll-button>\n          <ll-button\n            type=\"primary\"\n            :loading=\"props.confirmLoading\"\n            size=\"middle\"\n            :label=\"\n              props.confirmText\n                ? props.confirmText\n                : props.type === 'confirm'\n                ? '知道了'\n                : '确认'\n            \"\n            v-bind=\"okButtonProps\"\n            @click=\"handleOk\"\n          />\n        </slot>\n      </div>\n    </template>\n  </Modal>\n</template>\n\n<script lang=\"ts\" setup>\nimport { useAttrs, ref, computed } from 'vue'\n\nimport { Modal } from 'ant-design-vue'\nimport { LlButton } from '@ll-plus/components'\n\nimport { createNamespace } from '@ll-plus/utils'\nimport { omit } from 'lodash-es'\nimport { newModalProps, newModalEmits } from './modal'\nimport { useScroll } from '@ll-plus/hooks'\n\nimport type { ModalProps } from 'ant-design-vue'\n\ndefineOptions({ name: 'LlNewModal' })\n\n// 1.props/emits\nconst props = defineProps(newModalProps)\nconst emits = defineEmits(newModalEmits)\n\n// 2.hooks\nconst attrs = useAttrs()\nconst { scrollPosition, isHasScrollBar, scrollRef } = useScroll()\n\n// 3.ref/computed/const\nconst modal = ref<HTMLElement>()\nconst getBindValue = computed(() => {\n  const result: ModalProps = {\n    ...omit({ ...attrs }, [...Object.keys(newModalProps), 'wrapClassName'])\n  }\n  if (!props.showFooter) result.footer = null\n  return result\n})\n// 是否显示底部的阴影\nconst isShowContentBottomBox = computed(() => {\n  // 如果顶部的阴影为true则说明是内部的容器在滚动产品的阴影 则由容器的滚动情况来决定阴影\n  if (props.footerShadowPlacement === 'inner') {\n    return (\n      props.isShowFooterShadow &&\n      isHasScrollBar.value &&\n      scrollPosition.value !== 'bottom'\n    )\n  } else {\n    // 如果顶部的阴影为false，则说明不是内部容器滚动，则底部的阴影由 外部的isShowFooterShadow来决定\n    return props.isShowFooterShadow\n  }\n})\nconst bem = createNamespace('new-modal')\n\n// 3.methods\nconst handleCancel = () => {\n  emits('cancel')\n  emits('update:open')\n}\nconst handleOk = () => {\n  emits('ok')\n}\n</script>\n"],"names":["useAttrs","useScroll","modal","ref","computed","omit","newModalProps","createNamespace"],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAmEA,IAAA,MAAM,KAAQ,GAAA,OAAA,CAAA;AACd,IAAA,MAAM,KAAQ,GAAA,MAAA,CAAA;AAGd,IAAA,MAAM,QAAQA,YAAS,EAAA,CAAA;AACvB,IAAA,MAAM,EAAE,cAAA,EAAgB,cAAgB,EAAA,SAAA,KAAcC,eAAU,EAAA,CAAA;AAGhE,IAAA,MAAMC,UAAQC,OAAiB,EAAA,CAAA;AAC/B,IAAM,MAAA,YAAA,GAAeC,aAAS,MAAM;AAClC,MAAA,MAAM,MAAqB,GAAA;AAAA,QACzB,GAAGC,aAAA,CAAK,EAAE,GAAG,KAAM,EAAA,EAAG,CAAC,GAAG,MAAO,CAAA,IAAA,CAAKC,mBAAa,CAAA,EAAG,eAAe,CAAC,CAAA;AAAA,OACxE,CAAA;AACA,MAAA,IAAI,CAAC,KAAM,CAAA,UAAA;AAAY,QAAA,MAAA,CAAO,MAAS,GAAA,IAAA,CAAA;AACvC,MAAO,OAAA,MAAA,CAAA;AAAA,KACR,CAAA,CAAA;AAED,IAAM,MAAA,sBAAA,GAAyBF,aAAS,MAAM;AAE5C,MAAI,IAAA,KAAA,CAAM,0BAA0B,OAAS,EAAA;AAC3C,QAAA,OACE,KAAM,CAAA,kBAAA,IACN,cAAe,CAAA,KAAA,IACf,eAAe,KAAU,KAAA,QAAA,CAAA;AAAA,OAEtB,MAAA;AAEL,QAAA,OAAO,KAAM,CAAA,kBAAA,CAAA;AAAA,OACf;AAAA,KACD,CAAA,CAAA;AACD,IAAM,MAAA,GAAA,GAAMG,gCAAgB,WAAW,CAAA,CAAA;AAGvC,IAAA,MAAM,eAAe,MAAM;AACzB,MAAA,KAAA,CAAM,QAAQ,CAAA,CAAA;AACd,MAAA,KAAA,CAAM,aAAa,CAAA,CAAA;AAAA,KACrB,CAAA;AACA,IAAA,MAAM,WAAW,MAAM;AACrB,MAAA,KAAA,CAAM,IAAI,CAAA,CAAA;AAAA,KACZ,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/lib/utils/props/runtime.d.ts

@@ -27,6 +27,6 @@ export declare const buildProp: <Type = never, Value = never, Validator = never,
 export type TestProps = Record<string, {
     [epPropKey]: true;
 } | NativePropType | EpPropInput<any, any, any, any, any>>;
-export declare const buildProps: <Props extends Record<string, {
+export declare const buildProps: <Props extends Record<string, NativePropType | EpPropInput<any, any, any, any, any> | {
     __epPropKey: true;
-} | NativePropType | EpPropInput<any, any, any, any, any>>>(props: Props) => { [K in keyof Props]: IfEpProp<Props[K], Props[K], IfNativePropType<Props[K], Props[K], EpPropConvert<Props[K]>>>; };
+}>>(props: Props) => { [K in keyof Props]: IfEpProp<Props[K], Props[K], IfNativePropType<Props[K], Props[K], EpPropConvert<Props[K]>>>; };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ll-plus",
-  "version": "2.5.2",
+  "version": "2.5.4",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.mjs",

package/theme-chalk/css/breadcrumb-card.css

@@ -1 +1 @@
-.ll-breadcrumb-card{position:absolute;inset:0;z-index:100;overflow:auto;background:var(--color-bg-container);border-radius:6px}.ll-breadcrumb-card .ant-spin-nested-loading{height:100%}.ll-breadcrumb-card .ant-spin-nested-loading .ant-spin-container{height:100%}.ll-breadcrumb-card .ant-breadcrumb-separator{display:none}.ll-breadcrumb-card__container{position:relative;display:flex;flex-direction:column;height:100%}.ll-breadcrumb-card__header{display:flex;justify-content:space-between;align-items:center;height:56px;padding:0 20px;border-bottom:1px solid var(--color-border-secondary)}.ll-breadcrumb-card__header .ant-breadcrumb-link{display:flex;align-items:center}.ll-breadcrumb-card__back li{display:flex;align-items:center}.ll-breadcrumb-card__back-icon{margin-right:10px;font-size:16px;cursor:pointer}.ll-breadcrumb-card__title{font-size:16px;font-weight:500}.ll-breadcrumb-card__content{overflow:hidden;display:flex;flex-direction:column;flex:1;margin-top:24px;padding:0 60px 0}.ll-breadcrumb-card__content-container{flex:1;overflow:auto}.ll-breadcrumb-card__content-top-shadow{box-shadow:var(--pop-up-top-box-shadow);height:1px;width:100%;position:sticky;z-index:99;top:0}.ll-breadcrumb-card__footer{position:relative;width:100%;height:66px;position:relative;display:flex;justify-content:center;align-items:center}.ll-breadcrumb-card__footer-shadow{box-shadow:var(--pop-up-bottom-box-shadow)}
+.ll-breadcrumb-card{position:absolute;inset:0;z-index:100;overflow:auto;background:var(--color-bg-container);border-radius:6px}.ll-breadcrumb-card .ant-spin-nested-loading{height:100%}.ll-breadcrumb-card .ant-spin-nested-loading .ant-spin-container{height:100%}.ll-breadcrumb-card .ant-breadcrumb-separator{display:none}.ll-breadcrumb-card__container{position:relative;display:flex;flex-direction:column;height:100%}.ll-breadcrumb-card__header{display:flex;justify-content:space-between;align-items:center;height:56px;padding:0 20px;border-bottom:1px solid var(--color-border-secondary)}.ll-breadcrumb-card__header .ant-breadcrumb-link{display:flex;align-items:center}.ll-breadcrumb-card__back li{display:flex;align-items:center}.ll-breadcrumb-card__back-icon{margin-right:10px;font-size:16px;cursor:pointer}.ll-breadcrumb-card__title{font-size:16px;font-weight:500}.ll-breadcrumb-card__content{overflow:hidden;display:flex;flex-direction:column;flex:1}.ll-breadcrumb-card__content-container{flex:1;overflow:auto}.ll-breadcrumb-card__content-top-shadow{box-shadow:var(--pop-up-top-box-shadow);height:1px;width:100%;position:sticky;z-index:99;top:0}.ll-breadcrumb-card__footer{position:relative;width:100%;height:66px;position:relative;display:flex;justify-content:center;align-items:center}.ll-breadcrumb-card__footer-shadow{box-shadow:var(--pop-up-bottom-box-shadow)}