Skip to content

Commit 92b9e95

Browse files
committed
1.5
1 parent 04e4fb7 commit 92b9e95

File tree

2 files changed

+33
-43
lines changed

2 files changed

+33
-43
lines changed

resources/assets/component.js

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ function _componentAlert(message, time = 1, callback = function () {
4242
}, time * 1000);
4343
}
4444

45-
/*点选器*/
4645
class ComponentDot {
4746
DOM;
4847
SELECT_DOM;
@@ -161,7 +160,6 @@ class ComponentDot {
161160
}
162161
}
163162

164-
/*数组列表修改器*/
165163
class ComponentLine {
166164
DOM;
167165
TBODY_DOM;
@@ -389,7 +387,6 @@ class ComponentLine {
389387
}
390388
}
391389

392-
/*弹出层控件*/
393390
class ComponentPlane {
394391
MODEL_BODY_DOM;
395392
LOADING_DOM;
@@ -521,7 +518,6 @@ class ComponentPlane {
521518
}
522519
}
523520

524-
/*拖拽排序控件*/
525521
class ComponentSortable {
526522
list_height;
527523
constructor(list, options) {
@@ -585,14 +581,14 @@ class ComponentSortable {
585581
item.style.left = 0;
586582
item.style.transform = `translateY(${offsetsTop[index]}px)`;
587583
item.style.zIndex = (item == this.item) ? 2 : 1;
588-
})
584+
});
589585

590586
setTimeout(() => {
591587
this.items.forEach(item => {
592588
if (this.item == item) return;
593589
item.style.transition = `transform ${this.options.animationSpeed}ms ${this.options.animationEasing}`;
594590
})
595-
})
591+
});
596592

597593
this.positions = this.items.map((item, index) => index);
598594
this.position = Math.round((this.startTop / this.listHeight) * this.items.length);
@@ -614,12 +610,12 @@ class ComponentSortable {
614610
if (index == this.position || index != newPosition) return;
615611
this.swapElements(this.positions, this.position, index);
616612
this.position = index;
617-
})
613+
});
618614

619615
this.items.forEach((item, index) => {
620616
if (item == this.item) return;
621617
item.style.transform = `translateY(${this.positions.indexOf(index) * this.itemHeight}px)`;
622-
})
618+
});
623619

624620
e.preventDefault();
625621
}
@@ -643,7 +639,7 @@ class ComponentSortable {
643639
item.style.transform = '';
644640
item.style.transition = '';
645641
item.style.zIndex = '';
646-
})
642+
});
647643

648644
this.positions.map(i => this.list.appendChild(this.items[i]));
649645
this.items = Array.from(this.list.children);

src/DLPViewer.php

