From e8b2d39d33473b87253f7bd3ba3c9f2306ea3541 Mon Sep 17 00:00:00 2001 From: wangxuepeng Date: Mon, 20 Nov 2023 16:35:18 +0800 Subject: [PATCH] * Change to new writing method. --- module/api/ui/create.html.php | 18 +++++++----------- module/api/ui/edit.html.php | 22 ++++++++-------------- module/api/ui/view.html.php | 10 +++++----- module/programplan/ui/create.html.php | 12 ++++-------- module/programplan/ui/edit.html.php | 4 ++-- 5 files changed, 26 insertions(+), 40 deletions(-) diff --git a/module/api/ui/create.html.php b/module/api/ui/create.html.php index 2a5cdccbd4..041378b71c 100644 --- a/module/api/ui/create.html.php +++ b/module/api/ui/create.html.php @@ -106,7 +106,7 @@ formPanel ), formGroup ( - set::id('form-header'), + setID('form-header'), setClass('params-group'), set::label($lang->api->header), h::table @@ -173,7 +173,7 @@ formPanel ), formGroup ( - set::id('form-query'), + setID('form-query'), setClass('params-group'), set::label($lang->api->query), h::table @@ -240,7 +240,7 @@ formPanel ), formGroup ( - set::id('form-paramsType'), + setID('form-paramsType'), setClass('params-group'), set::label($lang->struct->type), radioList @@ -253,7 +253,7 @@ formPanel ), formGroup ( - set::id('form-params'), + setID('form-params'), setClass('params-group'), set::label($lang->api->params), h::table @@ -288,9 +288,7 @@ formPanel h::tr ( setClass('input-row'), - set('data-level', 1), - set('data-key', 'origin'), - set('data-parent', '0'), + setData(array('level' => 1, 'key' => 'origin', 'parent' => '0')), h::td ( input @@ -356,7 +354,7 @@ formPanel ), formGroup ( - set::id('form-response'), + setID('form-response'), setClass('response'), set::label($lang->api->response), h::table @@ -391,9 +389,7 @@ formPanel h::tr ( setClass('input-row'), - set('data-level', 1), - set('data-key', 'origin'), - set('data-parent', '0'), + setData(array('level' => 1, 'key' => 'origin', 'parent' => '0')), h::td ( input diff --git a/module/api/ui/edit.html.php b/module/api/ui/edit.html.php index 54f6af4bd3..9ecd168113 100644 --- a/module/api/ui/edit.html.php +++ b/module/api/ui/edit.html.php @@ -156,9 +156,7 @@ $parseTree = function($data, $typeList, $level = 0) use (&$parseTree) $tbody[] = h::tr ( setClass('input-row'), - set('data-level', $level + 1), - set('data-key', $data['key']), - set('data-parent', isset($data['parent']) ? $data['parent'] : 0), + setData(array('level' => $level + 1, 'key' => $data['key'], 'parent' => isset($data['parent']) ? $data['parent'] : 0)), h::td ( $level ? setStyle('padding-left', ($level + 1) * 10 . 'px') : null, @@ -232,9 +230,7 @@ else $apiParams[] = h::tr ( setClass('input-row'), - set('data-level', 1), - set('data-key', 'origin'), - set('data-parent', '0'), + setData(array('level' => 1, 'key' => 'origin', 'parent' => '0')), h::td ( input @@ -297,9 +293,7 @@ else $apiResponse[] = h::tr ( setClass('input-row'), - set('data-level', 1), - set('data-key', 'origin'), - set('data-parent', '0'), + setData(array('level' => 1, 'key' => 'origin', 'parent' => '0')), h::td ( input @@ -456,7 +450,7 @@ formPanel ), formGroup ( - set::id('form-header'), + setID('form-header'), setClass('params-group'), set::label($lang->api->header), h::table @@ -488,7 +482,7 @@ formPanel ), formGroup ( - set::id('form-query'), + setID('form-query'), setClass('params-group'), set::label($lang->api->query), h::table @@ -520,7 +514,7 @@ formPanel ), formGroup ( - set::id('form-paramsType'), + setID('form-paramsType'), setClass('params-group'), set::label($lang->struct->type), radioList @@ -533,7 +527,7 @@ formPanel ), formGroup ( - set::id('form-params'), + setID('form-params'), setClass('params-group'), set::label($lang->api->params), h::table @@ -580,7 +574,7 @@ formPanel ), formGroup ( - set::id('form-response'), + setID('form-response'), setClass('response'), set::label($lang->api->response), h::table diff --git a/module/api/ui/view.html.php b/module/api/ui/view.html.php index 19c961f248..2ba4b62cb5 100644 --- a/module/api/ui/view.html.php +++ b/module/api/ui/view.html.php @@ -255,12 +255,12 @@ div ( set::url(createLink('api', 'delete', "apiID=$api->id")), setClass('btn ghost ajax-submit'), - set('data-confirm', $lang->api->confirmDelete), + setData(array('confirm' => $lang->api->confirmDelete)), icon('trash') ) : null, btn ( - set::id('hisTrigger'), + setID('hisTrigger'), set::url('###)'), setClass('btn ghost'), icon('clock') @@ -270,8 +270,8 @@ div ), div ( - set::className('panel-body'), - set::id('content'), + setClass('panel-body'), + setID('content'), h2($api->title), div(setClass('desc'), html($api->desc)), $apiHeader, @@ -286,7 +286,7 @@ div ), panel ( - set::id('history'), + setID('history'), setClass('hidden'), history ( diff --git a/module/programplan/ui/create.html.php b/module/programplan/ui/create.html.php index b5f8d5b9cf..17b5c92571 100644 --- a/module/programplan/ui/create.html.php +++ b/module/programplan/ui/create.html.php @@ -72,11 +72,7 @@ $fnGenerateSubPlanManageFields = function() use ($lang, $planID, $project, $exec 'help', setID('methodTip'), setClass('ml-2 text-gray'), - set('data-toggle', 'tooltip'), - set('data-title', $lang->programplan->methodTip), - set('data-placement', 'right'), - set('data-type', 'white'), - set('data-class-name', 'text-gray border border-light') + setData(array('toggle' => 'tooltip', 'title' => $lang->programplan->methodTip, 'placement' => 'right', 'type' => 'white', 'class-name' => 'text-gray border border-light')), ); $items[] = tooltip( @@ -84,7 +80,7 @@ $fnGenerateSubPlanManageFields = function() use ($lang, $planID, $project, $exec set::title($lang->programplan->methodTip), set::placement('right'), set::type('white'), - set::className('text-darker border border-light') + setClass('text-darker border border-light') ); return div @@ -249,12 +245,12 @@ featureBar(li toolbar ( - btn(setClass('btn primary open-url'), set::icon('back'), set('data-back', 'APP'), $lang->goback) + btn(setClass('btn primary open-url'), set::icon('back'), setData(array('back', 'APP')), $lang->goback) ); formBatchPanel ( - set::id('dataform'), + setID('dataform'), set::onRenderRow(jsRaw('window.onRenderRow')), to::headingActions(array($fnGenerateSubPlanManageFields())), set::customFields(array('list' => $customFields, 'show' => explode(',', $showFields), 'key' => 'createFields')), diff --git a/module/programplan/ui/edit.html.php b/module/programplan/ui/edit.html.php index 9bb24a6695..f508a3764e 100644 --- a/module/programplan/ui/edit.html.php +++ b/module/programplan/ui/edit.html.php @@ -30,7 +30,7 @@ modalHeader formPanel ( - set::id('editForm'), + setID('editForm'), set::ajax(array('beforeSubmit' => jsRaw("editStage"))), set::submitBtnText($lang->save), formGroup @@ -97,7 +97,7 @@ formPanel setClass('flex self-center w-full'), $enableOptionalAttr ? picker ( - set::id('attribute'), + setID('attribute'), set::name('attribute'), set::items($typeList), set::value($plan->attribute),