lu-lowcode-package-form 0.8.3 → 0.8.5

package/dist/style.css

@@ -1 +1 @@
-*,:before,:after{box-sizing:border-box;border-width:0;border-style:solid;border-color:#e5e7eb}:before,:after{--tw-content: ""}html,:host{line-height:1.5;-webkit-text-size-adjust:100%;-moz-tab-size:4;tab-size:4;font-family:ui-sans-serif,system-ui,sans-serif,"Apple Color Emoji","Segoe UI Emoji",Segoe UI Symbol,"Noto Color Emoji";font-feature-settings:normal;font-variation-settings:normal;-webkit-tap-highlight-color:transparent}body{margin:0;line-height:inherit}hr{height:0;color:inherit;border-top-width:1px}abbr:where([title]){-webkit-text-decoration:underline dotted;text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,samp,pre{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace;font-feature-settings:normal;font-variation-settings:normal;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}table{text-indent:0;border-color:inherit;border-collapse:collapse}button,input,optgroup,select,textarea{font-family:inherit;font-feature-settings:inherit;font-variation-settings:inherit;font-size:100%;font-weight:inherit;line-height:inherit;letter-spacing:inherit;color:inherit;margin:0;padding:0}button,select{text-transform:none}button,input:where([type=button]),input:where([type=reset]),input:where([type=submit]){-webkit-appearance:button;background-color:transparent;background-image:none}:-moz-focusring{outline:auto}:-moz-ui-invalid{box-shadow:none}progress{vertical-align:baseline}::-webkit-inner-spin-button,::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}summary{display:list-item}blockquote,dl,dd,h1,h2,h3,h4,h5,h6,hr,figure,p,pre{margin:0}fieldset{margin:0;padding:0}legend{padding:0}ol,ul,menu{list-style:none;margin:0;padding:0}dialog{padding:0}textarea{resize:vertical}input::placeholder,textarea::placeholder{opacity:1;color:#9ca3af}button,[role=button]{cursor:pointer}:disabled{cursor:default}img,svg,video,canvas,audio,iframe,embed,object{display:block;vertical-align:middle}img,video{max-width:100%;height:auto}[hidden]{display:none}*,:before,:after{--tw-border-spacing-x: 0;--tw-border-spacing-y: 0;--tw-translate-x: 0;--tw-translate-y: 0;--tw-rotate: 0;--tw-skew-x: 0;--tw-skew-y: 0;--tw-scale-x: 1;--tw-scale-y: 1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness: proximity;--tw-gradient-from-position: ;--tw-gradient-via-position: ;--tw-gradient-to-position: ;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width: 0px;--tw-ring-offset-color: #fff;--tw-ring-color: rgb(59 130 246 / .5);--tw-ring-offset-shadow: 0 0 #0000;--tw-ring-shadow: 0 0 #0000;--tw-shadow: 0 0 #0000;--tw-shadow-colored: 0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: ;--tw-contain-size: ;--tw-contain-layout: ;--tw-contain-paint: ;--tw-contain-style: }::backdrop{--tw-border-spacing-x: 0;--tw-border-spacing-y: 0;--tw-translate-x: 0;--tw-translate-y: 0;--tw-rotate: 0;--tw-skew-x: 0;--tw-skew-y: 0;--tw-scale-x: 1;--tw-scale-y: 1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness: proximity;--tw-gradient-from-position: ;--tw-gradient-via-position: ;--tw-gradient-to-position: ;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width: 0px;--tw-ring-offset-color: #fff;--tw-ring-color: rgb(59 130 246 / .5);--tw-ring-offset-shadow: 0 0 #0000;--tw-ring-shadow: 0 0 #0000;--tw-shadow: 0 0 #0000;--tw-shadow-colored: 0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: ;--tw-contain-size: ;--tw-contain-layout: ;--tw-contain-paint: ;--tw-contain-style: }.frelative{position:relative}.fflex{display:flex}.fh-11{height:2.75rem}.fh-8{height:2rem}.fh-full{height:100%}.fmin-h-5{min-height:1.25rem}.fw-\[960px\]{width:960px}.fw-full{width:100%}.fflex-col{flex-direction:column}.fitems-center{align-items:center}.fitems-stretch{align-items:stretch}.fjustify-between{justify-content:space-between}.frounded{border-radius:.25rem}.fbg-slate-100{--tw-bg-opacity: 1;background-color:rgb(241 245 249 / var(--tw-bg-opacity))}.fp-4{padding:1rem}.fp-6{padding:1.5rem}.fpb-10{padding-bottom:2.5rem}.ftext-sm{font-size:.875rem;line-height:1.25rem}.ftext-xs{font-size:.75rem;line-height:1rem}.ftext-gray-500{--tw-text-opacity: 1;color:rgb(107 114 128 / var(--tw-text-opacity))}
+*,:before,:after{box-sizing:border-box;border-width:0;border-style:solid;border-color:#e5e7eb}:before,:after{--tw-content: ""}html,:host{line-height:1.5;-webkit-text-size-adjust:100%;-moz-tab-size:4;tab-size:4;font-family:ui-sans-serif,system-ui,sans-serif,"Apple Color Emoji","Segoe UI Emoji",Segoe UI Symbol,"Noto Color Emoji";font-feature-settings:normal;font-variation-settings:normal;-webkit-tap-highlight-color:transparent}body{margin:0;line-height:inherit}hr{height:0;color:inherit;border-top-width:1px}abbr:where([title]){-webkit-text-decoration:underline dotted;text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,samp,pre{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace;font-feature-settings:normal;font-variation-settings:normal;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}table{text-indent:0;border-color:inherit;border-collapse:collapse}button,input,optgroup,select,textarea{font-family:inherit;font-feature-settings:inherit;font-variation-settings:inherit;font-size:100%;font-weight:inherit;line-height:inherit;letter-spacing:inherit;color:inherit;margin:0;padding:0}button,select{text-transform:none}button,input:where([type=button]),input:where([type=reset]),input:where([type=submit]){-webkit-appearance:button;background-color:transparent;background-image:none}:-moz-focusring{outline:auto}:-moz-ui-invalid{box-shadow:none}progress{vertical-align:baseline}::-webkit-inner-spin-button,::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}summary{display:list-item}blockquote,dl,dd,h1,h2,h3,h4,h5,h6,hr,figure,p,pre{margin:0}fieldset{margin:0;padding:0}legend{padding:0}ol,ul,menu{list-style:none;margin:0;padding:0}dialog{padding:0}textarea{resize:vertical}input::placeholder,textarea::placeholder{opacity:1;color:#9ca3af}button,[role=button]{cursor:pointer}:disabled{cursor:default}img,svg,video,canvas,audio,iframe,embed,object{display:block;vertical-align:middle}img,video{max-width:100%;height:auto}[hidden]{display:none}*,:before,:after{--tw-border-spacing-x: 0;--tw-border-spacing-y: 0;--tw-translate-x: 0;--tw-translate-y: 0;--tw-rotate: 0;--tw-skew-x: 0;--tw-skew-y: 0;--tw-scale-x: 1;--tw-scale-y: 1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness: proximity;--tw-gradient-from-position: ;--tw-gradient-via-position: ;--tw-gradient-to-position: ;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width: 0px;--tw-ring-offset-color: #fff;--tw-ring-color: rgb(59 130 246 / .5);--tw-ring-offset-shadow: 0 0 #0000;--tw-ring-shadow: 0 0 #0000;--tw-shadow: 0 0 #0000;--tw-shadow-colored: 0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: ;--tw-contain-size: ;--tw-contain-layout: ;--tw-contain-paint: ;--tw-contain-style: }::backdrop{--tw-border-spacing-x: 0;--tw-border-spacing-y: 0;--tw-translate-x: 0;--tw-translate-y: 0;--tw-rotate: 0;--tw-skew-x: 0;--tw-skew-y: 0;--tw-scale-x: 1;--tw-scale-y: 1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness: proximity;--tw-gradient-from-position: ;--tw-gradient-via-position: ;--tw-gradient-to-position: ;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width: 0px;--tw-ring-offset-color: #fff;--tw-ring-color: rgb(59 130 246 / .5);--tw-ring-offset-shadow: 0 0 #0000;--tw-ring-shadow: 0 0 #0000;--tw-shadow: 0 0 #0000;--tw-shadow-colored: 0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: ;--tw-contain-size: ;--tw-contain-layout: ;--tw-contain-paint: ;--tw-contain-style: }.frelative{position:relative}.fmb-5{margin-bottom:1.25rem}.fflex{display:flex}.fh-11{height:2.75rem}.fh-8{height:2rem}.fh-full{height:100%}.fmin-h-5{min-height:1.25rem}.fw-\[960px\]{width:960px}.fw-full{width:100%}.fflex-col{flex-direction:column}.fitems-center{align-items:center}.fitems-stretch{align-items:stretch}.fjustify-between{justify-content:space-between}.frounded{border-radius:.25rem}.fborder-b{border-bottom-width:1px}.fbg-slate-100{--tw-bg-opacity: 1;background-color:rgb(241 245 249 / var(--tw-bg-opacity))}.fp-4{padding:1rem}.fp-6{padding:1.5rem}.fpb-10{padding-bottom:2.5rem}.ftext-lg{font-size:1.125rem;line-height:1.75rem}.ftext-sm{font-size:.875rem;line-height:1.25rem}.ftext-xs{font-size:.75rem;line-height:1rem}.ffont-medium{font-weight:500}.ftext-gray-500{--tw-text-opacity: 1;color:rgb(107 114 128 / var(--tw-text-opacity))}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lu-lowcode-package-form",
-  "version": "0.8.3",
+  "version": "0.8.5",
   "dependencies": {
     "@ant-design/icons": "^4.8.1",
     "@testing-library/jest-dom": "^5.17.0",

package/src/App.jsx

@@ -21,7 +21,7 @@ const treeData = [
 
 function App() {
   const formRef = React.createRef();
-  const [cols, setCols] = React.useState(1);
+  const [cols, setCols] = React.useState(3);
 
   const getFormFields = () => {
     console.log("formRef?.current", formRef)
@@ -30,6 +30,10 @@ function App() {
   }
   const setFormFields = () => {
     formRef?.current?.formRef?.setFieldsValue({
+      CheckboxGroup:"[\"1\",\"2\"]",
+      select1:"1",
+      select2:"[\"1\",\"2\"]",
+      switch:"1",
       datetime: "2021-12-12",
       datetime2: "2021-12-12",
       datetime3: "2021-12-12",
@@ -39,7 +43,7 @@ function App() {
     })
   }
   const handleCols = () => {
-    setCols(cols + 1)
+    setCols(cols - 1)
   }
   return (
 
@@ -51,6 +55,8 @@ function App() {
       <div className='fw-[960px] frounded  fbg-slate-100 fflex fflex-col fitems-center fpb-10'>
         <FormContainerWrapper cols={cols} className="" ref={formRef} >
           <Field.Input label="分组名" __id="title" />
+          <Field.SingleSelect mode="single" label="测试单选" __id="select1" options={[{ label: '选项1', value: '1' }, { label: '选项2', value: '2' }]}></Field.SingleSelect>
+          <Field.MultipleSelect mode="multiple" label="测多选" __id="select2" options={[{ label: '选项1', value: '1' }, { label: '选项2', value: '2' }]}></Field.MultipleSelect>
           <Field.TreeSelect label="分组名" __id="title11"></Field.TreeSelect>
           <Field.Switch label="开关" __id="switch"></Field.Switch>
           <Field.CodeMachine label="角色编号" prompt="" __id="code" />

package/src/components/field/checkbox/checkbox-tree.jsx

@@ -58,7 +58,12 @@ const CheckboxTree = ({ request, value, onChange,callError,disabledValue, addRoo
     useEffect(() => {
         console.log("CheckboxTree value ", value)
         if ( typeof value == 'string') {
-           value =  JSON.parse(value)
+            try {
+                value = JSON.parse(value)
+                onChange(value)
+            } catch (error) {
+                
+            }
         }
        
         if(Array.isArray(value))

package/src/components/field/checkbox/index.jsx

@@ -1,23 +1,37 @@
 import { Checkbox as OriginalCheckbox } from 'antd';
-import {BaseWrapper } from "../base.jsx"
-import React from 'react'; 
+import { BaseWrapper } from "../base.jsx"
+import React, { useEffect , useState} from 'react';
 
 
-export const Checkbox = (props) =>{
-    return (
-        <BaseWrapper {...props}>
-          <OriginalCheckbox {...props} />
-        </BaseWrapper>
-      );
+export const Checkbox = (props) => {
+  return (
+    <BaseWrapper {...props}>
+      <OriginalCheckbox {...props} />
+    </BaseWrapper>
+  );
 }
 
-export const CheckboxGroup = (props) => {
-    return (
-        <BaseWrapper {...props}>
-          <OriginalCheckbox.Group {...props} />
-        </BaseWrapper>
-      );
+export const CheckboxGroup = ({value, onChange,...props}) => {
+  const [nValue, setNValue] = useState([])
+
+  useEffect(() => {
+    if (typeof value === "string") {
+      try {
+        value = JSON.parse(value)
+        onChange(value)
+      } catch (error) {
+
+      }
+    }
+
+    setNValue(value)
+  }, [value])
+  return (
+    <BaseWrapper {...props}>
+      <OriginalCheckbox.Group {...props} value={nValue} />
+    </BaseWrapper>
+  );
 }
 
 
-export {default as CheckboxTree } from './checkbox-tree.jsx';
+export { default as CheckboxTree } from './checkbox-tree.jsx';

package/src/components/field/select/index.jsx

@@ -1,4 +1,4 @@
 export { default as TreeSelect } from './tree-select.jsx';
-export { Select, WithSingleSelect,WithMultipleSelect } from './select.jsx';
+export { Select, WithSingleSelect,WithMultipleSelect , MultipleSelect, SingleSelect} from './select.jsx';
 
 

package/src/components/field/select/select.jsx

@@ -36,6 +36,32 @@ const Select = ({ request, option_label = "label", option_value = "id", disabled
     )
 }
 
+const SingleSelect =  ({ ...props }) => {
+    return (
+        <Select {...props} mode="single" />
+    )
+}
+
+const MultipleSelect =  ({ onChange, value, ...props }) => {
+    const [nValue, setNValue] = React.useState([])
+
+    useEffect(()=>{
+        if (typeof value === "string") {
+            try {
+                value = JSON.parse(value)
+                onChange(value)
+            } catch (error) {
+                
+            }
+        }
+       
+        setNValue(value)
+    },[value])
+  
+    return (
+        <Select {...props} onChange={onChange} mode="multiple" value={nValue} />
+    )
+}
 /**
  * 关联单选组件
  * @param {*}  
@@ -45,19 +71,20 @@ const WithSingleSelect = ({ onChange, value, ...props }) => {
     const [nValue, setNValue] = React.useState("")
 
     React.useEffect(() => {
-        if(value) {
+        if (value && typeof value === "string") {
             try {
                 value = JSON.parse(value)
-                setNValue(value.label)
+                onChange(value)
             } catch (error) {
 
             }
         }
+        if(value) setNValue(value)
     }, [value])
 
 
     const onWithSelectChange = (_value, _option) => {
-        onChange && typeof onChange == "function" && onChange(JSON.stringify(_option))
+        onChange && typeof onChange == "function" && onChange(_option)
         setNValue(_option.label)
     }
     return (
@@ -75,18 +102,20 @@ const WithMultipleSelect = ({ onChange, value, ...props }) => {
 
 
     React.useEffect(() => {
-        if (value) {
+        if (value && typeof value === "string") {
             try {
                 value = JSON.parse(value)
-                if (Array.isArray(value)) setNValue(value)
+                onChange(value)
             } catch (error) {
 
             }
         }
+        
+        if (Array.isArray(value)) setNValue(value)
     }, [value])
 
     const onWithSelectChange = (_value, _option) => {
-        onChange && typeof onChange == "function" && onChange(JSON.stringify(_option))
+        onChange && typeof onChange == "function" && onChange(_option)
         const selectLabels = _option.map(item => item.label);
         setNValue(_option)
     }
@@ -95,4 +124,4 @@ const WithMultipleSelect = ({ onChange, value, ...props }) => {
     )
 }
 
-export { WithSingleSelect, WithMultipleSelect, Select };
+export { WithSingleSelect, WithMultipleSelect, MultipleSelect, SingleSelect, Select };

package/src/components/field/switch/index.jsx

@@ -1,15 +1,24 @@
 import React, { useEffect } from 'react';
 import { Switch as OriginalSwitch } from 'antd';
 import { BaseWrapper } from "../base.jsx"
-const Switch = ({defaultValue ,...props}) => {
-    defaultValue = defaultValue || false;
-    useEffect(() => {
-        props.onChange(defaultValue);
+const Switch = ({value, ...props}) => {
 
-    }, [defaultValue]);
+    const [nValue, setNValue] = React.useState(false)
+    useEffect(()=>{
+        let tem_value = false 
+        if( typeof value === "boolean" )
+            tem_value = value
+        else if (typeof value === "string")
+            tem_value =value == "1" || value == "true"
+        else if (typeof value == "number") 
+            tem_value = value == 1
+        setNValue(tem_value)
+        // 格式化form表单获取到的值
+        props?.onChange(tem_value)
+    },[value])
     return (
         <BaseWrapper {...props}>
-            <OriginalSwitch {...props} />
+            <OriginalSwitch {...props} value={nValue} />
         </BaseWrapper>
     );
 }

package/src/components/form-container/layout/form-group-title.jsx

@@ -1,5 +1,5 @@
 const FormGroupTitle = ({ title }) => {
-  return (title? <div className="fh-11 border-b fflex fitems-center text-lg font-medium mb-5  ">{title}</div>: null ) 
+  return (title? <div className="fh-11 fborder-b fflex fitems-center ftext-lg ffont-medium fmb-5  ">{title}</div>: null ) 
 };
 
 export default FormGroupTitle;

package/src/components/index.jsx

@@ -1,6 +1,6 @@
 import { Input, TextArea, Password, Search ,CodeMachine} from './field/input/index.jsx'
 import '../App.css';
-import { TreeSelect, Select, WithSingleSelect,WithMultipleSelect } from './field/select/index.jsx'
+import { TreeSelect, Select, WithSingleSelect,WithMultipleSelect, SingleSelect, MultipleSelect } from './field/select/index.jsx'
 import Custom from './field/custom/index.jsx'
 import { FormContainer, FormContainerWrapper,LayoutFormRow,LayoutFormGroupTitle } from './form-container/index.jsx'
 import { Checkbox ,CheckboxTree, CheckboxGroup } from './field/checkbox/index.jsx'
@@ -17,6 +17,8 @@ const Field = {
     Select,
     WithSingleSelect,
     WithMultipleSelect,
+    SingleSelect,
+    MultipleSelect,
     CodeMachine,
     Checkbox,
     CheckboxTree,
@@ -33,8 +35,8 @@ const Layout = {
     FormGroupTitle: LayoutFormGroupTitle
 }
 export { FormContainer, Field ,FormContainerWrapper,Layout }
-// import { default as OptionSetter} from './setter/optionsetter'
-// const Setter = {
-//     OptionSetter
-// }
-// export { Setter }
+import { default as OptionSetter} from './setter/optionsetter'
+const Setter = {
+    OptionSetter
+}
+export { Setter }