Skip to content

Commit 0a7bd97

Browse files
modstartmodstart
committed
feat: layui table closese tr fixed
1 parent 1d8d13b commit 0a7bd97

33 files changed

+571
-112
lines changed

‎public/asset/layui/layui.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/theme/default/style.css‎

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/layui/layui.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/theme/default/style.css‎

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/layui/layui.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/sui/base/component/btn.less‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,14 @@
7070

7171
}
7272

73+
.btn.btn-outline-none, .btn[class*="ub-bg-"] {
74+
outline: none;
75+
76+
&:hover, &:hover:not(.disabled) {
77+
outline: none;
78+
}
79+
}
80+
7381
.btn.disabled, .btn:disabled {
7482
opacity: 0.65;
7583
cursor: not-allowed;

‎vendor/modstart/modstart/resources/asset/src/sui/bricks/component/form/form.html‎

Lines changed: 65 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -61,38 +61,71 @@
6161
<div class="line">
6262
<div class="label">按钮</div>
6363
<div class="field">
64-
<button class="btn btn-primary btn-sm" type="button">提交</button>
65-
<button class="btn btn-primary" type="button">提交</button>
66-
<button class="btn btn-primary btn-lg" type="button">提交</button>
67-
<button class="btn btn-primary btn-lg disabled" type="button">提交</button>
68-
<button class="btn btn-primary btn-lg btn-round" type="button">提交</button>
69-
<button class="btn btn-primary-line btn-lg" type="button">提交</button>
70-
<br />
71-
<button class="btn btn-success btn-sm" type="button">提交</button>
72-
<button class="btn btn-success" type="button">提交</button>
73-
<button class="btn btn-success btn-lg" type="button">提交</button>
74-
<button class="btn btn-success btn-lg disabled" type="button">提交</button>
75-
<button class="btn btn-success btn-lg btn-round" type="button">提交</button>
76-
<br />
77-
<button class="btn btn-warning btn-sm" type="button">提交</button>
78-
<button class="btn btn-warning" type="button">提交</button>
79-
<button class="btn btn-warning btn-lg" type="button">提交</button>
80-
<button class="btn btn-warning btn-lg disabled" type="button">提交</button>
81-
<button class="btn btn-warning btn-lg btn-round" type="button">提交</button>
82-
<br />
83-
<button class="btn btn-danger btn-sm" type="button">提交</button>
84-
<button class="btn btn-danger" type="button">提交</button>
85-
<button class="btn btn-danger btn-lg" type="button">提交</button>
86-
<button class="btn btn-danger btn-lg disabled" type="button">提交</button>
87-
<button class="btn btn-danger btn-lg btn-round" type="button">提交</button>
88-
<br />
89-
<button class="btn btn-sm" type="button">提交</button>
90-
<button class="btn" type="button">提交</button>
91-
<button class="btn btn-lg" type="button">提交</button>
92-
<button class="btn btn-lg disabled" type="button">提交</button>
93-
<button class="btn btn-lg btn-round" type="button">提交</button>
94-
<br />
95-
<button class="btn btn-lg btn-round btn-vip" type="button">提交</button>
64+
<div class="margin-bottom">
65+
<button class="btn btn-primary btn-sm" type="button">提交</button>
66+
<button class="btn btn-primary" type="button">提交</button>
67+
<button class="btn btn-primary btn-lg" type="button">提交</button>
68+
<button class="btn btn-primary btn-lg disabled" type="button">提交</button>
69+
<button class="btn btn-primary btn-lg btn-round" type="button">提交</button>
70+
<button class="btn btn-primary-line btn-lg" type="button">提交</button>
71+
</div>
72+
<div class="margin-bottom">
73+
<button class="btn btn-success btn-sm" type="button">提交</button>
74+
<button class="btn btn-success" type="button">提交</button>
75+
<button class="btn btn-success btn-lg" type="button">提交</button>
76+
<button class="btn btn-success btn-lg disabled" type="button">提交</button>
77+
<button class="btn btn-success btn-lg btn-round" type="button">提交</button>
78+
</div>
79+
<div class="margin-bottom">
80+
<button class="btn btn-warning btn-sm" type="button">提交</button>
81+
<button class="btn btn-warning" type="button">提交</button>
82+
<button class="btn btn-warning btn-lg" type="button">提交</button>
83+
<button class="btn btn-warning btn-lg disabled" type="button">提交</button>
84+
<button class="btn btn-warning btn-lg btn-round" type="button">提交</button>
85+
</div>
86+
<div class="margin-bottom">
87+
<button class="btn btn-danger btn-sm" type="button">提交</button>
88+
<button class="btn btn-danger" type="button">提交</button>
89+
<button class="btn btn-danger btn-lg" type="button">提交</button>
90+
<button class="btn btn-danger btn-lg disabled" type="button">提交</button>
91+
<button class="btn btn-danger btn-lg btn-round" type="button">提交</button>
92+
</div>
93+
<div class="margin-bottom">
94+
<button class="btn btn-sm" type="button">提交</button>
95+
<button class="btn" type="button">提交</button>
96+
<button class="btn btn-lg" type="button">提交</button>
97+
<button class="btn btn-lg disabled" type="button">提交</button>
98+
<button class="btn btn-lg btn-round" type="button">提交</button>
99+
</div>
100+
<div class="margin-bottom">
101+
<button class="btn btn-vip" type="button">提交</button>
102+
<button class="btn ub-bg-a" type="button">提交</button>
103+
<button class="btn ub-bg-b" type="button">提交</button>
104+
<button class="btn ub-bg-c" type="button">提交</button>
105+
<button class="btn ub-bg-d" type="button">提交</button>
106+
<button class="btn ub-bg-e" type="button">提交</button>
107+
<button class="btn ub-bg-f" type="button">提交</button>
108+
<button class="btn ub-bg-g" type="button">提交</button>
109+
<button class="btn ub-bg-h" type="button">提交</button>
110+
<button class="btn ub-bg-i" type="button">提交</button>
111+
<button class="btn ub-bg-j" type="button">提交</button>
112+
<button class="btn ub-bg-k" type="button">提交</button>
113+
<button class="btn ub-bg-l" type="button">提交</button>
114+
<button class="btn ub-bg-m" type="button">提交</button>
115+
<button class="btn ub-bg-n" type="button">提交</button>
116+
<button class="btn ub-bg-o" type="button">提交</button>
117+
<button class="btn ub-bg-p" type="button">提交</button>
118+
<button class="btn ub-bg-q" type="button">提交</button>
119+
<button class="btn ub-bg-r" type="button">提交</button>
120+
<button class="btn ub-bg-s" type="button">提交</button>
121+
<button class="btn ub-bg-t" type="button">提交</button>
122+
<button class="btn ub-bg-u" type="button">提交</button>
123+
<button class="btn ub-bg-v" type="button">提交</button>
124+
<button class="btn ub-bg-w" type="button">提交</button>
125+
<button class="btn ub-bg-x" type="button">提交</button>
126+
<button class="btn ub-bg-y" type="button">提交</button>
127+
<button class="btn ub-bg-z" type="button">提交</button>
128+
</div>
96129
</div>
97130
</div>
98131
</form>

‎vendor/modstart/modstart/resources/asset/src/sui/bricks/component/tag/tag.html‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,28 @@
88
<div class="title">标签</div>
99
</div>
1010
<div class="body">
11-
<div>
11+
<div class="margin-bottom">
1212
<span class="ub-tag lg">标签</span>
1313
<span class="ub-tag lg success">标签</span>
1414
<span class="ub-tag lg danger">标签</span>
1515
<span class="ub-tag lg warning">标签</span>
16+
<span class="ub-tag lg primary">标签</span>
1617
<span class="ub-tag lg info">标签</span>
1718
</div>
18-
<div>
19+
<div class="margin-bottom">
1920
<span class="ub-tag">标签</span>
2021
<span class="ub-tag success">标签</span>
2122
<span class="ub-tag danger">标签</span>
2223
<span class="ub-tag warning">标签</span>
24+
<span class="ub-tag primary">标签</span>
2325
<span class="ub-tag info">标签</span>
2426
</div>
25-
<div>
27+
<div class="margin-bottom">
2628
<span class="ub-tag sm">标签</span>
2729
<span class="ub-tag sm success">标签</span>
2830
<span class="ub-tag sm danger">标签</span>
2931
<span class="ub-tag sm warning">标签</span>
32+
<span class="ub-tag sm primary">标签</span>
3033
<span class="ub-tag sm info">标签</span>
3134
</div>
3235
</div>

‎vendor/modstart/modstart/resources/asset/src/sui/bricks/component/tag/tag.less‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
font-size: .65rem;
66
height: 1.2rem;
77
line-height: 0.8rem;
8-
color: #fff;
8+
color: var(--color-text);
99
text-align: center;
1010
white-space: nowrap;
1111
vertical-align: baseline;
1212
border-radius: 50rem;
1313
cursor: default;
14-
background-color: rgb(108, 117, 125);
14+
background-color: rgba(0, 0, 0, 0.04);
1515

1616
&.sm {
1717
font-size: 0.5rem;
@@ -27,24 +27,27 @@
2727
}
2828

2929
&.danger {
30-
background-color: var(--color-danger);
30+
color: var(--color-danger);
31+
background-color: #fff2f0;
3132
}
3233

3334
&.warning {
34-
background-color: var(--color-warning);
35+
color: var(--color-warning);
36+
background-color: #fff2f0
3537
}
3638

3739
&.success {
38-
background-color: var(--color-success);
40+
color: var(--color-success);
41+
background-color: #f6ffed;
3942
}
4043

4144
&.primary {
42-
background-color: var(--color-primary);
45+
color: var(--color-primary);
4346
}
4447

4548
&.info {
46-
background-color: #f4f4f5;
47-
color: #909399;
49+
background-color: #e6f4ff;
50+
color: #1677ff;
4851
}
4952
}
5053

