pref: 参数设计器 添加字段

@@ -6,7 +6,7 @@
     align-items: center;
     justify-content: space-between;
     font-size: 14px;
-    color: @N9
+    color: @N9;
   }
 
   &__header-icon {
@@ -17,7 +17,7 @@
 
   &__header-filter {
     display: inline-block;
-    min-width: 80px;
+    width: 100px;
 
     &__select {
       width: 100%;
@@ -28,7 +28,7 @@
     color: @N8;
 
     &:hover {
-      color: @E3
+      color: @E3;
     }
   }
 
@@ -44,7 +44,7 @@
       display: flex;
       align-items: center;
       justify-content: center;
-      color: @N7
+      color: @N7;
     }
   }
 }

@@ -49,20 +49,20 @@ const valueOptions = [
   { key: 'BOOL', title: '布尔' },
   { key: 'OBJECT', title: '对象' },
   { key: 'ARRAY', title: '数组' },
-  { key: 'ANNEX', title: '附件' },
-  { key: 'PIC', title: '图片' },
+  /*{ key: 'ANNEX', title: '附件' },
+  { key: 'PIC', title: '图片' },*/
   { key: 'FORM', title: '表单' },
   { key: 'USER', title: '人员' },
   { key: 'ORG', title: '部门' },
 ];
 
 const timeFormat = [
-  { lable: '年', value: 'YEAR' },
-  { lable: '年-月', value: 'YEAR_MONTH' },
-  { lable: '年-月-日', value: 'YEAR_DATE' },
-  { lable: '年-月-日 时', value: 'YEAR_HOUR' },
-  { lable: '年-月-日 时:分', value: 'YEAR_MIN' },
-  { lable: '年-月-日 时:分:秒', value: 'YEAR_SEC' },
+  { label: '年', value: 'YEAR' },
+  { label: '年-月', value: 'YEAR_MONTH' },
+  { label: '年-月-日', value: 'YEAR_DATE' },
+  { label: '年-月-日 时', value: 'YEAR_HOUR' },
+  { label: '年-月-日 时:分', value: 'YEAR_MIN' },
+  { label: '年-月-日 时:分:秒', value: 'YEAR_SEC' },
 ];
 
 interface ParameterSettingProps {
@@ -79,7 +79,8 @@ interface ParameterSettingProps {
   handleAdd: (val: any) => void;
   handleDelete: (val: any) => void;
   appFormList?: any[]; // 当前应用表单list
-  request?: any,
+  request?: any;
+  nodeType?: string | 'START' | 'END';
 }
 const EditableContext = React.createContext<FormInstance<any> | null>(null);
 
@@ -120,8 +121,8 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
     handleChange,
     handleChangeField,
     inputKey,
+    nodeType,
   } = props;
-  console.log('data', data);
   // const [form] = Form.useForm()
 
   //判断数组是否只有一个子节点
@@ -139,7 +140,6 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
   };
 
   const checkShowTree = (_data: any) => {
-    // console.log('_data', _data)
     if (_data.type == 'ARRAY') {
       if (_data.child && _data.child.length > 0) {
         return false;
@@ -244,8 +244,6 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
       editable: true,
       key: 'qxProps',
       render: (text: any, record: any) => {
-        console.log('record ====', record);
-        console.log('text ====', text);
         return (
           <>
             {record.type === 'FORM' ? <>
@@ -392,6 +390,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
     children: React.ReactNode;
     dataIndex: keyof any;
     record: any;
+    index: number;
     // handleSave: (record: Item) => void;
   }
 
@@ -409,12 +408,10 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
     const form = useContext(EditableContext)!;
     const qxProps = record?.qxProps || {};
     const [currentNode, setCurrentNode] = useState<any>('');
-    // console.log('dataIndex', dataIndex)
 
     useEffect(() => {
       if (editing) {
         if (inputRef.current) {
-          // console.log('setEditing', inputRef)
           inputRef.current!.focus();
         }
       }
@@ -434,7 +431,6 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
     const toggleEdit1 = (e) => {
       const values = form.getFieldsValue();
       e.persist();
-      // console.log('vae.target.tagNamelues', e.target.tagName)
       if (e.target.tagName == 'DIV') {
         setCurrentNode(e.target)
         // console.log('values', values)
@@ -443,31 +439,8 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
           props.handleChange(values?.newQxProps, record, 'qxProps')
         }
       }
-
-      // setCurrentNode(e.currentTarget)
-      // console.log('e-onburl', e.currentTarget.key)
-      //
-      // if (e.currentTarget == e.target) {
-      //   // setEditing(!editing);
-      // }
-      // form.setFieldsValue({ [dataIndex]: record[dataIndex] });
     };
 
-    // const test = (value) => {
-    //   console.log('value', value)
-    //   // form.setFieldsValue({
-    //   //   ['qxProps']: { value: value }
-    //   // })
-    // }
-    // const toggleEdit2 = (e) => {
-    //   e.persist();
-    //   // console.log('e-onforce', e.currentTarget)
-
-    //   // e.dataTransfer.setData('text', e.target.getAttribute('data-row-key'));
-    //   // console.log('currentTarget-fource', currentNode)
-    //   // form.setFieldsValue({ [dataIndex]: record[dataIndex] });
-    // };
-
     const save = async (code: string) => {
       const isProps = code.indexOf('qxProps');
       const _newCode = isProps > -1 ? code.slice(8) : '';
@@ -480,7 +453,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
         props.handleChange(newValue, record, code);
         // toggleEdit();
       } catch (errInfo) {
-        console.log('Save failed:', errInfo);
+        console.warn('Save failed:', errInfo);
       }
     };
 
@@ -642,7 +615,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
                       key={item.value}
                       value={item.value}
                     >
-                      {item.lable}
+                      {item.label}
                     </Select.Option>
                   );
                 })}
@@ -859,7 +832,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
       onCell: (record: any, index: any) => ({
         index,
         record,
-        editable: record.disabled ? false : true,
+        editable: !record.disabled,
         dataIndex: col.dataIndex,
         title: col.title,
         // handleSave,

@@ -74,6 +74,7 @@ interface ParameterSettingProps {
   // comHandleChange?: (val: any) => void;
   appFormList?: any[]; // 当前应用表单list
   request?: any,
+  nodeType?: string | 'START' | 'END';
 }
 
 export const QxParameterSetting: React.FC<ParameterSettingProps> = (props) => {
@@ -779,6 +780,7 @@ export const QxParameterSetting: React.FC<ParameterSettingProps> = (props) => {
         visible={visible}
         request={props?.request}
         appFormList={props?.appFormList}
+        nodeType={props?.nodeType}
       />
     </div>
   );