Adjust display items in form options.

appleple · Oct 3, 2024 · 2ecb6df · 2ecb6df
1 parent f4e47e5
commit 2ecb6df
Show file tree

Hide file tree

Showing 36 changed files with 507 additions and 475 deletions.
diff --git a/dist/bundle.js b/dist/bundle.js
diff --git a/lib/components/genelator/Field.js b/lib/components/genelator/Field.js
@@ -216,13 +216,10 @@ function Field() {
             setField: setField,
           })
         ),
-      field.type !== 'media' &&
-        field.type !== 'richEditor' &&
-        field.type !== 'table' &&
-        /*#__PURE__*/ _react.default.createElement(_Validator.Validator, {
-          field: field,
-          setField: setField,
-        }),
+      /*#__PURE__*/ _react.default.createElement(_Validator.Validator, {
+        field: field,
+        setField: setField,
+      }),
       /*#__PURE__*/ _react.default.createElement(_Operator.Operator, {
         setField: setField,
         onSubmit: onSubmit,

diff --git a/lib/components/genelator/base/Validator.js b/lib/components/genelator/base/Validator.js
@@ -8,6 +8,7 @@ exports.Validator = Validator;
 var _react = _interopRequireWildcard(require('react'));
 var _reactTooltip = _interopRequireDefault(require('react-tooltip'));
 var _NoSearchBox = require('./NoSearchBox');
+var _MakerContext = require('../../../store/MakerContext');
 function _getRequireWildcardCache(e) {
   if ('function' != typeof WeakMap) return null;
   var r = new WeakMap(),
@@ -35,6 +36,9 @@ function Validator(props) {
     field: { type, validator, openValidator, converter, noSearch },
     setField,
   } = props;
+  const {
+    preview: { mode },
+  } = (0, _MakerContext.useMakerContext)();
   const [height, setHeight] = (0, _react.useState)(0);
   const contentRef = (0, _react.useRef)(null);
   const updateHeight = (0, _react.useCallback)(() => {
@@ -66,7 +70,18 @@ function Validator(props) {
     };
   }, [updateHeight]);
   const isConverter = (0, _react.useMemo)(() => {
-    const possibleConverter = ['text', 'textarea', 'checkbox', 'selectbox', 'radioButton'];
+    const possibleConverter = [
+      'text',
+      'tel',
+      'number',
+      'email',
+      'password',
+      'textarea',
+      'liteEditor',
+      'checkbox',
+      'selectbox',
+      'radioButton',
+    ];
     return possibleConverter.includes(type);
   }, [type]);
   const updateValidatorOption = (idx, option) => {
@@ -517,11 +532,13 @@ function Validator(props) {
             '\u8FFD\u52A0'
           )
         ),
-        /text|number|tel|email|password|textarea|radioButton|selectbox/.exec(type) &&
-          /*#__PURE__*/ _react.default.createElement(_NoSearchBox.NoSearchBox, {
-            noSearch: noSearch,
-            setField: setField,
-          })
+        (mode === 'customfield') | (mode === 'customunit') &&
+          /text|number|tel|email|password|textarea|radioButton|selectbox/.exec(type)
+          ? /*#__PURE__*/ _react.default.createElement(_NoSearchBox.NoSearchBox, {
+              noSearch: noSearch,
+              setField: setField,
+            })
+          : /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null)
       )
     )
   );

diff --git a/lib/components/html/Checkbox.js b/lib/components/html/Checkbox.js
@@ -157,6 +157,10 @@ function Checkbox(props) {
         }),
         /*#__PURE__*/ _react.default.createElement(_OptionValidator.OptionValidator, {
           item: item,
+        }),
+        /*#__PURE__*/ _react.default.createElement(_OptionNoSearch.OptionNoSearch, {
+          name: item.name,
+          noSearch: item.noSearch,
         })
       ),
     mode === 'unitgroup' &&

diff --git a/lib/components/html/FileInput.js b/lib/components/html/FileInput.js
@@ -9,7 +9,6 @@ var _react = _interopRequireDefault(require('react'));
 var _classnames = _interopRequireDefault(require('classnames'));
 var _MakerContext = require('../../store/MakerContext');
 var _OptionValidator = require('./OptionValidator');
