同步最新插件代码

app/admin/controller/Login.php

@@ -48,7 +48,7 @@ class Login extends Controller
                 // 当前运行模式
                 $this->developMode = RuntimeService::check();
                 // 后台背景处理
-                $images = str2arr(sysconf('login_image') ?: '', '|');
+                $images = str2arr(sysconf('login_image|raw') ?: '', '|');
                 if (empty($images)) $images = [
                     SystemService::uri('/static/theme/img/login/bg1.jpg'),
                     SystemService::uri('/static/theme/img/login/bg2.jpg'),
@@ -61,7 +61,7 @@ class Login extends Controller
                     $this->app->session->set($this->captchaType, $this->captchaToken);
                 }
                 // 更新后台域名
-                if ($this->request->domain(true) !== sysconf('base.site_host')) {
+                if ($this->request->domain(true) !== sysconf('base.site_host|raw')) {
                     sysconf('base.site_host', $this->request->domain(true));
                 }
                 // 加载登录模板

app/admin/controller/api/Plugs.php

@@ -50,7 +50,7 @@ class Plugs extends Controller
         return response(join("\r\n", [
             sprintf("window.taDebug = %s;", $this->app->isDebug() ? 'true' : 'false'),
             sprintf("window.taAdmin = '%s';", sysuri('admin/index/index', [], false)),
-            sprintf("window.taEditor = '%s';", sysconf('base.editor') ?: 'ckeditor4'),
+            sprintf("window.taEditor = '%s';", sysconf('base.editor|raw') ?: 'ckeditor4'),
         ]))->contentType('application/x-javascript');
     }
 

app/admin/controller/api/Upload.php

@@ -48,12 +48,12 @@ class Upload extends Controller
     public function index(): Response
     {
         $data = ['exts' => []];
-        foreach (str2arr(sysconf('storage.allow_exts')) as $ext) {
+        foreach (str2arr(sysconf('storage.allow_exts|raw')) as $ext) {
             $data['exts'][$ext] = Storage::mime($ext);
         }
         $template = realpath(__DIR__ . '/../../view/api/upload.js');
         $data['exts'] = json_encode($data['exts'], JSON_UNESCAPED_UNICODE);
-        $data['nameType'] = sysconf('storage.name_type') ?: 'xmd5';
+        $data['nameType'] = sysconf('storage.name_type|raw') ?: 'xmd5';
         return view($template, $data)->contentType('application/x-javascript');
     }
 
@@ -219,7 +219,7 @@ class Upload extends Controller
             $this->error('文件后缀异常，请重新上传文件！');
         }
         // 屏蔽禁止上传指定后缀的文件
