diff --git a/src/addon/alioss/config/diy_view.php b/src/addon/alioss/config/diy_view.php index e36ca9b7d..8d6d0b88c 100644 --- a/src/addon/alioss/config/diy_view.php +++ b/src/addon/alioss/config/diy_view.php @@ -1,4 +1,5 @@ '页面类型名称', 'name' => '页面标识', 'path' => '页面路径', 'value' => '页面数据,json格式' ] diff --git a/src/addon/alioss/config/info.php b/src/addon/alioss/config/info.php index b17546736..3c23b3e1e 100644 --- a/src/addon/alioss/config/info.php +++ b/src/addon/alioss/config/info.php @@ -1,4 +1,5 @@ 'alioss', 'title' => '阿里云OSS', diff --git a/src/addon/alioss/event/ClearAlbumPic.php b/src/addon/alioss/event/ClearAlbumPic.php index 04a9093fd..72678c5fe 100644 --- a/src/addon/alioss/event/ClearAlbumPic.php +++ b/src/addon/alioss/event/ClearAlbumPic.php @@ -1,6 +1,7 @@ '页面类型名称', 'name' => '页面标识', 'path' => '页面路径', 'value' => '页面数据,json格式' ] diff --git a/src/addon/alipay/config/event.php b/src/addon/alipay/config/event.php index 7d660dc1f..f1eaffe43 100644 --- a/src/addon/alipay/config/event.php +++ b/src/addon/alipay/config/event.php @@ -1,4 +1,5 @@ [ diff --git a/src/addon/alipay/config/info.php b/src/addon/alipay/config/info.php index bd5228f97..d42a9c7e1 100644 --- a/src/addon/alipay/config/info.php +++ b/src/addon/alipay/config/info.php @@ -1,4 +1,5 @@ 'alipay', 'title' => '支付宝支付', diff --git a/src/addon/alipay/config/menu_shop.php b/src/addon/alipay/config/menu_shop.php index e37ca0195..dd3ab2a68 100644 --- a/src/addon/alipay/config/menu_shop.php +++ b/src/addon/alipay/config/menu_shop.php @@ -1,4 +1,5 @@ 'ALI_PAY_CONFIG', diff --git a/src/addon/alipay/event/Pay.php b/src/addon/alipay/event/Pay.php index 89537e5fa..9eddaa239 100644 --- a/src/addon/alipay/event/Pay.php +++ b/src/addon/alipay/event/Pay.php @@ -1,5 +1,6 @@ '页面类型名称', 'name' => '页面标识', 'path' => '页面路径', 'value' => '页面数据,json格式' ] diff --git a/src/addon/cases/config/info.php b/src/addon/cases/config/info.php index 6812ec8f3..f116b3464 100644 --- a/src/addon/cases/config/info.php +++ b/src/addon/cases/config/info.php @@ -1,4 +1,5 @@ 'cases', 'title' => '案例展示', diff --git a/src/addon/cases/event/Install.php b/src/addon/cases/event/Install.php index 9acf97a90..550f3535c 100644 --- a/src/addon/cases/event/Install.php +++ b/src/addon/cases/event/Install.php @@ -1,5 +1,6 @@ '页面类型名称', 'name' => '页面标识', 'path' => '页面路径', 'value' => '页面数据,json格式' ] diff --git a/src/addon/coupon/config/info.php b/src/addon/coupon/config/info.php index 5fcaf5bf7..bb38cf030 100644 --- a/src/addon/coupon/config/info.php +++ b/src/addon/coupon/config/info.php @@ -1,4 +1,5 @@ 'coupon', 'title' => '优惠券', diff --git a/src/addon/coupon/dict/CouponDict.php b/src/addon/coupon/dict/CouponDict.php index 4356dbe4f..e6fffd32f 100644 --- a/src/addon/coupon/dict/CouponDict.php +++ b/src/addon/coupon/dict/CouponDict.php @@ -1,5 +1,7 @@ '页面类型名称', 'name' => '页面标识', 'path' => '页面路径', 'value' => '页面数据,json格式' ] diff --git a/src/addon/personnel/config/info.php b/src/addon/personnel/config/info.php index 73bae96f3..d7752f36f 100644 --- a/src/addon/personnel/config/info.php +++ b/src/addon/personnel/config/info.php @@ -1,13 +1,5 @@ 'personnel', 'title' => '电子名片', diff --git a/src/addon/personnel/event/Install.php b/src/addon/personnel/event/Install.php index 3a95457d9..261811c78 100644 --- a/src/addon/personnel/event/Install.php +++ b/src/addon/personnel/event/Install.php @@ -1,13 +1,6 @@ 'weapp', 'title' => '微信小程序', diff --git a/src/config/diy_view.php b/src/config/diy_view.php index 1ebe909ae..c5e6eb4ea 100644 --- a/src/config/diy_view.php +++ b/src/config/diy_view.php @@ -1,4 +1,5 @@ '页面类型名称', 'name' => '页面标识', 'path' => '页面路径', 'value' => '页面数据,json格式' ] diff --git a/src/index.php b/src/index.php index aea6158b1..b509ed1a2 100644 --- a/src/index.php +++ b/src/index.php @@ -68,12 +68,11 @@ if ($appEnv) { if (is_file($envFile)) { $app->env->load($envFile); } -} else { - echo "⚠️ 警告:未设置APP_ENV环境变量,默认使用local环境。\n"; - // 3. 为了兼容性,如果存在.env.local也加载(优先级最高) - if (is_file(__DIR__ . '/.env.local')) { - $app->env->load(__DIR__ . '/.env.local'); - } +} + +// 3. 为了兼容性,如果存在.env.local也加载(优先级最高) +if (is_file(__DIR__ . '/.env.local')) { + $app->env->load(__DIR__ . '/.env.local'); } // 执行HTTP应用并响应 diff --git a/src/public/static/ext/diyview/css/diyview.css b/src/public/static/ext/diyview/css/diyview.css index 9f74cc580..55d52dcb1 100644 --- a/src/public/static/ext/diyview/css/diyview.css +++ b/src/public/static/ext/diyview/css/diyview.css @@ -149,7 +149,7 @@ /* 选中弹窗广告组件 */ .pop-window-wrap.selected .edit-attribute{display: block;} -.edit-attribute .attr-wrap {width: 392px;overflow-x: hidden;overflow-y: auto;height: 600px;} +.edit-attribute .attr-wrap {width: 392px;overflow-x: hidden;overflow-y: auto;min-height: 200px;max-height: calc(100vh - 150px);} .edit-attribute .attr-wrap .restore-wrap {width: 360px;} .edit-attribute .attr-wrap .restore-wrap .layui-form-label {color: #666 !important;} .edit-attribute .attr-wrap .restore-wrap .attr-title {padding: 10px 0 15px 10px;border-bottom: 2px solid #f2f4f6;margin-bottom: 10px;color: #303133;display: flex;justify-content: space-between;align-items: center;} diff --git a/src/public/static/ext/diyview/js/custom_template.js b/src/public/static/ext/diyview/js/custom_template.js index e0dab71f3..75f2e87f9 100644 --- a/src/public/static/ext/diyview/js/custom_template.js +++ b/src/public/static/ext/diyview/js/custom_template.js @@ -476,8 +476,6 @@ var vue = new Vue({ // 如果当前编辑的组件不存在了,则选中最后一个 if (parseInt(self.currentIndex) >= self.data.length) self.currentIndex--; - $(".draggable-element[data-index=" + self.currentIndex + "] .edit-attribute .attr-wrap").css("height", ($(window).height() - 135) + "px"); - }, 50); }, @@ -630,6 +628,7 @@ function fullScreenSize(isFull) { }); $('.loading-layer').css('height', (commonHeight - 70) + "px"); // 70px是头部高度 $(".component-list nav").css("height", (commonHeight + 20 - 55) + "px");// 20px是自定义模板区域上内边距,55px是标准/第三方组件tab切换高度 + // 设置属性编辑器的最大高度,与预览容器保持一致 $(".edit-attribute .attr-wrap").css("height", (commonHeight - 1) + "px");// 1px是上边框 $(".preview-block").css("min-height", (commonHeight - 104) + "px"); // 公式:高度 - 自定义模板区域上内边距(20px) - 自定义模板区域下外编辑(20px)- 自定义模板头部(64px) }