-var _OptionNoSearch = require('./OptionNoSearch');
 function FileInput(props) {
   const { item, id, isValue = true } = props;
   const {
@@ -125,9 +124,8 @@ function FileInput(props) {
             name: ''.concat(item.name, '@filename'),
             value: '@rawfilename',
           }),
-        /*#__PURE__*/ _react.default.createElement(_OptionNoSearch.OptionNoSearch, {
-          name: item.name,
-          noSearch: item.noSearch,
+        /*#__PURE__*/ _react.default.createElement(_OptionValidator.OptionValidator, {
+          item: item,
         })
       ),
     mode === 'fieldgroup' &&

diff --git a/lib/components/html/ImageInput.js b/lib/components/html/ImageInput.js
@@ -9,7 +9,6 @@ var _react = _interopRequireDefault(require('react'));
 var _classnames = _interopRequireDefault(require('classnames'));
 var _MakerContext = require('../../store/MakerContext');
 var _OptionValidator = require('./OptionValidator');
-var _OptionNoSearch = require('./OptionNoSearch');
 function ImageInput(props) {
   const { item, id, isAttribute = true } = props;
   const {
@@ -161,10 +160,6 @@ function ImageInput(props) {
         }),
         /*#__PURE__*/ _react.default.createElement(_OptionValidator.OptionValidator, {
           item: item,
-        }),
-        /*#__PURE__*/ _react.default.createElement(_OptionNoSearch.OptionNoSearch, {
-          name: item.name,
-          noSearch: item.noSearch,
         })
       ),
     mode === 'fieldgroup' &&
@@ -529,10 +524,9 @@ function ImageInput(props) {
               name: ''.concat(item.name, '{id}@').concat(item.square, '[]'),
               value: item.squareSize,
             }),
-          isAttribute &&
-            /*#__PURE__*/ _react.default.createElement(_OptionValidator.OptionValidator, {
-              item: item,
-            })
+          /*#__PURE__*/ _react.default.createElement(_OptionValidator.OptionValidator, {
+            item: item,
+          })
         )
       )
   );

diff --git a/lib/components/html/Media.js b/lib/components/html/Media.js
@@ -216,6 +216,9 @@ function Media(props) {
           type: 'hidden',
           name: ''.concat(item.name, ':extension'),
           value: 'media',
+        }),
+        /*#__PURE__*/ _react.default.createElement(_OptionValidator.OptionValidator, {
+          item: item,
         })
       ),
     mode === 'fieldgroup' &&

diff --git a/lib/components/html/RadioButton.js b/lib/components/html/RadioButton.js
@@ -158,6 +158,10 @@ function RadioButton(props) {
         }),
         /*#__PURE__*/ _react.default.createElement(_OptionValidator.OptionValidator, {
           item: item,
+        }),
+        /*#__PURE__*/ _react.default.createElement(_OptionNoSearch.OptionNoSearch, {
+          name: item.name,
+          noSearch: item.noSearch,
         })
       ),
     mode === 'unitgroup' &&

diff --git a/lib/components/html/Selectbox.js b/lib/components/html/Selectbox.js
@@ -136,37 +136,48 @@ function Selectbox(props) {
         }),
         /*#__PURE__*/ _react.default.createElement(_OptionValidator.OptionValidator, {
           item: item,
+        }),
+        /*#__PURE__*/ _react.default.createElement(_OptionNoSearch.OptionNoSearch, {
+          name: item.name,
+          noSearch: item.noSearch,
         })
       ),
     mode === 'unitgroup' &&
       /*#__PURE__*/ _react.default.createElement(
-        'select',
-        {
-          name: ''.concat(item.name, '{id}[]'),
-          className: (0, _classnames.default)({
-            'acms-admin-form-width-full': acmscss,
+        _react.default.Fragment,
+        null,
+        /*#__PURE__*/ _react.default.createElement(
+          'select',
+          {
+            name: ''.concat(item.name, '{id}[]'),
+            className: (0, _classnames.default)({
+              'acms-admin-form-width-full': acmscss,
+            }),
+          },
+          /*#__PURE__*/ _react.default.createElement('option', {
+            value: '',
           }),
-        },
-        /*#__PURE__*/ _react.default.createElement('option', {
-          value: '',
-        }),
-        item.option.map((option, index) => {
-          if (!option.label) {
-            return null;
-          }
-          return /*#__PURE__*/ _react.default.createElement(
-            'option',
-            (0, _extends2.default)(
-              {
-                key: index,
-                value: option.value,
-              },
-              isSelected && {
-                'data-tmp': '{'.concat(item.name, ':selected#').concat(option.value, '}'),
-              }
-            ),
-            option.label
-          );
+          item.option.map((option, index) => {
+            if (!option.label) {
+              return null;
+            }
+            return /*#__PURE__*/ _react.default.createElement(
+              'option',
+              (0, _extends2.default)(
+                {
+                  key: index,
+                  value: option.value,
+                },
+                isSelected && {
+                  'data-tmp': '{'.concat(item.name, ':selected#').concat(option.value, '}'),
+                }
+              ),
+              option.label
+            );
+          })
+        ),
+        /*#__PURE__*/ _react.default.createElement(_OptionValidator.OptionValidator, {
+          item: item,
         })
       )
   );

diff --git a/lib/components/html/TextInput.js b/lib/components/html/TextInput.js
@@ -47,17 +47,17 @@ function TextInput(props) {
               : {}
           )
         ),
-        /*#__PURE__*/ _react.default.createElement('input', {
-          type: 'hidden',
-          name: 'field[]',
-          defaultValue: item.name,
-        }),
         /*#__PURE__*/ _react.default.createElement(_OptionValidator.OptionValidator, {
           item: item,
         }),
         /*#__PURE__*/ _react.default.createElement(_OptionNoSearch.OptionNoSearch, {
           name: item.name,
           noSearch: item.noSearch,
+        }),
+        /*#__PURE__*/ _react.default.createElement('input', {
+          type: 'hidden',
+          name: 'field[]',
+          defaultValue: item.name,
         })
       ),
     mode === 'fieldgroup' &&
@@ -112,6 +112,13 @@ function TextInput(props) {
               : {}
           )
         ),
