Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Remove , at the end of row in the lastest children in tree in lite extension.

Browse Source
This commit is contained in:
liumengyi
2023-11-15 10:06:42 +08:00
parent eda18ab17f
commit 4275d9b6b6
2 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extension/lite/tree/ext/ui/browse.html.php
+28 -28
View File
@@ -56,7 +56,7 @@ foreach($sons as $son)
set::name("modules[id$son->id]"),
set::type('input'),
set::value($son->name),
set::placeholder($placeholder),
set::placeholder($placeholder)
),
input
(
@@ -64,17 +64,17 @@ foreach($sons as $son)
set::name("shorts[id$son->id]"),
set::type('input'),
set::value($son->short),
set::placeholder($lang->tree->short),
set::placeholder($lang->tree->short)
),
input
(
setClass('hidden'),
set::name("order[id$son->id]"),
set::value($son->order),
set::control('hidden'),
),
),
),
set::control('hidden')
)
)
)
);
}
@@ -93,7 +93,7 @@ for($i = 0; $i < \tree::NEW_CHILD_COUNT; $i ++)
set::name("modules[$i]"),
set::type('input'),
set::value(''),
set::placeholder($placeholder),
set::placeholder($placeholder)
),
input
(
@@ -101,18 +101,18 @@ for($i = 0; $i < \tree::NEW_CHILD_COUNT; $i ++)
set::name("shorts[$i]"),
set::type('input'),
set::value(''),
set::placeholder($lang->tree->short),
set::placeholder($lang->tree->short)
),
input
(
setClass('hidden'),
set::name("branch[$i]"),
set::value(0),
set::control('hidden'),
),
set::control('hidden')
)
),
batchActions(),
),
batchActions()
)
);
}
@@ -123,12 +123,12 @@ $parentPath[] = span
(
setClass('tree-link'),
set('href', helper::createLink('tree', 'browse', "rootID=$root->id&view={$viewType}&currentModuleID=0&branch=$branch")),
$root->name,
$root->name
),
h::i
(
setClass('icon icon-angle-right muted align-middle'),
setStyle('color', '#313C52'),
setStyle('color', '#313C52')
)
);
foreach($parentModules as $module)
@@ -139,12 +139,12 @@ foreach($parentModules as $module)
(
setClass('tree-link'),
set('href', helper::createLink('tree', 'browse', "rootID=$root->id&view={$viewType}&currentModuleID=$module->id&branch=$branch")),
$module->name,
$module->name
),
h::i
(
setClass('icon icon-angle-right muted align-middle'),
setStyle('color', '#313C52'),
setStyle('color', '#313C52')
)
);
}
@@ -156,12 +156,12 @@ div
(
set::icon('back'),
set::type('secondary'),
$lang->goback,
$lang->goback
) : null,
div
(
setClass('entity-label flex items-center gap-x-2 article-h1'),
$lang->tree->common . $lang->colon . $root->name,
$lang->tree->common . $lang->colon . $root->name
)
);
@@ -185,19 +185,19 @@ div
(
'class' => 'btn primary size-sm',
'url' => createLink('tree', 'viewHistory', "productID=$rootID"),
'data-toggle' => 'modal',
'data-toggle' => 'modal'
)
),
$lang->history
),
)
) : null,
treeEditor
(
set('type', $viewType),
set('items', $tree),
set('canEdit', common::hasPriv('tree', 'edit') && $canBeChanged),
set('canDelete', common::hasPriv('tree', 'delete') && $canBeChanged),
),
set('canDelete', common::hasPriv('tree', 'delete') && $canBeChanged)
)
)
),
div
@@ -214,7 +214,7 @@ div
(
setClass('p-1 tree-item-content'),
setStyle('max-width', '400px'),
$parentPath,
$parentPath
),
form
(
@@ -228,17 +228,17 @@ div
setClass('hidden'),
set::name('parentModuleID'),
set::value($currentModuleID),
set::control('hidden'),
set::control('hidden')
),
formGroup
(
setClass('hidden'),
set::name('maxOrder'),
set::value($maxOrder),
set::control('hidden'),
),
),
),
set::control('hidden')
)
)
)
)
)
);
extension/lite/tree/ext/ui/browsetask.html.php
+28 -28
View File
@@ -43,8 +43,8 @@ if($newModule and !$productID)
set::name("products[id$product->id]"),
set::type('input'),
set::value($product->name),
set::disabled(true),
),
set::disabled(true)
)
)
);
}
@@ -67,7 +67,7 @@ foreach($sons as $son)
set::name("modules[id$son->id]"),
set::type('input'),
set::value($son->name),
set::placeholder($lang->tree->name),
set::placeholder($lang->tree->name)
),
input
(
@@ -75,17 +75,17 @@ foreach($sons as $son)
set::name("shorts[id$son->id]"),
set::type('input'),
set::value($son->short),
set::placeholder($lang->tree->short),
set::placeholder($lang->tree->short)
),
input
(
setClass('hidden'),
set::name("order[id$son->id]"),
set::value($son->order),
set::control('hidden'),
),
),
),
set::control('hidden')
)
)
)
);
}
@@ -104,7 +104,7 @@ for($i = 0; $i < \tree::NEW_CHILD_COUNT; $i ++)
set::name("modules[$i]"),
set::type('input'),
set::value(''),
set::placeholder($lang->tree->name),
set::placeholder($lang->tree->name)
),
input
(
@@ -112,18 +112,18 @@ for($i = 0; $i < \tree::NEW_CHILD_COUNT; $i ++)
set::name("shorts[$i]"),
set::type('input'),
set::value(''),
set::placeholder($lang->tree->short),
set::placeholder($lang->tree->short)
),
input
(
setClass('hidden'),
set::name("branch[$i]"),
set::value(0),
set::control('hidden'),
),
set::control('hidden')
)
),
batchActions(),
),
batchActions()
)
);
}
@@ -134,12 +134,12 @@ $parentPath[] = span
(
setClass('tree-link'),
set('href', helper::createLink('tree', 'browsetask', "rootID=$root->id&productID=$productID") . '#app=project'),
$root->name,
$root->name
),
h::i
(
setClass('icon icon-angle-right muted align-middle'),
setStyle('color', '#313C52'),
setStyle('color', '#313C52')
)
);
foreach($parentModules as $module)
@@ -150,12 +150,12 @@ foreach($parentModules as $module)
(
setClass('tree-link'),
set('href', helper::createLink('tree', 'browsetask', "rootID=$root->id&productID=$productID&module=$module->id") . '#app=project'),
$module->name,
$module->name
),
h::i
(
setClass('icon icon-angle-right muted align-middle'),
setStyle('color', '#313C52'),
setStyle('color', '#313C52')
)
);
}
@@ -168,12 +168,12 @@ div
set::icon('back'),
set::type('secondary'),
set::back('execution-task'),
$lang->goback,
$lang->goback
),
div
(
setClass('entity-label flex items-center gap-x-2 article-h1'),
$lang->tree->common . $lang->colon . $root->name,
$lang->tree->common . $lang->colon . $root->name
)
);
@@ -191,8 +191,8 @@ div
set('type', 'task'),
set('items', $tree),
set('canEdit', common::hasPriv('tree', 'edit') && $canBeChanged),
set('canDelete', common::hasPriv('tree', 'delete') && $canBeChanged),
),
set('canDelete', common::hasPriv('tree', 'delete') && $canBeChanged)
)
)
),
div
@@ -207,7 +207,7 @@ div
div
(
setClass('p-1 tree-item-content'),
$parentPath,
$parentPath
),
form
(
@@ -222,17 +222,17 @@ div
setClass('hidden'),
set::name('parentModuleID'),
set::value($currentModuleID),
set::control('hidden'),
set::control('hidden')
),
formGroup
(
setClass('hidden'),
set::name('maxOrder'),
set::value($maxOrder),
set::control('hidden'),
),
),
),
set::control('hidden')
)
)
)
)
)
);