Lines changed: 28 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ class DLPViewer
2020
* @param Form $form
2121
* @param string $column 数据字段名
2222
* @param string $title 名称
23-
* @param array $select 全部选项
24-
* @param array $selected 已选择选项
23+
* @param array $select 全部选项 [[value=>text],[value=>text]...]
24+
* @param array $selected 已选择选项 [[value=>text],[value=>text]...]
2525
* @param array $settings 配置项
2626
* $settings = [
2727
* 'strict'=>false, boolean json严格模式消除json敏感字符问题
@@ -95,17 +95,15 @@ public static function makeComponentLine(Form $form, string $column, string $tit
9595
* 头部-多操作添加
9696
* @param Grid $grid
9797
* @param array $settings 配置项[setting,...]
98-
* settings.document_id dom节点id (必须填)
99-
* settings.title 自定义按钮名 (必须填)
100-
* settings.url 加载页地址 url/{id}加参数匹配id (必须填)
101-
* settings.xhr_url ajax提交地址 url/{id}加参数匹配id (选填)
102-
* settings.method ajax提交方法 (选填)
103-
* settings.options 弹窗配置项 (选填)
104-
* options = ['W'=>0.8,'H'=>0.8]
98+
* setting.document_id dom节点id string(必须填)
99+
* setting.title 自定义按钮名 string(必须填)
100+
* setting.url 加载页地址:url/{id}参数匹配id string(必须填)
101+
* setting.xhr_url ajax提交地址rl/{id}参数匹配id string(选填)
102+
* setting.method ajax提交方法:POST PUT... string(选填)
103+
* setting.options 弹窗配置项 array(选填)
104+
* options = ['W'=>0.8,'H'=>0.8] W宽 H高
105105
*/
106-
public static function makeHeadPlaneAction(Grid $grid, array $settings = [
107-
['document_id' => '', 'title' => '', 'url' => '', 'xhr_url' => '', 'method' => 'POST', 'options' => []]
108-
])
106+
public static function makeHeadPlaneAction(Grid $grid, array $settings = [])
109107
{
110108
$script = '';
111109
foreach ($settings as $setting) {
@@ -147,18 +145,16 @@ public function render()
147145
* 列-多操作添加
148146
* @param Grid $grid
149147
* @param array $settings [setting,...]
150-
* setting.document_class dom节点classname (必须填)
151-
* setting.title 自定义按钮名 (必须填)
152-
* setting.url 加载页地址 url/{id}加参数匹配id (必须填)
153-
* setting.xhr_url ajax提交地址 url/{id}加参数匹配id (选填)
154-
* setting.method ajax提交方法 (选填)
155-
* setting.options 弹窗配置项 (选填)
156-
* options = ['W'=>0.8,'H'=>0.8]
157-
* @param array $disable ['view','edit','delete']
148+
* setting.document_class dom节点classname string(必须填)
149+
* setting.title 自定义按钮名 string(必须填)
150+
* setting.url 加载页地址:url/{id}参数匹配id string(必须填)
151+
* setting.xhr_url ajax提交地址:url/{id}加参数匹配id string(选填)
152+
* setting.method ajax提交方法:POST PUT... string(选填)
153+
* setting.options 弹窗配置项 array(选填)
154+
* options = ['W'=>0.8,'H'=>0.8] W宽 H高
155+
* @param array $disable ['view','edit','delete'] 禁止操作按钮
158156
*/
159-
public static function makeRowPlaneAction(Grid $grid, array $settings = [
160-
['document_class' => '', 'title' => '', 'url' => '', 'xhr_url' => '', 'method' => 'POST', 'options' => []]
161-
], array $disable = [])
157+
public static function makeRowPlaneAction(Grid $grid, array $settings = [], array $disable = [])
162158
{
163159
$script = '';
164160
foreach ($settings as $setting) {
@@ -207,18 +203,16 @@ public function render()
207203
* 列-多操作添加 (旧版图标按钮模式)
208204
* @param Grid $grid
209205
* @param array $settings [setting,...]
210-
* setting.document_class dom节点classname (必须填)
211-
* setting.title 自定义按钮名 (必须填)
212-
* setting.url 加载页地址 url/{id}加参数匹配id (必须填)
213-
* setting.xhr_url ajax提交地址 url/{id}加参数匹配id (选填)
214-
* setting.method ajax提交方法 (选填)
215-
* setting.options 弹窗配置项 (选填)
216-
* options = ['W'=>0.8,'H'=>0.8]
217-
* @param array $disable ['view','edit','delete']
206+
* setting.document_class dom节点classname string(必须填)
207+
* setting.title 自定义按钮名 string(必须填)
208+
* setting.url 加载页地址:url/{id}参数匹配id string(必须填)
209+
* setting.xhr_url ajax提交地址:url/{id}加参数匹配id string(选填)
210+
* setting.method ajax提交方法:POST PUT... string(选填)
211+
* setting.options 弹窗配置项 array(选填)
212+
* options = ['W'=>0.8,'H'=>0.8] W宽 H高
213+
* @param array $disable ['view','edit','delete'] 禁止操作按钮
218214
*/
219-
public static function _makeRowPlaneAction(Grid $grid, array $settings = [
220-
['document_class' => '', 'title' => '', 'url' => '', 'xhr_url' => '', 'method' => 'POST', 'options' => []]
221-
], array $disable = [])
215+
public static function _makeRowPlaneAction(Grid $grid, array $settings = [], array $disable = [])
222216
{
223217
$script = '';
224218
foreach ($settings as $setting) {

0 commit comments

Comments
 (0)