cmdbox 0.5.1.2__py3-none-any.whl → 0.5.3__py3-none-any.whl

cmdbox/web/assets/cmdbox/list_cmd.js

@@ -93,13 +93,14 @@ const list_cmd_func = async () => {
     };
     // タグボタンを追加
     py_list_cmd.forEach(row => {
+        // タグボタンを追加
         if (!row.tag || !Array.isArray(row.tag)) return;
         row.tag.forEach(tag => {
             if (tag=='') return;
             if (cmd_item_tags.find(`[data-tag="${tag}"]`).length > 0) return;
-            const elem = $(`<button type="button" class="btn btn-outline-secondary btn-sm btn-tag me-2">${tag}</button>`);
+            const elem = $(`<button type="button" class="btn btn-outline-secondary btn-sm btn-tag me-2">` +
+                            `<svg class="bi svg-tag" width="16" height="16" fill="currentColor"><use href="#svg_tag"></use></svg>${tag}</button>`);
             elem.attr('data-tag', tag);
-            elem.text(tag);
             elem.click(tag_bot_click);
             cmd_item_tags.append(elem);
         });
@@ -158,167 +159,16 @@ const list_cmd_func_then = () => {
             const cmd = cmd_modal.find('[name="cmd"]').val();
             const selected_cmd = cmd_modal.find('[name="cmd"] option:selected');
             cmd_modal.find('.cmd_label').attr('title', selected_cmd.attr('discription'));
-            const py_get_cmd_choices = await get_cmd_choices(mode, cmd);
+            const py_get_cmd_choices = await cmdbox.get_cmd_choices(mode, cmd);
             row_content.html('');
-            // オプション一覧をフォームに追加
-            const add_form_func = (i, row, next_elem) => {
-                const target_name = row.opt;
-                let input_elem, elem;
-                if(!row.choice) {
-                    // 選択肢がない場合
-                    if(row.type=='text') {
-                        elem = $(cmd_modal.find('.row_content_template_text').html());
-                    } else if(row.type=='dict') {
-                        elem = $(cmd_modal.find('.row_content_template_dict').html());
-                    } else {
-                        elem = $(cmd_modal.find('.row_content_template_str').html());
-                    }
-                    if (next_elem) next_elem.after(elem);
-                    else row_content.append(elem);
-                    input_elem = elem.find('.row_content_template_input');
-                    input_elem.removeClass('row_content_template_input');
-                    input_elem.val(row.default);
-                }
-                else {
-                    // 選択肢がある場合
-                    if(row.type=='dict') {
-                        elem = $(cmd_modal.find('.row_content_template_dict_choice').html());
-                    } else {
-                        elem = $(cmd_modal.find('.row_content_template_choice').html());
-                    }
-                    if (next_elem) next_elem.after(elem);
-                    else row_content.append(elem);
-                    input_elem = elem.find('.row_content_template_select,.row_content_template_input');
-                    input_elem.removeClass('row_content_template_select').removeClass('row_content_template_input');
-                    if (row.choice_show) {
-                        input_elem.addClass('choice_show');
-                        input_elem.change(() => {
-                            let names = []
-                            for (const ns of Object.values(row.choice_show)) {
-                                if (Array.isArray(ns)) {
-                                    ns.forEach(n => names.push(n));
-                                } else {
-                                    names.push(ns);
-                                }
-                            }
-                            names = [...new Set(names)];
-                            names.forEach(name => row_content.find(`[name="${name}"]`).parent().parent().hide());
-                            const v = input_elem.val();
-                            if (!row.choice_show[v]) return;
-                            row.choice_show[v].forEach(n => row_content.find(`[name="${n}"]`).parent().parent().show());
-                        });
-                    }
-                    input_elem.html(mkopt(row.choice));
-                    input_elem.val(`${row.default!=null?row.default:''}`);
-                }
-                let index = 0;
-                if (cmd_modal.find(`[name="${target_name}"]`).length > 0) {
-                    index = 0;
-                    cmd_modal.find(`[name="${target_name}"][param_data_index]`).each((i, val) => {
-                        v = Number($(val).attr('param_data_index'));
-                        if (index <= v) index = v + 1;
-                    });
-                }
-                input_elem.attr('name', target_name);
-                if(row.type=='dict') {
-                    input_elem.each((i, e) => {
-                        $(e).attr('id', target_name + (index + i));
-                        $(e).attr('param_data_index', (index + i));
-                    });
-                } else {
-                    input_elem.attr('id', target_name + index);
-                    input_elem.attr('param_data_index', index);
-                }
-                input_elem.attr('required', row.required);
-                input_elem.attr('param_data_type', row.type);
-                input_elem.attr('param_data_multi', row.multi);
-                input_elem.attr('param_data_web', row.web);
-                if (row.web=='mask' || row.web=='readonly') {
-                    input_elem.attr('disabled', 'disabled');
-                }
-                // ファイルタイプの場合はファイラーモーダルを開くボタンを追加
-                if(row.type=='file'){
-                    const btn = $('<button class="btn btn-secondary" type="button">file</button>');
-                    input_elem.parent().append(btn);
-                    const mk_func = (tid, tn) => {
-                        // tid, tnの値を残すためにクロージャーにする
-                        return () => {
-                            const current_path = $(`[id="${tid}"]`).val();
-                            fmodal.filer_modal_func(tid, tn, current_path, false, true);
-                        }
-                    }
-                    btn.click(mk_func(input_elem.attr('id'), input_elem.attr('name')));
-                }
-                // ディレクトリタイプの場合はファイラーモーダルを開くボタンを追加
-                if(row.type=='dir'){
-                    const btn = $('<button class="btn btn-secondary" type="button">dir</button>');
-                    input_elem.parent().append(btn);
-                    const mk_func = (tid, tn) => {
-                        // tid, tnの値を残すためにクロージャーにする
-                        return () => {
-                            const current_path = $(`[id="${tid}"]`).val();
-                            fmodal.filer_modal_func(tid, tn, current_path, true, true);
-                        }
-                    }
-                    btn.click(mk_func(input_elem.attr('id'), input_elem.attr('name')));
-                }
-                // マルチの場合は追加ボタンを追加
-                if(row.multi){
-                    const btn_a = $('<button class="btn btn-secondary add_buton" type="button"></button>');
-                    btn_a.append('<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-plus" viewBox="0 0 16 16">'
-                                +'<path d="M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4z"/>'
-                                +'</svg>');
-                    input_elem.parent().append(btn_a);
-                    let mk_func = (row, next_elem) => {
-                        // row, next_elemの値を残すためにクロージャーにする
-                        return () => {
-                            const r = {...row};
-                            //r.hide = next_elem.is(':hidden');
-                            add_form_func(0, r, next_elem);
-                        }
-                    }
-                    btn_a.click(mk_func(row, input_elem.parent().parent()));
-                    // 2個目以降は削除ボタンを追加
-                    const len = cmd_modal.find(`[name="${target_name}"]`).length;
-                    if (row.type!='dict' && len > 1 || row.type=='dict' && len > 2) {
-                        mk_func = (del_elem, row) => {
-                            // del_elemの値を残すためにクロージャーにする
-                            return () => del_elem.remove();
-                        }
-                        const btn_t = $('<button class="btn btn-secondary" type="button"></button>');
-                        btn_t.append('<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-trash" viewBox="0 0 16 16">'
-                                +'<path d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6z"/>'
-                                +'<path fill-rule="evenodd" d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1v1zM4.118 4 4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118zM2.5 3V2h11v1h-11z"/>'
-                                +'</svg>');
-                        input_elem.parent().append(btn_t);
-                        btn_t.click(mk_func(input_elem.parent().parent(), row));
-                    }
-                }
-                const title = elem.find('.row_content_template_title');
-                title.html('');
-                title.attr('title', window.navigator.language=='ja'?row.discription_ja:row.discription_en)
-                if (row.required) {
-                    title.append('<span class="text-danger" title="required">*</span>');
-                }
-                if (row.choice_show) {
-                    title.append('<span class="text-primary" title="choice_show">*</span>');
-                }
-                title.append(`<span>${row.opt}</span>`);
-                if (row.hide) {
-                    if (row_content.find('.row_content_hide').is(':hidden')) elem.hide();
-                    elem.addClass('row_content_hide');
-                } else {
-                    title.addClass('text-decoration-underline');
-                }
-            }
             // 表示オプションを追加
-            py_get_cmd_choices.filter(row => !row.hide).forEach((row, i) => add_form_func(i, row, null));
+            py_get_cmd_choices.filter(row => !row.hide).forEach((row, i) => cmdbox.add_form_func(i, cmd_modal, row_content, row, null));
             // 高度なオプションを表示するリンクを追加
             const show_link = $('<div class="text-center card-hover mb-3"><a href="#">[ advanced options ]</a></div>');
             show_link.click(() => row_content.find('.row_content_hide').toggle());
             row_content.append(show_link);
             // 非表示オプションを追加
-            py_get_cmd_choices.filter(row => row.hide).forEach((row, i) => add_form_func(i, row, null));
+            py_get_cmd_choices.filter(row => row.hide).forEach((row, i) => cmdbox.add_form_func(i, cmd_modal, row_content, row, null));
             cmd_modal.find('.choice_show').change();
         }
         //row_content.find('is-invalid, is-valid').removeClass('is-invalid').removeClass('is-valid');
@@ -410,7 +260,7 @@ const list_cmd_func_then = () => {
             cmdbox.load_cmd_pin(title).then((result) => {
                 if (!result['success']) {
                     cmd_modal.find('.btn_pin_fill').hide();
-                    cmd_modal.find('.btn_pin_angle').hide();
+                    cmd_modal.find('.btn_pin_angle').show();
                 } else if (result['success']=='on') {
                     cmd_modal.find('.btn_pin_fill').show();
                     cmd_modal.find('.btn_pin_angle').hide();
@@ -450,7 +300,7 @@ const list_cmd_func_then = () => {
     // コマンドファイルの保存
     $('#cmd_save').off('click').on('click', async () => {
         const cmd_modal = $('#cmd_modal');
-        const [title, opt] = get_param(cmd_modal);
+        const [title, opt] = cmdbox.get_param(cmd_modal);
         if (cmd_modal.find('.row_content, .row_content_common').find('.is-invalid').length > 0) {
             return;
         }
@@ -481,7 +331,7 @@ const list_cmd_func_then = () => {
     // コマンドファイルの実行
     $('#cmd_exec').off('click').on('click', async () => {
         const cmd_modal = $('#cmd_modal');
-        const [title, opt] = get_param(cmd_modal);
+        const [title, opt] = cmdbox.get_param(cmd_modal);
         if (cmd_modal.find('.row_content, .row_content_common').find('.is-invalid').length > 0) {
             return;
         }
@@ -496,7 +346,7 @@ const list_cmd_func_then = () => {
     // RAW表示の実行
     $('#cmd_raw').off('click').on('click', async () => {
         const cmd_modal = $('#cmd_modal');
-        const [title, opt] = get_param(cmd_modal);
+        const [title, opt] = cmdbox.get_param(cmd_modal);
         if (cmd_modal.find('.row_content, .row_content_common').find('.is-invalid').length > 0) {
             return;
         }
@@ -509,113 +359,6 @@ const list_cmd_func_then = () => {
     });
 };
 
-// コマンドフォームからパラメータを取得
-const get_param = (modal_elem) => {
-    modal_elem.find('.is-invalid, .is-valid').removeClass('is-invalid').removeClass('is-valid');
-    const opt = {};
-    const title = modal_elem.find('[name="title"]').val();
-    opt["modal_mode"] = modal_elem.find('[name="modal_mode"]').val();
-    opt["mode"] = modal_elem.find('[name="mode"]').val();
-    opt["cmd"] = modal_elem.find('[name="cmd"]').val();
-    if(!opt["mode"]) delete opt["mode"];
-    if(!opt["cmd"]) delete opt["cmd"];
-    opt["title"] = title;
-    const isFloat = (i) => {
-        try {
-            n = Number(i);
-            return n % 1 !== 0;
-        } catch(e) {
-            return false;
-        }
-    }
-    const isInt = (i) => {
-        try {
-            n = Number(i);
-            return n % 1 === 0;
-        } catch(e) {
-            return false;
-        }
-    }
-    // フォームの入力値をチェック（不正な値があればフォームに'is-invalid'クラスを付加する）
-    const dict_buf = {};
-    modal_elem.find('.row_content, .row_content_common').find('input, select, textarea').each((i, elem) => {
-        const data_name = $(elem).attr('name');
-        let data_val = $(elem).val();
-        const data_type = $(elem).attr('param_data_type');
-        const data_web = $(elem).attr('param_data_web');
-        const data_index = parseInt($(elem).attr('param_data_index'));
-        const data_multi = $(elem).attr('param_data_multi');
-        if ($(elem).attr('required') && (!data_val || data_val=='')) {
-            $(elem).addClass('is-invalid');
-        } else if (data_type=='int' && !data_web) {
-            if(data_val && data_val!='') {
-                if(!isInt(data_val)) $(elem).addClass('is-invalid');
-                else {
-                    $(elem).removeClass('is-invalid');
-                    $(elem).addClass('is-valid');
-                    data_val = parseInt(data_val);
-                }
-            } else {
-                $(elem).removeClass('is-invalid');
-                $(elem).addClass('is-valid');
-            }
-        } else if (data_type=='float') {
-            if(data_val && data_val!='') {
-                if(!isFloat(data_val) && !isInt(data_val)) $(elem).addClass('is-invalid');
-                else {
-                    $(elem).removeClass('is-invalid');
-                    $(elem).addClass('is-valid');
-                    data_val = parseFloat(data_val);
-                }
-            } else {
-                $(elem).removeClass('is-invalid');
-                $(elem).addClass('is-valid');
-            }
-        } else if (data_type=='bool') {
-            if(data_val!='true' && data_val!='false') $(elem).addClass('is-invalid');
-            else {
-                data_val = data_val=='true';
-                $(elem).removeClass('is-invalid');
-                $(elem).addClass('is-valid');
-            }
-        } else if (data_type=='dict') {
-            data_val = data_val ? data_val : '';
-            if(data_val.indexOf(' ')>=0) $(elem).addClass('is-invalid');
-            else {
-                $(elem).removeClass('is-invalid');
-                $(elem).addClass('is-valid');
-            }
-        } else if (data_type=='text') {
-            $(elem).removeClass('is-invalid');
-            $(elem).addClass('is-valid');
-        } else {
-            $(elem).removeClass('is-invalid');
-            $(elem).addClass('is-valid');
-        }
-        if(data_multi=='true' || data_type=='dict') {
-            if (data_type=='dict') {
-                if(!opt[data_name]) {
-                    opt[data_name] = {};
-                    dict_buf[data_name] = {};
-                }
-                if(data_index%2==0) dict_buf[data_name]['key'] = data_val;
-                else if (dict_buf[data_name]['key']) {
-                    opt[data_name][dict_buf[data_name]['key']] = data_val;
-                    delete dict_buf[data_name]['key'];
-                }
-            } else {
-                if(!opt[data_name]) opt[data_name] = [];
-                if(data_val && data_val!='') opt[data_name].push(data_val);
-                else if(data_val==false) opt[data_name].push(data_val);
-            }
-        } else {
-            if(data_val && data_val!='') opt[data_name] = data_val;
-            else if(data_val==false) opt[data_name] = data_val;
-        }
-    });
-    return [title, opt];
-}
-
 const list_cmd = async (kwd) => {
     const formData = new FormData();
     formData.append('kwd', kwd?`*${kwd}*`:'*');
@@ -635,14 +378,6 @@ const get_cmds = async (mode) => {
     if (res.status != 200) cmdbox.message({'error':`${res.status}: ${res.statusText}`});
     return await res.json();
 }
-const get_cmd_choices = async (mode, cmd) => {
-    const formData = new FormData();
-    formData.append('mode', mode);
-    formData.append('cmd', cmd);
-    const res = await fetch('gui/get_cmd_choices', {method: 'POST', body: formData});
-    if (res.status != 200) cmdbox.message({'error':`${res.status}: ${res.statusText}`});
-    return await res.json();
-}
 const load_cmd = async (title) => {
     const formData = new FormData();
     formData.append('title', title);

cmdbox/web/assets/cmdbox/list_pipe.js

@@ -131,7 +131,7 @@ list_pipe_func_then = () => {
     // パイプラインファイルの保存
     $('#pipe_save').off('click').on('click', async () => {
         const pipe_modal = $('#pipe_modal');
-        const [title, opt] = get_param(pipe_modal);
+        const [title, opt] = cmdbox.get_param(pipe_modal);
         if (pipe_modal.find('.row_content, .row_content_common').find('.is-invalid').length > 0) {
             return;
         }
@@ -159,7 +159,7 @@ list_pipe_func_then = () => {
     // パイプラインファイルの実行
     $('#pipe_exec').off('click').on('click', async () => {
         const pipe_modal = $('#pipe_modal');
-        const [title, opt] = get_param(pipe_modal);
+        const [title, opt] = cmdbox.get_param(pipe_modal);
         if (pipe_modal.find('.row_content').find('.is-invalid').length > 0) {
             return;
         }
@@ -173,7 +173,7 @@ list_pipe_func_then = () => {
     // RAW表示の実行
     $('#pipe_raw').off('click').on('click', async () => {
         const pipe_modal = $('#pipe_modal');
-        const [title, opt] = get_param(pipe_modal);
+        const [title, opt] = cmdbox.get_param(pipe_modal);
         if (pipe_modal.find('.row_content').find('.is-invalid').length > 0) {
             return;
         }

cmdbox/web/assets/cmdbox/main.js

@@ -1,6 +1,6 @@
 $(() => {
-    // ダークモード対応
-    cmdbox.change_dark_mode(window.matchMedia('(prefers-color-scheme: dark)').matches);
+    // カラーモード対応
+    cmdbox.change_color_mode();
     // コマンド一覧の取得と表示
     list_cmd_func().then(list_cmd_func_then);
     // コマンド一覧の検索

cmdbox/web/assets/cmdbox/result.js

@@ -1,6 +1,6 @@
 $(() => {
-    // ダークモード対応
-    cmdbox.change_dark_mode(window.matchMedia('(prefers-color-scheme: dark)').matches);
+    // カラーモード対応
+    cmdbox.change_color_mode();
     // アイコンを表示
     cmdbox.set_logoicon('.navbar-brand');
     // copyright表示

cmdbox/web/assets/cmdbox/signin.js

@@ -1,6 +1,6 @@
 $(() => {
-    // ダークモード対応
-    cmdbox.change_dark_mode(window.matchMedia('(prefers-color-scheme: dark)').matches);
+    // カラーモード対応
+    cmdbox.change_color_mode();
 
     $('.theme-item').off('click').on('click', (event) => {
         $('.theme-item').removeClass('active');

cmdbox/web/assets/cmdbox/users.js

@@ -198,21 +198,21 @@ users.users_list = async () => {
         modal.modal('show');
     };
     // ユーザー一覧を表示
-    const user_table = $('<table>').addClass('table table-bordered table-hover').appendTo(users_elem);
+    const user_table = $('<table/>').addClass('table table-bordered table-hover').appendTo(users_elem);
     // ヘッダ行を作成
-    const user_thead = $('<thead>').appendTo(user_table);
+    const user_thead = $('<thead/>').appendTo(user_table);
     const cols = new Set();
     if (users_data.length == 0) {
-        $('<tr>').append($('<th>').text('No users')).appendTo(user_thead);
+        $('<tr/>').append($('<th class="th"/>').text('No users')).appendTo(user_thead);
         return
     } else {
         const user_thead_tr = $('<tr>').appendTo(user_thead);
         for (const row of users_data) {
             for (const key in row) cols.add(key);
         }
-        $('<th>').text('-').attr('scope', 'col').attr('width', '40').appendTo(user_thead_tr);
+        $('<th class="th"/>').text('-').attr('scope', 'col').attr('width', '40').appendTo(user_thead_tr);
         for (const col of cols) {
-            $('<th>').text(col).attr('scope', 'col').appendTo(user_thead_tr);
+            $('<th class="th"/>').text(col).attr('scope', 'col').appendTo(user_thead_tr);
         }
     }
     // 明細行を作成
@@ -343,21 +343,21 @@ users.groups_list = async () => {
         modal.modal('show');
     };
     // グループ一覧を表示
-    const group_table = $('<table>').addClass('table table-bordered table-hover').appendTo(groups_elem);
+    const group_table = $('<table/>').addClass('table table-bordered table-hover').appendTo(groups_elem);
     // ヘッダ行を作成
-    const group_thead = $('<thead>').appendTo(group_table);
+    const group_thead = $('<thead/>').appendTo(group_table);
     const cols = new Set();
     if (groups_data.length == 0) {
-        $('<tr>').append($('<th>').text('No groups')).appendTo(group_thead);
+        $('<tr>').append($('<th class="th"/>').text('No groups')).appendTo(group_thead);
         return
     } else {
         const group_thead_tr = $('<tr>').appendTo(group_thead);
         for (const row of groups_data) {
             for (const key in row) cols.add(key);
         }
-        $('<th>').text('-').attr('scope', 'col').attr('width', '40').appendTo(group_thead_tr);
+        $('<th class="th"/>').text('-').attr('scope', 'col').attr('width', '40').appendTo(group_thead_tr);
         for (const col of cols) {
-            $('<th>').text(col).attr('scope', 'col').appendTo(group_thead_tr);
+            $('<th class="th"/>').text(col).attr('scope', 'col').appendTo(group_thead_tr);
         }
     }
     // 明細行を作成
@@ -418,16 +418,16 @@ users.cmdrules_list = async () => {
     const cmdrule_thead = $('<thead>').appendTo(cmdrule_table);
     const cols = new Set();
     if (cmdrules_data.length == 0) {
-        $('<tr>').append($('<th>').text('No cmdrules')).appendTo(cmdrule_thead);
+        $('<tr>').append($('<th class="th"/>').text('No cmdrules')).appendTo(cmdrule_thead);
         return
     } else {
         const cmdrule_thead_tr = $('<tr>').appendTo(cmdrule_thead);
         for (const row of cmdrules_data) {
             for (const key in row) cols.add(key);
         }
-        $('<th>').text('#').attr('scope', 'col').attr('width', '40').appendTo(cmdrule_thead_tr);
+        $('<th class="th"/>').text('#').attr('scope', 'col').attr('width', '40').appendTo(cmdrule_thead_tr);
         for (const col of cols) {
-            $('<th>').text(col).attr('scope', 'col').appendTo(cmdrule_thead_tr);
+            $('<th class="th"/>').text(col).attr('scope', 'col').appendTo(cmdrule_thead_tr);
         }
     }
     // 明細行を作成
@@ -479,16 +479,16 @@ users.pathrules_list = async () => {
     const pathrule_thead = $('<thead>').appendTo(pathrule_table);
     const cols = new Set();
     if (pathrules_data.length == 0) {
-        $('<tr>').append($('<th>').text('No cmdrules')).appendTo(pathrule_thead);
+        $('<tr>').append($('<th class="th"/>').text('No cmdrules')).appendTo(pathrule_thead);
         return
     } else {
         const pathrule_thead_tr = $('<tr>').appendTo(pathrule_thead);
         for (const row of pathrules_data) {
             for (const key in row) cols.add(key);
         }
-        $('<th>').text('#').attr('scope', 'col').attr('width', '40').appendTo(pathrule_thead_tr);
+        $('<th class="th"/>').text('#').attr('scope', 'col').attr('width', '40').appendTo(pathrule_thead_tr);
         for (const col of cols) {
-            $('<th>').text(col).attr('scope', 'col').appendTo(pathrule_thead_tr);
+            $('<th class="th"/>').text(col).attr('scope', 'col').appendTo(pathrule_thead_tr);
         }
     }
     // 明細行を作成
@@ -536,7 +536,7 @@ users.passsetting_list = async () => {
         const cardbody_elem = $('<div class="card-body"/>').appendTo(card_elem);
         cardbody_elem.append(`<h5 class="card-title">${title}</h5>`);
         const table_elem = $('<table class="table table-bordered table-hover"/>').appendTo(cardbody_elem);
-        const thead_elem = $('<thead><tr><th>#</th><th>setting</th><th>value</th></tr></thead>').appendTo(table_elem);
+        const thead_elem = $('<thead><tr><th class="th">#</th><th class="th">setting</th><th class="th">value</th></tr></thead>').appendTo(table_elem);
         const tbody_elem = $('<tbody/>').appendTo(table_elem);
         let i_row=0;
         for (const key in data) {
@@ -552,9 +552,8 @@ users.passsetting_list = async () => {
     mk_card(passsetting_elem, 'Account Lockout', passsetting_root_data['lockout']);
 };
 $(() => {
-    // ダークモード対応
-    cmdbox.change_dark_mode(window.matchMedia('(prefers-color-scheme: dark)').matches);
-
+    // カラーモード対応
+    cmdbox.change_color_mode();
     // アイコンを表示
     cmdbox.set_logoicon('.navbar-brand');
     // copyright表示

cmdbox/web/assets/cmdbox/view_raw.js

@@ -20,7 +20,7 @@ const view_raw_func = (title, result) => {
                 let found = false;
                 for (const [key, val] of Object.entries(row)) {
                     if(i==0) {
-                        table_head.append($(`<th scope="col">${key}</th>`));
+                        table_head.append($(`<th class="th" scope="col">${key}</th>`));
                     }
                     try {
                         if (found) {

cmdbox/web/assets/cmdbox/view_result.js

@@ -1,5 +1,6 @@
 const cell_chop = (val, res_size) => {
-    res_size = res_size==-1 && res_size ? res_size : 150;
+    val = `${val || ''}`;
+    res_size = res_size ? res_size : 150;
     if(val && res_size>0 && val.length > res_size){
         return `${val.substring(0, res_size)}...`;
     }
@@ -24,18 +25,15 @@ const render_result_func = (target_elem, result, res_size) => {
     if (!result || Array.isArray(result) && result.length<=0) return;
     const mk_table_func = () => {
         const table = $('<table class="table table-bordered table-hover table-sm"></table>');
-        const table_head = $('<thead class="table-dark bg-dark"></thead>');
-        const table_body = $('<tbody></tbody>');
-        table.append(table_head);
-        table.append(table_body);
+        $('<thead><tr></tr></thead>').appendTo(table);
+        $('<tbody></tbody>').appendTo(table);
         return table;
     }
     const table = mk_table_func();
     target_elem.append(table);
     // list型の結果をテーブルに変換
     const list2table = (data, table_head, table_body) => {
-        Object.keys(data).forEach(i => {
-            const row = data[i];
+        data.forEach((row, i) => {
             if(row['success'] && typeof row['success'] == "object" && !Array.isArray(row['success'])){
                 dict2table(row['success'], i==0?table_head:null, table_body, row['output_image']);
                 return;
@@ -43,7 +41,7 @@ const render_result_func = (target_elem, result, res_size) => {
             if(typeof row == 'string' || row instanceof String){
                 const tr = $('<tr></tr>');
                 table_body.append(tr);
-                tr.append($(`<td>${row}</td>`));
+                tr.append($(`<td>${cell_chop(row, res_size)}</td>`));
                 return;
             }
             if(Array.isArray(row) && row.length > 0 && typeof row[0] != "object"){
@@ -58,7 +56,7 @@ const render_result_func = (target_elem, result, res_size) => {
             Object.keys(row).forEach(key => {
                 const val = row[key];
                 if(i==0) {
-                    table_head.append($(`<th scope="col" style="word-break:normal">${key}</th>`));
+                    table_head.append($(`<th class="th" scope="col">${key}</th>`));
                 }
                 if(val && val['success'] && Array.isArray(val['success'])){
                     const tbl = mk_table_func()
@@ -89,7 +87,7 @@ const render_result_func = (target_elem, result, res_size) => {
                     list2table(val, tbl.find('thead'), tbl.find('tbody'));
                 }
                 else{
-                    tr.append($(`<td>${val}</td>`));
+                    tr.append($(`<td>${cell_chop(val, res_size)}</td>`));
                 }
             });
         });
@@ -98,7 +96,7 @@ const render_result_func = (target_elem, result, res_size) => {
     const dict2table = (data, table_head, table_body, output_image) => {
         const tr = $('<tr></tr>');
         if(output_image){
-            if(table_head)table_head.append($('<th scope="col" style="word-break:normal">output_image</th>'));
+            if(table_head)table_head.append($('<th class="th" scope="col">output_image</th>'));
             const img = $('<img class="img-thumbnail">').attr('src', `data:image/png;base64,${output_image}`);
             img.css('width','100px').css('height','auto');
             const anchor = $(`<a href="data:image/jpeg;base64,${output_image}" data-lightbox="output_image"></a>`).append(img);
@@ -107,7 +105,7 @@ const render_result_func = (target_elem, result, res_size) => {
         table_body.append(tr);
         Object.keys(data).forEach(key => {
             let val = data[key];
-            if(table_head)table_head.append($(`<th scope="col" style="word-break:normal">${key}</th>`));
+            if(table_head)table_head.append($(`<th class="th" scope="col">${key}</th>`));
             if (key != 'warn' && val) {
                 if(Array.isArray(val)){
                     if(val.length > 0 && typeof val[0] == "object"){
@@ -134,7 +132,7 @@ const render_result_func = (target_elem, result, res_size) => {
             tr.append($(`<td style="overflow-wrap:break-word;word-break:break-all;">${val}</td>`));
         });
     }
-    const table_head = table.find('thead')
+    const table_head = table.find('thead tr')
     const table_body = table.find('tbody')
     // 結果をテーブルに変換
     if(result['success'] && Array.isArray(result['success'])){

cmdbox/web/assets/filer/filer.js

@@ -125,7 +125,7 @@ fsapi.filer = (svpath, is_local) => {
       };
       const path = file_list.pop()
       const list_downloads = [];
-      if (path[1] && path[1]['is_dir'] && !path[1]['children']) {
+      if (path[1] && path[1]['is_dir'] && path[1]['children']!=null && path[1]['children']!=undefined) {
         list_downloads.push(...get_list(path[1]));
       } else if (path[1] && !path[1]['is_dir']) {
         let rpath = path[1]['path'].replace(fsapi.right.find('.filer_address').val(), '');
@@ -315,7 +315,7 @@ fsapi.tree = (target, svpath, current_ul_elem, is_local) => {
       if(!node['path']) return;
       target.find('.filer_address').val(node['path']);
       const table = $('<table class="table table-bordered table-hover table-sm">'
-                    + '<thead><tr><th scope="col">-</th><th scope="col">name</th><th scope="col">mime</th><th scope="col">size</th><th scope="col">last</th></tr></thead>'
+                    + '<thead><tr><th class="th" scope="col">-</th><th class="th" scope="col">name</th><th class="th" scope="col">mime</th><th class="th" scope="col">size</th><th class="th" scope="col">last</th></tr></thead>'
                     + '</table>');
       const table_body = $('<tbody></tbody>');
       target.find('.file-list').html('');

cmdbox/web/assets/filer/main.js

@@ -1,6 +1,6 @@
 $(() => {
-  // ダークモード対応
-  cmdbox.change_dark_mode(window.matchMedia('(prefers-color-scheme: dark)').matches);
+  // カラーモード対応
+  cmdbox.change_color_mode();
   // スプリッター初期化
   $('.split-pane').splitPane();
   // アイコンを表示