重新调整了组件的目录结构，把CharInputField和CharInputWidget移到了单个文件。

Author: Haoke98

simplepro/components/fields/__init__.py

@@ -7,6 +7,7 @@
 from .radio_field import RadioField
 from .input_number_field import InputNumberField
 from .input_password_field import PasswordInputField
+from .char_field import CharField
 
 
 class CheckboxFormField(forms.fields.CharField):
@@ -227,70 +228,6 @@ def formfield(self, **kwargs):
         return r
 
 
-class CharFormField(forms.fields.CharField):
-    fields = ['input_type', 'max_length', 'min_length'
-        , 'placeholder', 'clearable', 'show_password', 'disabled', 'size',
-              'prefix_icon', 'suffix_icon', 'rows', 'autocomplete', 'readonly',
-              'max_value', 'min_value', 'step', 'resize', 'autofocus', 'show_word_limit', 'slot', 'slot_text', 'style']
-
-    def __init__(self, *args, **kwargs):
-        kwargs.update({
-            'widget': CharInput(**kwargs)
-        })
-        for f in self.fields:
-            if f in kwargs:
-                kwargs.pop(f)
-        super(CharFormField, self).__init__(*args, **kwargs)
-
-
-class CharField(models.CharField):
-
-    def __init__(self, input_type='text', placeholder=None, clearable=True, show_password=False,
-                 min_length=None, disabled=False, size=None, prefix_icon=None, suffix_icon=None, rows=None,
-                 autocomplete=None,
-                 readonly=None, max_value=None, min_value=None, step=None, resize=None, autofocus=False,
-                 show_word_limit=False,
-                 slot=None, slot_text='', style=None,
-                 *args, **kwargs):
-        self.items = {
-            'input_type': input_type,
-            'max_length': kwargs.get('max_length'),
-            'min_length': min_length,
-            'placeholder': placeholder,
-            'clearable': clearable,
-            'show_password': show_password,
-            'disabled': disabled,
-            'size': size,
-            'prefix_icon': prefix_icon,
-            'suffix_icon': suffix_icon,
-            'rows': rows,
-            'autocomplete': autocomplete,
-            'readonly': readonly,
-            'max_value': max_value,
-            'min_value': min_value,
-            'step': step,
-            'resize': resize,
-            'autofocus': autofocus,
-            'show_word_limit': show_word_limit,
-            'slot': slot,
-            'slot_text': slot_text,
-            'style': style
-        }
-
-        super(CharField, self).__init__(*args, **kwargs)
-
-    def formfield(self, **kwargs):
-        defaults = {
-            'form_class': CharFormField,
-        }
-
-        defaults.update(kwargs)
-        defaults.update(self.items)
-
-        r = super(CharField, self).formfield(**defaults)
-        return r
-
-
 class AMapFormField(forms.fields.CharField):
     """ custom form field """
 
@@ -626,7 +563,7 @@ def formfield(self, **kwargs):
             placeholder = self.placeholder
             if not placeholder:
                 placeholder = self.verbose_name
-            r.widget = CharInput(input_type='number', clearable=self.clearable, placeholder=placeholder)
+            r.widget = CharInputWidget(input_type='number', clearable=self.clearable, placeholder=placeholder)
 
         return r
 

simplepro/components/fields/char_field.py

@@ -0,0 +1,77 @@
+# _*_ codign:utf8 _*_
+"""====================================
+@Author:Sadam·Sadik
+@Email：1903249375@qq.com
+@Date：2023/11/17
+@Software: PyCharm
+@disc:
+======================================="""
+from django import forms
+from django.db import models
+
+from ..widgets import CharInputWidget
+
+
+class CharFormField(forms.fields.CharField):
+    fields = ['input_type', 'max_length', 'min_length'
+        , 'placeholder', 'clearable', 'show_password', 'disabled', 'size',
+              'prefix_icon', 'suffix_icon', 'rows', 'autocomplete', 'readonly',
+              'max_value', 'min_value', 'step', 'resize', 'autofocus', 'show_word_limit', 'slot', 'slot_text', 'style']
+
+    def __init__(self, *args, **kwargs):
+        kwargs.update({
+            'widget': CharInputWidget(**kwargs)
+        })
+        for f in self.fields:
+            if f in kwargs:
+                kwargs.pop(f)
+        super(CharFormField, self).__init__(*args, **kwargs)
+
+
+class CharField(models.CharField):
+
+    def __init__(self, input_type='text', placeholder=None, clearable=True, show_password=False,
+                 min_length=None, disabled=False, size=None, prefix_icon=None, suffix_icon=None, rows=None,
+                 autocomplete=None,
+                 readonly=None, max_value=None, min_value=None, step=None,
+                 resize=None, autofocus=False,
+                 show_word_limit=False,
+                 slot=None, slot_text='', style=None,
+                 *args, **kwargs):
+        self.items = {
+            'input_type': input_type,
+            'max_length': kwargs.get('max_length'),
+            'min_length': min_length,
+            'placeholder': placeholder,
+            'clearable': clearable,
+            'show_password': show_password,
+            'disabled': disabled,
+            'size': size,
+            'prefix_icon': prefix_icon,
+            'suffix_icon': suffix_icon,
+            'rows': rows,
+            'autocomplete': autocomplete,
+            'readonly': readonly,
+            'max_value': max_value,
+            'min_value': min_value,
+            'step': step,
+            'resize': resize,
+            'autofocus': autofocus,
+            'show_word_limit': show_word_limit,
+            'slot': slot,
+            'slot_text': slot_text,
+            'style': style
+        }
+
+        super(CharField, self).__init__(*args, **kwargs)
+
+    def formfield(self, **kwargs):
+        defaults = {
+            'form_class': CharFormField,
+        }
+
+        defaults.update(kwargs)
+        defaults.update(self.items)
+
+        r = super(CharField, self).formfield(**defaults)
+        return r

