Selaa lähdekoodia

fix(场景联动): 修复无法选取设备问题

xieyonghong 3 vuotta sitten
vanhempi
commit
566579cbf3

+ 9 - 2
src/pages/device/Instance/Detail/Functions/form.tsx

@@ -58,9 +58,16 @@ export default (props: FunctionProps) => {
       case 'double':
       case 'double':
         return <InputNumber style={{ width: '100%' }} placeholder={'请输入' + name} />;
         return <InputNumber style={{ width: '100%' }} placeholder={'请输入' + name} />;
       case 'date':
       case 'date':
-        // @ts-ignore
         return (
         return (
-          <DatePicker format={record.format || 'YYYY-MM-DD HH:mm:ss'} style={{ width: '100%' }} />
+          <>
+            {
+              // @ts-ignore
+              <DatePicker
+                format={record.format || 'YYYY-MM-DD HH:mm:ss'}
+                style={{ width: '100%' }}
+              />
+            }
+          </>
         );
         );
       default:
       default:
         return <Input placeholder={'请输入' + name} />;
         return <Input placeholder={'请输入' + name} />;

+ 0 - 1
src/pages/rule-engine/Scene/Save/components/DatePickerFormat/index.tsx

@@ -17,7 +17,6 @@ export default (props: DatePickerFormat) => {
           {...extraProps}
           {...extraProps}
           value={typeof value === 'string' ? moment(value) : value}
           value={typeof value === 'string' ? moment(value) : value}
           onChange={(date, dateString) => {
           onChange={(date, dateString) => {
-            console.log(dateString);
             if (onChange) {
             if (onChange) {
               onChange(dateString, date);
               onChange(dateString, date);
             }
             }

+ 9 - 5
src/pages/rule-engine/Scene/Save/trigger/index.tsx

@@ -137,17 +137,21 @@ export default (props: TriggerProps) => {
                 style={{ width: 120 }}
                 style={{ width: 120 }}
               />
               />
             </Form.Item>
             </Form.Item>
-            <Form.Item name={['trigger', 'device', 'selectorValues']}>
-              {selector === 'fixed' && <Device productId={productId} />}
-              {selector === 'org' && (
+            {selector === 'fixed' && (
+              <Form.Item name={['trigger', 'device', 'selectorValues']}>
+                <Device productId={productId} />
+              </Form.Item>
+            )}
+            {selector === 'org' && (
+              <Form.Item name={['trigger', 'device', 'selectorValues']}>
                 <TreeSelect
                 <TreeSelect
                   treeData={orgTree}
                   treeData={orgTree}
                   fieldNames={{ label: 'name', value: 'id' }}
                   fieldNames={{ label: 'name', value: 'id' }}
                   placeholder={'请选择部门'}
                   placeholder={'请选择部门'}
                   style={{ width: 300 }}
                   style={{ width: 300 }}
                 />
                 />
-              )}
-            </Form.Item>
+              </Form.Item>
+            )}
             {functions.length || events.length || properties.length ? (
             {functions.length || events.length || properties.length ? (
               <Form.Item name={['trigger', 'device', 'operation', 'operator']}>
               <Form.Item name={['trigger', 'device', 'operation', 'operator']}>
                 <Select
                 <Select