‎vendor/modstart/modstart/src/Admin/Controller/AdminRoleController.php‎

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@
1111
use ModStart\Admin\Model\AdminRole;
1212
use ModStart\Admin\Model\AdminRoleRule;
1313
use ModStart\Admin\Model\AdminUser;
14+
use ModStart\Admin\Provider\AdminRoleConfigProvider;
1415
use ModStart\Core\Util\ArrayUtil;
1516
use ModStart\Core\Util\ConvertUtil;
1617
use ModStart\Core\Util\CRUDUtil;
18+
use ModStart\Core\Util\RenderUtil;
1719
use ModStart\Detail\Detail;
1820
use ModStart\Field\AbstractField;
1921
use ModStart\Form\Form;
@@ -37,6 +39,13 @@ protected function grid()
3739
->hookValueUnserialize(function ($value, AbstractField $field) {
3840
return $value->pluck('rule');
3941
});
42+
if (!AdminRoleConfigProvider::isEmpty()) {
43+
$grid->display('config', '配置')->hookRendering(function (AbstractField $field, $item, $index) {
44+
return RenderUtil::view('modstart::admin.role.configGrid', [
45+
'item' => $item,
46+
]);
47+
});
48+
}
4049
$grid->textarea('remark', L('Remark'));
4150
$grid->gridFilter(function (GridFilter $filter) {
4251
$filter->eq('id', L('ID'));
@@ -66,8 +75,15 @@ protected function form()
6675
return ['rule' => $item];
6776
});
6877
});
78+
if (!AdminRoleConfigProvider::isEmpty()) {
79+
$form->display('config', '配置')->hookRendering(function (AbstractField $field, $item, $index) {
80+
return RenderUtil::view('modstart::admin.role.configForm', [
81+
'item' => $item,
82+
]);
83+
})->formShowOnly(true);
84+
}
6985
$form->textarea('remark', L('Remark'));
70-
$form->display('created_at', L('Created At'));
86+
$form->display('created_at', L('Created At'))->formShowOnly(true);
7187
$form->display('updated_at', L('Updated At'));
7288
$form->hookSaving(function (Form $form) {
7389
if (FormMode::EDIT == $form->mode()) {
@@ -92,6 +108,19 @@ protected function form()
92108
}
93109
}
94110
});
111+
$form->hookSaved(function (Form $form) {
112+
$item = $form->item();
113+
foreach (AdminRoleConfigProvider::listAll() as $provider) {
114+
$provider->saved($item);
115+
}
116+
});
117+
$form->hookDeleted(function (Form $form) {
118+
$form->item()->each(function ($item) {
119+
foreach (AdminRoleConfigProvider::listAll() as $provider) {
120+
$provider->deleted($item);
121+
}
122+
});
123+
});
95124
});
96125
if (AdminPermission::isNotPermit('AdminRoleManage')) {
97126
$form->canAdd(false)->canEdit(false)->canDelete(false);
@@ -114,6 +143,13 @@ protected function detail()
114143
return $r['rule'];
115144
})->toArray();
116145
});
146+
if (!AdminRoleConfigProvider::isEmpty()) {
147+
$detail->display('config', '配置')->hookRendering(function (AbstractField $field, $item, $index) {
148+
return RenderUtil::view('modstart::admin.role.configDetail', [
149+
'item' => $item,
150+
]);
151+
});
152+
}
117153
$detail->display('remark', L('Remark'));
118154
$detail->display('created_at', L('Created At'));
119155
$detail->display('updated_at', L('Updated At'));

0 commit comments

Comments
 (0)