simplepro/components/widgets/__init__.py

@@ -20,6 +20,7 @@
 from .input import Input, trim_name
 from .input_password import PasswordInputWidget
 from .input_number import NumberInputWidget
+from .input_char import CharInputWidget
 
 
 class RadioInput(forms.IntegerField, Input):
@@ -239,75 +240,6 @@ def __init__(self, *args, **kwargs):
         super(DateTimeInput, self).__init__(*args, **kwargs)
 
 
-class CharInput(forms.CharField, Input):
-    """
-    文本输入框
-    """
-
-    class Media:
-        pass
-
-    def __init__(self, input_type='text', placeholder=None, clearable=True, show_password=False,
-                 min_length=None, disabled=False, size=None, prefix_icon=None, suffix_icon=None, rows=None,
-                 autocomplete=None,
-                 readonly=None, max_value=None, min_value=None, step=None, resize=None, autofocus=False,
-                 show_word_limit=False, slot=None, slot_text='', style=None, *args, **kwargs):
-        super(CharInput, self).__init__(*args)
-        self.items = {
-            'type': input_type,
-            'placeholder': placeholder,
-            ':clearable': clearable,
-            ':show-password': show_password,
-            'disabled': disabled,
-            'size': size,
-            'prefix-icon': prefix_icon,
-            'suffix-icon': suffix_icon,
-            'rows': rows,
-            'autocomplete': autocomplete,
-            'readonly': readonly,
-            'maxlength': kwargs.get('max_length'),
-            'minlength': min_length,
-            'max': max_value,
-            'min': min_value,
-            'step': step,
-            'resize': resize,
-            'autofocus': autofocus,
-            ':show-word-limit': show_word_limit,
-
-        }
-        self.slot = slot
-        self.slot_text = slot_text
-        self.style = style
-
-    def build_attrs(self):
-        attrs = ""
-        for f in self.items:
-            val = self.items.get(f)
-            if f == 'disabled' and not val:
-                continue
-            if val is not None:
-                if isinstance(val, bool):
-                    val = str(val).lower()
-                attrs += '\t{}=\"{}\"'.format(f, val)
-
-        return attrs
-
-    def render(self, name, value, attrs=None, renderer=None):
-        if value is None:
-            value = ''
-        raw_name = name
-        name = trim_name(name)
-
-        return mark_safe(render_to_string('admin/components/char.html', {
-            'value': conditional_escape(force_text(value)),
-            'name': name,
-            'raw_name': raw_name,
-            'attrs': self.build_attrs(),
-            'slot': self.slot,
-            'slot_text': self.slot_text,
-            'style': self.style
-        }))
-
 
 
 

simplepro/components/widgets/input_char.py

@@ -0,0 +1,89 @@
+# _*_ codign:utf8 _*_
+"""====================================
+@Author:Sadam·Sadik
+@Email：1903249375@qq.com
+@Date：2023/11/17
+@Software: PyCharm
+@disc:
+======================================="""
+from django import forms
+from django.template.loader import render_to_string
+from django.utils.html import conditional_escape
+from django.utils.safestring import mark_safe
+
+from .input import Input, trim_name
+
+try:
+    from django.utils.encoding import force_text
+except:
+    from django.utils.encoding import force_str as force_text
+
+
+class CharInputWidget(forms.CharField, Input):
+    """
+    文本输入框
+    """
+
+    class Media:
+        pass
+
+    def __init__(self, input_type='text', placeholder=None, clearable=True, show_password=False,
+                 min_length=None, disabled=False, size=None, prefix_icon=None, suffix_icon=None, rows=None,
+                 autocomplete=None,
+                 readonly=None, max_value=None, min_value=None, step=None, resize=None, autofocus=False,
+                 show_word_limit=False, slot=None, slot_text='', style=None, *args, **kwargs):
+        super(CharInputWidget, self).__init__(*args)
+        self.items = {
+            'type': input_type,
+            'placeholder': placeholder,
+            ':clearable': clearable,
+            ':show-password': show_password,
+            'disabled': disabled,
+            'size': size,
+            'prefix-icon': prefix_icon,
+            'suffix-icon': suffix_icon,
+            'rows': rows,
+            'autocomplete': autocomplete,
+            'readonly': readonly,
+            'maxlength': kwargs.get('max_length'),
+            'minlength': min_length,
+            'max': max_value,
+            'min': min_value,
+            'step': step,
+            'resize': resize,
+            'autofocus': autofocus,
+            ':show-word-limit': show_word_limit,
+
+        }
+        self.slot = slot
+        self.slot_text = slot_text
+        self.style = style
+
+    def build_attrs(self):
+        attrs = ""
+        for f in self.items:
+            val = self.items.get(f)
+            if f == 'disabled' and not val:
+                continue
+            if val is not None:
+                if isinstance(val, bool):
+                    val = str(val).lower()
+                attrs += '\t{}=\"{}\"'.format(f, val)
+
+        return attrs
+
+    def render(self, name, value, attrs=None, renderer=None):
+        if value is None:
+            value = ''
+        raw_name = name
+        name = trim_name(name)
+
+        return mark_safe(render_to_string('admin/components/char.html', {
+            'value': conditional_escape(force_text(value)),
+            'name': name,
+            'raw_name': raw_name,
+            'attrs': self.build_attrs(),
+            'slot': self.slot,
+            'slot_text': self.slot_text,
+            'style': self.style
+        }))