fix: 修复日志输出格式，确保高度值的拼接一致性

package/component/es/table/index.js

@@ -1510,7 +1510,7 @@ const _sfc_main = defineComponent({
     const soultop = ref(0);
     const soulleft = ref(0);
     const selcolumn = ref({});
-    const soulkey = ref();
+    const soulkey = ref("");
     const sxlist = ref({});
     function showsoul(event, column, key) {
       console.log(event);

package/component/es/upload/index2.js

@@ -1,5 +1,5 @@
 import { w as withInstall } from "../badge/index2.js";
-import { defineComponent, computed, openBlock, createElementBlock, normalizeStyle, unref, createCommentVNode, toDisplayString, normalizeClass, ref, watch, onMounted, nextTick, withModifiers, createElementVNode, Fragment, renderList, shallowRef, createTextVNode, createVNode, useSlots, inject, Transition, withCtx, createBlock, renderSlot, h, render, isVNode, getCurrentInstance, onUnmounted } from "vue";
+import { defineComponent, computed, openBlock, createElementBlock, normalizeStyle, unref, createCommentVNode, toDisplayString, normalizeClass, ref, watch, onMounted, nextTick, createElementVNode, Fragment, renderList, shallowRef, createTextVNode, createVNode, useSlots, inject, Transition, withCtx, createBlock, renderSlot, h, render, isVNode, getCurrentInstance, onUnmounted, withModifiers } from "vue";
 import { I as ImageCompressor } from "../_chunks/js-image-compressor/index.js";
 import { t as templateRef } from "../_chunks/@vueuse/index.js";
 import { _ as _sfc_main$9 } from "../button/index2.js";
@@ -632,7 +632,9 @@ function _objectSpread$3(e) {
   }
   return e;
 }
-var _hoisted_1$2 = ["onWheel"];
+var _hoisted_1$2 = {
+  class: "layui-layer-phimg"
+};
 var _hoisted_2$2 = ["src"];
 var _hoisted_3$2 = {
   key: 0,
@@ -702,20 +704,8 @@ var _sfc_main$2 = defineComponent(_objectSpread$3(_objectSpread$3({}, __default_
       });
       return res;
     });
-    var scale = ref(1);
-    var handleWheel = function handleWheel2(event) {
-      var delta = event.deltaY > 0 ? -0.1 : 0.1;
-      var newScale = scale.value + delta;
-      scale.value = Math.min(Math.max(newScale, 0.5), 3);
-    };
     return function(_ctx, _cache) {
-      return openBlock(), createElementBlock("div", {
+      return openBlock(), createElementBlock("div", _hoisted_1$2, [createElementVNode("img", {
-        class: "layui-layer-phimg",
-        onWheel: withModifiers(handleWheel, ["prevent"]),
-        style: normalizeStyle({
-          transform: "scale(".concat(scale.value, ")")
-        })
-      }, [createElementVNode("img", {
         src: __props.imgList[index2.value].src
       }, null, 8, _hoisted_2$2), __props.imgList.length > 0 ? (openBlock(), createElementBlock("div", _hoisted_3$2, [__props.imgList.length > 1 ? (openBlock(), createElementBlock("span", _hoisted_4$1, [createElementVNode("a", {
         href: "javascript:;",
@@ -750,7 +740,7 @@ var _sfc_main$2 = defineComponent(_objectSpread$3(_objectSpread$3({}, __default_
         style: normalizeStyle({
           left: "calc(calc( calc(100% - ".concat(100 * __props.imgList.length, "px) / 2) + ").concat(index2.value * 100, "px)")
         })
-      }, null, 4)])) : (openBlock(), createElementBlock("span", _hoisted_8$1, [__props.imgList[index2.value].alt ? (openBlock(), createElementBlock("span", _hoisted_9, toDisplayString(__props.imgList[index2.value].alt), 1)) : createCommentVNode("", true), __props.imgList.length > 1 ? (openBlock(), createElementBlock("em", _hoisted_10, toDisplayString(index2.value + 1) + " / " + toDisplayString(__props.imgList.length), 1)) : createCommentVNode("", true)]))], 4)) : createCommentVNode("", true)])) : createCommentVNode("", true)], 44, _hoisted_1$2);
+      }, null, 4)])) : (openBlock(), createElementBlock("span", _hoisted_8$1, [__props.imgList[index2.value].alt ? (openBlock(), createElementBlock("span", _hoisted_9, toDisplayString(__props.imgList[index2.value].alt), 1)) : createCommentVNode("", true), __props.imgList.length > 1 ? (openBlock(), createElementBlock("em", _hoisted_10, toDisplayString(index2.value + 1) + " / " + toDisplayString(__props.imgList.length), 1)) : createCommentVNode("", true)]))], 4)) : createCommentVNode("", true)])) : createCommentVNode("", true)]);
     };
   }
 }));
