cmdbox 0.5.0.7__tar.gz → 0.5.0.8__tar.gz

{cmdbox-0.5.0.7/cmdbox.egg-info → cmdbox-0.5.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cmdbox
-Version: 0.5.0.7
+Version: 0.5.0.8
 Summary: cmdbox: It is a command line application with a plugin mechanism.
 Home-page: https://github.com/hamacom2004jp/cmdbox
 Author: hamacom2004jp

{cmdbox-0.5.0.7 → cmdbox-0.5.0.8}/cmdbox/version.py

@@ -1,9 +1,9 @@
 import datetime
 
-dt_now = datetime.datetime(2025, 3, 13)
+dt_now = datetime.datetime(2025, 3, 16)
 __appid__ = 'cmdbox'
 __title__ = 'cmdbox (Command Development Application)'
-__version__ = '0.5.0.7'
+__version__ = '0.5.0.8'
 __copyright__ = f'Copyright © 2023-{dt_now.strftime("%Y")} hamacom2004jp'
 __pypiurl__ = 'https://pypi.org/project/cmdbox/'
 __srcurl__ = 'https://github.com/hamacom2004jp/cmdbox'

{cmdbox-0.5.0.7 → cmdbox-0.5.0.8}/cmdbox/web/assets/cmdbox/list_cmd.js

@@ -71,6 +71,7 @@ const list_cmd_func_then = () => {
                 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') {
@@ -85,11 +86,16 @@ const list_cmd_func_then = () => {
                     input_elem.val(row.default);
                 }
                 else {
-                    elem = $(cmd_modal.find('.row_content_template_choice').html());
+                    // 選択肢がある場合
+                    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');
-                    input_elem.removeClass('row_content_template_select');
+                    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(() => {
@@ -109,7 +115,7 @@ const list_cmd_func_then = () => {
                         });
                     }
                     input_elem.html(mkopt(row.choice));
-                    input_elem.val(`${row.default}`);
+                    input_elem.val(`${row.default!=null?row.default:''}`);
                 }
                 let index = 0;
                 if (cmd_modal.find(`[name="${target_name}"]`).length > 0) {
@@ -478,6 +484,7 @@ const get_param = (modal_elem) => {
                 $(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');

{cmdbox-0.5.0.7 → cmdbox-0.5.0.8}/cmdbox/web/gui.html

@@ -251,6 +251,17 @@
                             </div>
                         </div>
                     </div>
+                    <div class="row d-none row_content_template_dict_choice">
+                        <div class="col-12 mb-3">
+                            <div class="input-group">
+                                <label class="input-group-text row_content_template_title">title</label>
+                                <input type="text" class="form-control row_content_key row_content_template_input">
+                                <label class="input-group-text">=</label>
+                                <select class="form-select row_content_template_select">
+                                </select>
+                            </div>
+                        </div>
+                    </div>
                     <div class="row d-none row_content_template_choice">
                         <div class="col-6 mb-3">
                             <div class="input-group">

{cmdbox-0.5.0.7 → cmdbox-0.5.0.8/cmdbox.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cmdbox
-Version: 0.5.0.7
+Version: 0.5.0.8
 Summary: cmdbox: It is a command line application with a plugin mechanism.
 Home-page: https://github.com/hamacom2004jp/cmdbox
 Author: hamacom2004jp