-        if (!in_array($extension, str2arr(sysconf('storage.allow_exts')))) {
+        if (!in_array($extension, str2arr(sysconf('storage.allow_exts|raw')))) {
             $this->error('文件类型受限，请在后台配置规则！');
         }
         if (in_array($extension, ['sh', 'asp', 'bat', 'cmd', 'exe', 'php'])) {
@@ -279,7 +279,7 @@ class Upload extends Controller
         if (in_array($type, ['local', 'qiniu', 'alioss', 'txcos', 'uptype'])) {
             return $type;
         } else {
-            return strtolower(sysconf('storage.type'));
+            return strtolower(sysconf('storage.type|raw'));
         }
     }
 

app/admin/view/auth/index.html

@@ -13,7 +13,7 @@
 {block name="content"}
 <div class="think-box-shadow">
     {include file='auth/index_search'}
-    <table id="RoleTable" data-url="{:sysuri()}" data-target-search="form.form-search"></table>
+    <table id="RoleTable" data-url="{:request()->url()}" data-target-search="form.form-search"></table>
 </div>
 {/block}
 
@@ -51,7 +51,7 @@
 
 <!-- 列表排序权重模板 -->
 <script type="text/html" id="SortInputRoleTableTpl">
-    <input type="number" min="0" data-blur-number="0" data-action-blur="{:sysuri()}" data-value="id#{{d.id}};action#sort;sort#{value}" data-loading="false" value="{{d.sort}}" class="layui-input text-center">
+    <input type="number" min="0" data-blur-number="0" data-action-blur="{:request()->url()}" data-value="id#{{d.id}};action#sort;sort#{value}" data-loading="false" value="{{d.sort}}" class="layui-input text-center">
 </script>
 
 <!-- 数据状态切换模板 -->

app/admin/view/base/index.html

@@ -21,7 +21,7 @@
     </ul>
     <div class="layui-tab-content">
         {include file='base/index_search'}
-        <table id="BaseTable" data-url="{:sysuri()}" data-target-search="form.form-search"></table>
+        <table id="BaseTable" data-url="{:request()->url()}" data-target-search="form.form-search"></table>
     </div>
 </div>
 {/block}

app/admin/view/menu/index.html

@@ -25,7 +25,7 @@
         {/if}{/foreach}
     </ul>
     <div class="layui-tab-content">
-        <table id="MenuTable" data-url="{:sysuri()}" data-target-search="form.form-search"></table>
+        <table id="MenuTable" data-url="{:request()->url()}" data-target-search="form.form-search"></table>
     </div>
 </div>
 

app/admin/view/oplog/index.html

@@ -13,7 +13,7 @@
 {block name="content"}
 <div class="think-box-shadow">
     {include file='oplog/index_search'}
-    <table id="OplogTable" data-url="{:sysuri()}" data-target-search="form.form-search"></table>
+    <table id="OplogTable" data-url="{:request()->url()}" data-target-search="form.form-search"></table>
 </div>
 {/block}
 

app/admin/view/queue/index.html

@@ -30,7 +30,7 @@
 </div>
 <div class="think-box-shadow">
     {include file='queue/index_search'}
-    <table id="QueueTable" data-line="2" data-url="{:sysuri()}" data-target-search="form.form-search"></table>
+    <table id="QueueTable" data-line="2" data-url="{:request()->url()}" data-target-search="form.form-search"></table>
 </div>
 {/block}
 

app/admin/view/user/form.html

@@ -77,7 +77,7 @@
                 <div class="layui-col-xs4">
                     <label class="relative block">
                         <span class="help-label"><b>联系邮箱</b>Contact Email</span>
-                        <input name="contact_mail" value='{$vo.contact_mail|default=""}' pattern="_email_" vali-name="联系邮箱" placeholder="请输入联系电子邮箱" class="layui-input">
+                        <input name="contact_mail" value='{$vo.contact_mail|default=""}' pattern="email" vali-name="联系邮箱" placeholder="请输入联系电子邮箱" class="layui-input">
                         <span class="color-desc">可选，请填写用户常用的电子邮箱</span>
                     </label>
                 </div>
@@ -91,7 +91,7 @@
                 <div class="layui-col-xs4">
                     <label class="relative block">
                         <span class="help-label"><b>联系ＱＱ</b>Contact QQ</span>
-                        <input name="contact_qq" maxlength="11" value='{$vo.contact_qq|default=""}' pattern="_qq_" vali-name="联系ＱＱ" placeholder="请输入常用的联系ＱＱ" class="layui-input">
+                        <input name="contact_qq" maxlength="11" value='{$vo.contact_qq|default=""}' pattern="qq" vali-name="联系ＱＱ" placeholder="请输入常用的联系ＱＱ" class="layui-input">
                         <span class="color-desc">可选，请填写用户常用的联系ＱＱ号</span>
                     </label>
                 </div>

app/data/view/shop/goods/form.html

@@ -2,12 +2,12 @@
 
 {block name="content"}
 {include file='shop/goods/formstyle'}
-<form action="{:sysuri()}" method="post" data-auto="true" class="layui-form layui-card" id="GoodsForm">
+<form action="{:sysuri()}" method="post" data-auto="true" class="layui-form layui-card">
     <div class="layui-card-body">
 
         <!--{notempty name='marks'}-->
-        <div class="layui-form-item label-required-prev">
+        <div class="layui-form-item">
-            <span class="help-label"><b>商品标签</b>Mark Name</span>
+            <span class="help-label label-required-prev"><b>商品标签</b>Mark Name</span>
             <div class="layui-textarea help-checks">
                 {foreach $marks as $mark}
                 <label class="think-checkbox">
@@ -23,8 +23,8 @@
         <!--{/notempty}-->
 
         <!--{notempty name='payments'}-->
-        <div class="layui-form-item label-required-prev">
+        <div class="layui-form-item">
-            <span class="help-label"><b>支付方式</b>Goods Payment</span>
+            <span class="help-label label-required-prev"><b>支付方式</b>Goods Payment</span>
             <div class="layui-textarea help-checks">
                 {foreach $payments as $payment}
                 <label class="think-checkbox">
@@ -58,8 +58,8 @@
         </label>
 
         <!--{notempty name='trucks'}-->
-        <label class="layui-form-item block relative label-required-prev">
+        <div class="layui-form-item block relative">
-            <span class="help-label"><b>邮费模板</b>Truck Template</span>
+            <span class="help-label label-required-prev"><b>邮费模板</b>Truck Template</span>
             <select class="layui-select" name="truck_code" lay-search>
                 <option value="">--- 包 邮 ---</option>
                 {foreach $trucks as $truck}{if isset($vo.truck_code) and $vo.truck_code eq $truck.code}
@@ -68,11 +68,11 @@
                 <option value="{$truck.code}">{$truck.code} - {$truck.name|default=''}</option>
                 {/if}{/foreach}
             </select>
-        </label>
+        </div>
         <!--{/notempty}-->
 
-        <div class="layui-form-item label-required-prev">
+        <div class="layui-form-item">
-            <span class="help-label"><b>商品封面及轮播图片</b>Cover and Carousel Pictures</span>
+            <span class="help-label label-required-prev"><b>商品封面及轮播图片</b>Cover and Carousel Pictures</span>
             <table class="layui-table">
                 <thead>
                 <tr>
@@ -104,9 +104,9 @@
                     <div>
                         {foreach ['非返利商品，其代理不会获得奖励','是返利商品，其代理将会获得奖励'] as $k => $v}
                         {if (isset($vo.rebate_type) and $vo.rebate_type eq $k) or (empty($vo.rebate_type) and $k eq 0)}
-                        <input checked name="rebate_type" title="{$v}" type="radio" value="{$k}">
+                        <div class="nowrap"><input checked name="rebate_type" title="{$v}" type="radio" value="{$k}"></div>
                         {else}
-                        <input name="rebate_type" title="{$v}" type="radio" value="{$k}">
+                        <div class="nowrap"><input name="rebate_type" title="{$v}" type="radio" value="{$k}"></div>
                         {/if}{/foreach}
                     </div>
                 </fieldset>
@@ -115,9 +115,9 @@
                     <div>
                         {foreach ['非入会礼包，购买后不会升级等级','是入会礼包，购买后升级会员等级'] as $k=>$v}
                         {if (isset($vo.vip_entry) and $vo.vip_entry eq $k) or (empty($vo.vip_entry) and $k eq 0)}
-                        <input checked lay-filter="vip_entry" name="vip_entry" title="{$v}" type="radio" value="{$k}">
+                        <div class="nowrap"><input checked lay-filter="vip_entry" name="vip_entry" title="{$v}" type="radio" value="{$k}"></div>
                         {else}
-                        <input lay-filter="vip_entry" name="vip_entry" title="{$v}" type="radio" value="{$k}">
+                        <div class="nowrap"><input lay-filter="vip_entry" name="vip_entry" title="{$v}" type="radio" value="{$k}"></div>
                         {/if}{/foreach}
                     </div>
                 </fieldset>
@@ -189,7 +189,7 @@
             </div>
         </div>
 
-        <div class="layui-form-item">
+        <div class="layui-form-item" id="GoodsSpecs">
             <span class="help-label label-required-prev"><b>商品规格及商品SKU绑定</b><span class="color-red font-s12">（规格填写后不允许再次修改）</span></span>
             <div class="margin-bottom-10" ng-class="{true:'layui-show'}[mode==='add'&&specs.length>0]" ng-repeat="x in specs track by $index" style="display:none">
                 <div class="goods-spec-box padding-10 margin-0 relative" style="background:#ddd">
@@ -328,7 +328,7 @@
     /*! 加载扩展插件 */
     require(['ckeditor', 'angular'], function () {
         window.createEditor('[name="content"]', {height: 500});
-        var app = angular.module("GoodsForm", []).run(callback);
+        var app = angular.module('GoodsSpecs', []).run(callback);
         angular.bootstrap(document.getElementById(app.name), [app.name]);
 
         function getRand(length, prefix) {

public/static/plugs/admin/validate.js

@@ -18,10 +18,10 @@ define(function () {
         var that = this;
         // 绑定表单元素
         this.form = $(form);
+        // 绑定元素事件
+        this.evts = 'blur change';
         // 检测表单元素
         this.tags = 'input,textarea';
-        // 绑定元素事件,
-        this.evts = 'blur change';
         // 预设检测规则
         this.patterns = {
             qq: '^[1-9][0-9]{4,11}$',
@@ -33,17 +33,20 @@ define(function () {
             cardid: '^[1-9]\\d{5}(18|19|([23]\\d))\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx]$',
             userame: '^[a-zA-Z0-9_-]{4,16}$',
         };
-        // 检测属性是否有定义
+        this.isRegex = function (el, value, pattern) {
+            pattern = pattern || el.getAttribute('pattern');
+            if ((value = value || $.trim($(el).val())) === '') return true;
+            if (!(pattern = this.patterns[pattern] || pattern)) return true;
+            return new RegExp(pattern, 'i').test(value);
+        };
         this.hasProp = function (el, prop) {
             var attrProp = el.getAttribute(prop);
             return typeof attrProp !== 'undefined' && attrProp !== null && attrProp !== false;
         };
-        this.isRegex = function (el) {
+        this.needCheck = function (el, type) {
-            var real = $.trim($(el).val());
+            if (this.hasProp(el, 'data-auto-none')) return false;
-            var regexp = el.getAttribute('pattern');
+            type = (el.getAttribute('type') || '').replace(/\W+/, '').toLowerCase();
-            regexp = this.patterns[regexp] || regexp;
+            return $.inArray(type, ['file', 'reset', 'image', 'radio', 'checkbox', 'submit', 'hidden']) < 0;
-            if (real === "" || !regexp) return true;
-            return new RegExp(regexp, 'i').test(real);
         };
         this.checkAllInput = function () {
             var status = true;
@@ -52,9 +55,7 @@ define(function () {
             }) && status;
         };
         this.checkInput = function (el) {
-            if (this.hasProp(el, 'data-auto-none')) return true;
+            if (!this.needCheck(el)) return true;
-            var type = (el.getAttribute('type') || '').replace(/\W+/, '').toLowerCase();
-            if ($.inArray(type, ['file', 'reset', 'image', 'radio', 'checkbox', 'submit', 'hidden']) > -1) return true;
             if (this.hasProp(el, 'required') && $.trim($(el).val()) === '') return this.remind(el, 'required');
             return this.isRegex(el) ? !!this.hideError(el) : this.remind(el, 'pattern');
         };
@@ -79,7 +80,7 @@ define(function () {
         };
         /*! 预埋异常标签*/
         this.form.find(this.tags).each(function () {
-            that.hideError(this, '');
+            that.needCheck(this) && that.hideError(this, '');
         });
         /*! 表单元素验证 */
         this.form.attr({onsubmit: 'return false', novalidate: 'novalidate', autocomplete: 'off'}).on('keydown', this.tags, function () {