+        /*#__PURE__*/ _react.default.createElement(_OptionValidator.OptionValidator, {
+          item: item,
+        }),
+        /*#__PURE__*/ _react.default.createElement(_OptionNoSearch.OptionNoSearch, {
+          name: item.name,
+          noSearch: item.noSearch,
+        }),
         /*#__PURE__*/ _react.default.createElement('input', {
           type: 'hidden',
           name: 'unit{id}[]',
@@ -120,26 +127,33 @@ function TextInput(props) {
       ),
     mode === 'unitgroup' &&
       /*#__PURE__*/ _react.default.createElement(
-        'input',
-        (0, _extends2.default)(
-          {
-            type: item.type,
-            name: ''.concat(item.name, '{id}[]'),
-          },
-          isValue && {
-            value: '{'.concat(item.name, '}'),
-          },
-          {
-            className: (0, _classnames.default)({
-              'acms-admin-form-width-full': acmscss,
-            }),
-          },
-          item.placeholder
-            ? {
-                placeholder: item.placeholder,
-              }
-            : {}
-        )
+        _react.default.Fragment,
+        null,
+        /*#__PURE__*/ _react.default.createElement(
+          'input',
+          (0, _extends2.default)(
+            {
+              type: item.type,
+              name: ''.concat(item.name, '{id}[]'),
+            },
+            isValue && {
+              value: '{'.concat(item.name, '}'),
+            },
+            {
+              className: (0, _classnames.default)({
+                'acms-admin-form-width-full': acmscss,
+              }),
+            },
+            item.placeholder
+              ? {
+                  placeholder: item.placeholder,
+                }
+              : {}
+          )
+        ),
+        /*#__PURE__*/ _react.default.createElement(_OptionValidator.OptionValidator, {
+          item: item,
+        })
       )
   );
 }
diff --git a/lib/components/html/Textarea.js b/lib/components/html/Textarea.js
@@ -10,6 +10,7 @@ var _react = _interopRequireDefault(require('react'));
 var _classnames = _interopRequireDefault(require('classnames'));
 var _MakerContext = require('../../store/MakerContext');
 var _OptionValidator = require('./OptionValidator');
+var _OptionNoSearch = require('./OptionNoSearch');
 function Textarea(props) {
   const { item, id = '', isValue = true } = props;
   const {
@@ -47,13 +48,17 @@ function Textarea(props) {
           ),
           isValue ? '{'.concat(item.name, '}') : ''
         ),
+        /*#__PURE__*/ _react.default.createElement(_OptionValidator.OptionValidator, {
+          item: item,
+        }),
+        /*#__PURE__*/ _react.default.createElement(_OptionNoSearch.OptionNoSearch, {
+          name: item.name,
+          noSearch: item.noSearch,
+        }),
         /*#__PURE__*/ _react.default.createElement('input', {
           type: 'hidden',
           name: 'field[]',
           defaultValue: item.name,
-        }),
-        /*#__PURE__*/ _react.default.createElement(_OptionValidator.OptionValidator, {
-          item: item,
         })
       ),
     mode === 'fieldgroup' &&
@@ -100,13 +105,17 @@ function Textarea(props) {
           ),
           isValue ? '{'.concat(item.name, '}') : ''
         ),
+        /*#__PURE__*/ _react.default.createElement(_OptionValidator.OptionValidator, {
+          item: item,
+        }),
+        /*#__PURE__*/ _react.default.createElement(_OptionNoSearch.OptionNoSearch, {
+          name: item.name,
+          noSearch: item.noSearch,
+        }),
         /*#__PURE__*/ _react.default.createElement('input', {
           type: 'hidden',
           name: 'unit{id}[]',
           value: ''.concat(item.name, '{id}'),
-        }),
-        /*#__PURE__*/ _react.default.createElement(_OptionValidator.OptionValidator, {
-          item: item,
         })
       ),
     mode === 'unitgroup' &&