@@ -964,10 +954,11 @@ function calculateContent(title2, height, btn, type, isMessage) {
   if (height && height.indexOf("%") != -1) {
     height = "100%";
   }
+  console.log("btn", height + "px");
   if (btn && btn.length > 0) {
     if (type == 0) {
       if (title2) {
-        return "calc(" + height + " - 90px)";
+        return "calc(" + height + " - 135px)";
       } else {
         return "calc(" + height + " - 86px)";
       }

package/component/package.json

@@ -36,7 +36,7 @@
   "dependencies": {
     "@ctrl/tinycolor": "^3.4.1",
     "@layui/icons-vue": "^1.0.9",
-    "@layui/layer-vue": "git+https://git.theluyuan.com/theluyuan/layui-layer.git",
+    "@layui/layer-vue": "file:../layer",
     "@layui/layui-vue": "file:",
     "@umijs/ssr-darkreader": "^4.9.45",
     "@vueuse/core": "^9.2.0",

package/component/script/build.all.ts

@@ -27,9 +27,9 @@ export default (): UserConfigExport => {
       },
       terserOptions: {
         compress: {
-          drop_console: true,
+          drop_console: false,
           drop_debugger: true,
-          pure_funcs: ["console.log"],
+          pure_funcs: [],
         },
         output: {
           comments: true,

package/component/script/build.es.ts

@@ -77,9 +77,9 @@ export default (): UserConfigExport => {
       },
       terserOptions: {
         compress: {
-          drop_console: true,
+          drop_console: false,
           drop_debugger: true,
-          pure_funcs: ["console.log"],
+          pure_funcs: [],
         },
         output: {
           comments: true,

package/component/script/build.umd.ts

@@ -27,9 +27,9 @@ export default (): UserConfigExport => {
       },
       terserOptions: {
         compress: {
-          drop_console: true,
+          drop_console: false,
           drop_debugger: true,
-          pure_funcs: ["console.log"],
+          pure_funcs: [],
         },
         output: {
           comments: true,

package/component/src/component/table/index.vue

@@ -826,7 +826,7 @@ const soulstatus = ref(false);
 const soultop = ref(0);
 const soulleft = ref(0);
 const selcolumn = ref<any>({});
-const soulkey = ref<string>();
+const soulkey = ref("");
 const sxlist: any = ref({});
 function showsoul(event: MouseEvent, column: any, key: string) {
   console.log(event);

package/document-component/vite.config.ts

@@ -8,6 +8,9 @@ export default defineConfig({
       "/@src": path.resolve(__dirname, "./src"),
     },
   },
+  server: {
+    port: 3005,
+  },
   build: {
     rollupOptions: {
       output: {

package/icons/vite.config.ts

@@ -22,9 +22,9 @@ export default defineConfig({
     },
     terserOptions: {
       compress: {
-        drop_console: true,
+        drop_console: false,
         drop_debugger: true,
-        pure_funcs: ["console.log"],
+        pure_funcs: [],
       },
       output: {
         comments: true,

package/layer/lib/layer-vue.es.js

@@ -1,4 +1,4 @@
-import { defineComponent, computed, openBlock, createElementBlock, normalizeStyle, unref, createCommentVNode, toDisplayString, normalizeClass, ref, watch, onMounted, nextTick, withModifiers, createElementVNode, Fragment, renderList, shallowRef, createTextVNode, createVNode, useSlots, inject, Transition, withCtx, createBlock, renderSlot, h, render, isVNode } from "vue";
+import { defineComponent, computed, openBlock, createElementBlock, normalizeStyle, unref, createCommentVNode, toDisplayString, normalizeClass, ref, watch, onMounted, nextTick, createElementVNode, Fragment, renderList, shallowRef, createTextVNode, createVNode, useSlots, inject, Transition, withCtx, createBlock, renderSlot, h, render, isVNode } from "vue";
 function _typeof$1(o) {
   "@babel/helpers - typeof";
   return _typeof$1 = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o2) {
@@ -625,7 +625,9 @@ function _objectSpread$3(e) {
   }
   return e;
 }
-var _hoisted_1$2 = ["onWheel"];
+var _hoisted_1$2 = {
+  class: "layui-layer-phimg"
+};
 var _hoisted_2$2 = ["src"];
 var _hoisted_3$2 = {
   key: 0,
@@ -695,20 +697,8 @@ var _sfc_main$2 = defineComponent(_objectSpread$3(_objectSpread$3({}, __default_
       });
       return res;
     });
-    var scale = ref(1);
-    var handleWheel = function handleWheel2(event) {
-      var delta = event.deltaY > 0 ? -0.1 : 0.1;
-      var newScale = scale.value + delta;
-      scale.value = Math.min(Math.max(newScale, 0.5), 3);
-    };
     return function(_ctx, _cache) {
-      return openBlock(), createElementBlock("div", {
+      return openBlock(), createElementBlock("div", _hoisted_1$2, [createElementVNode("img", {
-        class: "layui-layer-phimg",
-        onWheel: withModifiers(handleWheel, ["prevent"]),
-        style: normalizeStyle({
-          transform: "scale(".concat(scale.value, ")")
-        })
-      }, [createElementVNode("img", {
         src: __props.imgList[index2.value].src
       }, null, 8, _hoisted_2$2), __props.imgList.length > 0 ? (openBlock(), createElementBlock("div", _hoisted_3$2, [__props.imgList.length > 1 ? (openBlock(), createElementBlock("span", _hoisted_4$1, [createElementVNode("a", {
         href: "javascript:;",
@@ -743,7 +733,7 @@ var _sfc_main$2 = defineComponent(_objectSpread$3(_objectSpread$3({}, __default_
         style: normalizeStyle({
           left: "calc(calc( calc(100% - ".concat(100 * __props.imgList.length, "px) / 2) + ").concat(index2.value * 100, "px)")
         })
-      }, null, 4)])) : (openBlock(), createElementBlock("span", _hoisted_8$1, [__props.imgList[index2.value].alt ? (openBlock(), createElementBlock("span", _hoisted_9, toDisplayString(__props.imgList[index2.value].alt), 1)) : createCommentVNode("", true), __props.imgList.length > 1 ? (openBlock(), createElementBlock("em", _hoisted_10, toDisplayString(index2.value + 1) + " / " + toDisplayString(__props.imgList.length), 1)) : createCommentVNode("", true)]))], 4)) : createCommentVNode("", true)])) : createCommentVNode("", true)], 44, _hoisted_1$2);
+      }, null, 4)])) : (openBlock(), createElementBlock("span", _hoisted_8$1, [__props.imgList[index2.value].alt ? (openBlock(), createElementBlock("span", _hoisted_9, toDisplayString(__props.imgList[index2.value].alt), 1)) : createCommentVNode("", true), __props.imgList.length > 1 ? (openBlock(), createElementBlock("em", _hoisted_10, toDisplayString(index2.value + 1) + " / " + toDisplayString(__props.imgList.length), 1)) : createCommentVNode("", true)]))], 4)) : createCommentVNode("", true)])) : createCommentVNode("", true)]);
     };
   }
 }));
@@ -957,10 +947,11 @@ function calculateContent(title2, height, btn, type, isMessage) {
   if (height && height.indexOf("%") != -1) {
     height = "100%";
   }
+  console.log("btn", height + "px");
   if (btn && btn.length > 0) {
     if (type == 0) {
       if (title2) {
-        return "calc(" + height + " - 90px)";
+        return "calc(" + height + " - 135px)";
       } else {
         return "calc(" + height + " - 86px)";
       }

package/layer/src/component/Photos.vue

@@ -1,9 +1,5 @@
 <template>
-  <div
+  <div class="layui-layer-phimg">
-    class="layui-layer-phimg"
-    @wheel.prevent="handleWheel"
-    :style="{ transform: `scale(${scale})` }"
-  >
     <img :src="imgList[index].src" />
     <div class="layui-layer-imgsee" v-if="imgList.length > 0">
       <span class="layui-layer-imguide" v-if="imgList.length > 1">
@@ -101,14 +97,4 @@ const ifSetThumb = computed(() => {
   });
   return res;
 });
-
-// 添加缩放比例的响应式变量
-const scale = ref(1);
-// 定义处理滚轮事件的方法
-const handleWheel = (event: WheelEvent) => {
-  const delta = event.deltaY > 0 ? -0.1 : 0.1;
-  const newScale = scale.value + delta;
-  // 限制缩放范围
-  scale.value = Math.min(Math.max(newScale, 0.5), 3);
-};
 </script>

package/layer/src/utils/index.ts

@@ -142,10 +142,11 @@ export function calculateContent(
   if (height && height.indexOf("%") != -1) {
     height = "100%";
   }
+  console.log("btn", height + "px");
   if (btn && btn.length > 0) {
     if (type == 0) {
       if (title) {
-        return "calc(" + height + " - 90px)";
+        return "calc(" + height + " - 135px)";
       } else {
         return "calc(" + height + " - 86px)";
       }

package/layer/vite.config.ts

@@ -23,9 +23,9 @@ export default defineConfig({
     },
     terserOptions: {
       compress: {
-        drop_console: true,
+        drop_console: false,
         drop_debugger: true,
-        pure_funcs: ["console.log"],
+        pure_funcs: [],
       },
       output: {
         comments: true,

pnpm-lock.yaml

@@ -118,8 +118,8 @@ importers:
         specifier: ^1.0.9
         version: 1.1.0
       '@layui/layer-vue':
-        specifier: workspace:*
+        specifier: git+https://git.theluyuan.com/theluyuan/layui-layer.git
-        version: link:../layer
+        version: git+https://git.theluyuan.com/theluyuan/layui-layer.git#e35e9d8eb94e9cb2985b00830a3ed6cd20509127(vue@3.2.40)
       '@layui/layui-vue':
         specifier: 'file:'
         version: file:package/component(vue@3.2.40)
@@ -1099,6 +1099,14 @@ packages:
   '@layui/icons-vue@1.1.0':
     resolution: {integrity: sha512-ndc53qyUZSslUkO8ZHeBMh6i4gSTtAUqsPpKQZWML0JH6E/X3LIySe6LATeqEMmD7wWSnHJ+WBVGO4ij85Dk1g==}
 
+  '@layui/layer-vue@git+https://git.theluyuan.com/theluyuan/layui-layer.git#4148c78700b236c67e229fc7938e133d1490fb06':
+    resolution: {commit: 4148c78700b236c67e229fc7938e133d1490fb06, repo: https://git.theluyuan.com/theluyuan/layui-layer.git, type: git}
+    version: 1.4.7
+
+  '@layui/layer-vue@git+https://git.theluyuan.com/theluyuan/layui-layer.git#e35e9d8eb94e9cb2985b00830a3ed6cd20509127':
+    resolution: {commit: e35e9d8eb94e9cb2985b00830a3ed6cd20509127, repo: https://git.theluyuan.com/theluyuan/layui-layer.git, type: git}
+    version: 1.4.7
+
   '@layui/layui-vue@file:package/component':
     resolution: {directory: package/component, type: directory}
 
@@ -4553,11 +4561,25 @@ snapshots:
 
   '@layui/icons-vue@1.1.0': {}
 
+  '@layui/layer-vue@git+https://git.theluyuan.com/theluyuan/layui-layer.git#4148c78700b236c67e229fc7938e133d1490fb06(vue@3.2.40)':
+    dependencies:
+      '@layui/layer-vue': '@layui/layui-vue@file:package/component(vue@3.2.40)'
+    transitivePeerDependencies:
+      - '@vue/composition-api'
+      - vue
+
+  '@layui/layer-vue@git+https://git.theluyuan.com/theluyuan/layui-layer.git#e35e9d8eb94e9cb2985b00830a3ed6cd20509127(vue@3.2.40)':
+    dependencies:
+      '@layui/layer-vue': '@layui/layui-vue@file:package/component(vue@3.2.40)'
+    transitivePeerDependencies:
+      - '@vue/composition-api'
+      - vue
+
   '@layui/layui-vue@file:package/component(vue@3.2.40)':
     dependencies:
       '@ctrl/tinycolor': 3.4.1
       '@layui/icons-vue': 1.1.0
-      '@layui/layer-vue': link:package/layer
+      '@layui/layer-vue': git+https://git.theluyuan.com/theluyuan/layui-layer.git#4148c78700b236c67e229fc7938e133d1490fb06(vue@3.2.40)
       '@umijs/ssr-darkreader': 4.9.45
       '@vueuse/core': 9.2.0(vue@3.2.40)
       async-validator: 4.1.1