Skip to content

Commit 882dc3d

Browse files
modstartmodstart
committed
新增：配置all获取方法
1 parent 6006cd0 commit 882dc3d

File tree

11 files changed

+84
-42
lines changed

11 files changed

+84
-42
lines changed

‎public/asset/common/base.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/asset/entry/basic.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/modstart/modstart/asset/common/base.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/modstart/modstart/asset/entry/basic.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/modstart/modstart/resources/asset/src/lib/form.js‎

Lines changed: 37 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,9 @@ var Form = {
118118
data = res.data;
119119
}
120120

121-
var successFunc = function () {
122-
if ("success" in callback) {
123-
callback.success(res);
124-
} else if (redirect) {
125-
if (msg) {
121+
var defaultSuccessFunc = function () {
122+
if (msg) {
123+
if (redirect) {
126124
if (Dialog) {
127125
Dialog.alertSuccess(msg, function () {
128126
Form.redirectProcess(redirect);
@@ -132,24 +130,32 @@ var Form = {
132130
Form.redirectProcess(redirect);
133131
}
134132
} else {
135-
Form.redirectProcess(redirect);
136-
}
137-
} else {
138-
if (msg) {
139133
if (Dialog) {
140134
Dialog.tipSuccess(msg);
141135
} else {
142136
alert(msg);
143137
}
144138
}
139+
} else {
140+
if (redirect) {
141+
Form.redirectProcess(redirect);
142+
}
143+
}
144+
}
145+
146+
var successFunc = function () {
147+
if ("success" in callback) {
148+
if (true === callback.success(res)) {
149+
defaultSuccessFunc();
150+
}
151+
} else {
152+
defaultSuccessFunc();
145153
}
146154
};
147155

148-
var errorFunc = function () {
149-
if ("error" in callback) {
150-
callback.error(res);
151-
} else if (redirect) {
152-
if (msg) {
156+
var defaultErrorFunc = function () {
157+
if (msg) {
158+
if (redirect) {
153159
if (Dialog) {
154160
Dialog.alertError(msg, function () {
155161
Form.redirectProcess(redirect);
@@ -159,17 +165,29 @@ var Form = {
159165
Form.redirectProcess(redirect);
160166
}
161167
} else {
162-
Form.redirectProcess(redirect);
168+
if (Dialog) {
169+
Dialog.tipError(msg);
170+
} else {
171+
alert(msg);
172+
}
163173
}
164174
} else {
165-
if (Dialog) {
166-
Dialog.tipError(msg);
167-
} else {
168-
alert(msg);
175+
if (redirect) {
176+
Form.redirectProcess(redirect);
169177
}
170178
}
171179
};
172180

181+
var errorFunc = function () {
182+
if ("error" in callback) {
183+
if (true !== callback.error(res)) {
184+
defaultErrorFunc()
185+
}
186+
} else {
187+
defaultErrorFunc()
188+
}
189+
};
190+
173191
if (0 == code) {
174192
successFunc();
175193
} else {

‎vendor/modstart/modstart/resources/asset/src/svue/lib/api.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ const processResponse = (res, failCB, successCB) => {
8282
}
8383
}
8484
if (!processed) {
85-
if (!failCB(res)) {
85+
// 只有返回 true 表示已经处理了响应
86+
if (true !== failCB(res)) {
8687
Message({
8788
message: res.msg,
8889
type: 'error',
@@ -91,7 +92,8 @@ const processResponse = (res, failCB, successCB) => {
9192
}
9293
}
9394
} else {
94-
if (successCB(res)) {
95+
// 只有返回 true 表示需要处理响应
96+
if (true === successCB(res)) {
9597
Message({
9698
message: res.msg,
9799
type: 'success',

‎vendor/modstart/modstart/src/Admin/Model/Config.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77

88
class Config extends Model
99
{
10-
protected $table = 'data';
10+
protected $table = 'config';
1111
}

‎vendor/modstart/modstart/src/Core/Config/Driver/DatabaseMConfig.php‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
namespace ModStart\Core\Config\Driver;
55

66
use Illuminate\Support\Facades\Cache;
7+
use ModStart\Admin\Model\Config;
78
use ModStart\Core\Config\MConfig;
89
use ModStart\Core\Dao\ModelUtil;
910

@@ -70,5 +71,14 @@ public function has($key)
7071
return !!$config;
7172
}
7273

73-
74+
public function all($prefix = null)
75+
{
76+
$query = Config::query();
77+
if (null !== $prefix) {
78+
$query->where('key', 'like', $prefix . '%');
79+
}
80+
$configs = $query->get(['key', 'value'])->toArray();
81+
return $configs;
82+
return array_column($configs, 'value', 'key');
83+
}
7484
}

‎vendor/modstart/modstart/src/Core/Config/MConfig.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ public abstract function remove($key);
3131

3232
public abstract function has($key);
3333

34+
public abstract function all($prefix = null);
35+
3436
public function getWithEnv($key, $defaultValue = null)
3537
{
3638
$value = config('env.CONFIG_' . $key);

‎vendor/modstart/modstart/src/Core/Util/PageHtmlUtil.php‎

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,14 @@ private static function itemRender($start, $end, $currentPage, $url, $template)
1212
$html = [];
1313
for ($i = $start; $i <= $end; $i++) {
1414
if ($i == $currentPage) {
15-
$html[] = sprintf($template['current'], $i);
15+
$html[] = self::replace($template['current'], [
16+
'%p%' => $i
17+
]);
1618
} else {
17-
$html[] = sprintf($template['item'], str_replace('{page}', $i, $url), $i);
19+
$html[] = self::replace($template['item'], [
20+
'%p%' => $i,
21+
'%s%' => self::buildPage($url, $i)
22+
]);
1823
}
1924
}
2025
return join('', $html);
@@ -31,7 +36,7 @@ public static function nextPageUrl($total, $pageSize, $currentPage, $url = '/url
3136
{
3237
$totalPage = ceil($total / $pageSize);
3338
if ($currentPage < $totalPage) {
34-
return str_replace('{page}', ($currentPage + 1), $url);
39+
return self::buildPage($url, $currentPage + 1);
3540
}
3641
return null;
3742
}
@@ -46,7 +51,7 @@ public static function nextPageUrl($total, $pageSize, $currentPage, $url = '/url
4651
public static function prevPageUrl($total, $pageSize, $currentPage, $url = '/url/for/path?page={page}')
4752
{
4853
if ($currentPage > 1) {
49-
return str_replace('{page}', ($currentPage - 1), $url);
54+
return self::buildPage($url, $currentPage - 1);
5055
}
5156
return null;
5257
}
@@ -73,14 +78,14 @@ public static function render($total, $pageSize, $currentPage, $url = '/url/for/
7378
{
7479
if (is_null($template)) {
7580
$template = [
76-
'warp' => '<div class="pages">%s</div>',
81+
'warp' => '<div class="pages">%s%</div>',
7782
'more' => '<span class="more">...</span>',
78-
'prev' => '<a class="page" href="%s">' . L('PrevPage') . '</a>',
83+
'prev' => '<a class="page" href="%s%">' . L('PrevPage') . '</a>',
7984
'prevDisabled' => null,
80-
'next' => '<a class="page" href="%s">' . L('NextPage') . '</a>',
85+
'next' => '<a class="page" href="%s%">' . L('NextPage') . '</a>',
8186
'nextDisabled' => null,
82-
'current' => '<span class="current">%d</span>',
83-
'item' => '<a class="page" href="%s">%d</a>',
87+
'current' => '<span class="current">%p%</span>',
88+
'item' => '<a class="page" href="%s%">%p%</a>',
8489
];
8590
}
8691

@@ -96,13 +101,14 @@ public static function render($total, $pageSize, $currentPage, $url = '/url/for/
96101

97102
if (!empty($template['first'])) {
98103
$html[] = self::replace($template['first'], [
99-
'%s' => self::buildPage($url, 1),
104+
'%s%' => self::buildPage($url, 1),
100105
]);
101106
}
102107

103108
if ($currentPage > 1) {
104109
$html[] = self::replace($template['prev'], [
105-
'%s' => self::buildPage($url, $currentPage - 1),
110+
'%s%' => self::buildPage($url, $currentPage - 1),
111+
'%p%' => $currentPage - 1,
106112
]);
107113
} else {
108114
if (!empty($template['prevDisabled'])) {
@@ -140,7 +146,9 @@ public static function render($total, $pageSize, $currentPage, $url = '/url/for/
140146
}
141147

142148
if ($currentPage < $totalPage) {
143-
$html[] = sprintf($template['next'], str_replace('{page}', ($currentPage + 1), $url));
149+
$html[] = self::replace($template['next'], [
150+
'%s%' => self::buildPage($url, $currentPage + 1),
151+
]);
144152
} else {
145153
if (!empty($template['nextDisabled'])) {
146154
$html[] = $template['nextDisabled'];
@@ -149,10 +157,12 @@ public static function render($total, $pageSize, $currentPage, $url = '/url/for/
149157

150158
if (!empty($template['last'])) {
151159
$html[] = self::replace($template['last'], [
152-
'%s' => self::buildPage($url, $totalPage),
160+
'%s%' => self::buildPage($url, $totalPage),
153161
]);
154162
}
155163

156-
return sprintf($template['warp'], join('', $html));
164+
return self::replace($template['warp'], [
165+
'%s%' => join('', $html),
166+
]);
157167
}
158168
}

0 commit comments

Comments
 (0)