Merge branch 'master' into Merge184

2023-11-20 19:34:48 -05:00
parent 6918f02bc4 53014b5128
commit f475f1fde8
69 changed files with 1019 additions and 710 deletions
@@ -635,7 +635,7 @@ class api extends control

            $this->action->create('api', $api->id, 'Created', '', '', '', false);

-            if(isInModal()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => 'true', 'callback' => "parentLocate({$api->id}, {$api->lib}, {$api->module})"));
+            if(isInModal()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => true));
            return $this->sendSuccess(array('locate' => helper::createLink('api', 'index', "libID={$api->lib}&moduleID={$api->module}&apiID={$api->id}")));
        }

@@ -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
@@ -29,7 +29,7 @@ formPanel
    ),
    formGroup
    (
-        set::id('form-paramsType'),
+        setID('form-paramsType'),
        setClass('params-group struct'),
        set::label($lang->struct->type),
        radioList
@@ -42,7 +42,7 @@ formPanel
    ),
    formGroup
    (
-        set::id('form-params'),
+        setID('form-params'),
        setClass('params-group struct'),
        set::label($lang->api->params),
        h::table
@@ -77,9 +77,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()
@@ -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
@@ -21,9 +21,7 @@ if(!empty($struct->attribute))
        $attributes[] = 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,
@@ -96,9 +94,7 @@ else
    $attributes = 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
@@ -173,7 +169,7 @@ formPanel
    ),
    formGroup
    (
-        set::id('form-paramsType'),
+        setID('form-paramsType'),
        setClass('params-group struct'),
        set::label($lang->struct->type),
        radioList
@@ -186,7 +182,7 @@ formPanel
    ),
    formGroup
    (
-        set::id('form-params'),
+        setID('form-params'),
        setClass('params-group struct'),
        set::label($lang->api->params),
        h::table
@@ -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
            (