Merge branch 'sqy_dev' into 'main'

'fix:添加场景联动表单校验，修复不能打包问题' See merge request huang/yun-teng-iot-front!172

Merge branch 'sqy_dev' into 'main'
'fix:添加场景联动表单校验，修复不能打包问题' See merge request huang/yun-teng-iot-front!172
xp.Huang
2 parents bb196132 9b359aa5
Showing 5 changed files with 21 additions and 14 deletions
src/views/rule/linkedge/config.ts
src/views/rule/linkedge/cpns/ClearAlarm.vue
src/views/rule/linkedge/cpns/ConditionScreening.vue
src/views/rule/linkedge/cpns/condition.vue
src/views/rule/linkedge/cpns/trigger.vue
--- a/src/views/rule/linkedge/config.ts
View file @382d203
+++ b/src/views/rule/linkedge/config.ts
View file @382d203
@@ -436,7 +436,7 @@ export function isType(operationType) {
           field: 'operation',
           label: '执行操作',
           component: 'Select',
-          require: true,
+          required: true,
           componentProps: {
             options: [
               { label: '等于', value: Number_Operation.EQUAL },
@@ -454,7 +454,7 @@ export function isType(operationType) {
         {
           field: 'value',
           label: '操作值',
-          require: true,
+          required: true,
           component: 'InputNumber',
           colProps: {
             span: 8,
@@ -476,7 +476,7 @@ export function isType(operationType) {
           field: 'operation',
           label: '执行操作',
           component: 'Select',
-          require: true,
+          required: true,
           componentProps: {
             options: [
               { label: '等于', value: String_Operation.EQUAL },
@@ -494,7 +494,7 @@ export function isType(operationType) {
         {
           field: 'value',
           label: '操作值',
-          require: true,
+          required: true,
           component: 'Input',
           colProps: {
             span: 7,
@@ -507,7 +507,7 @@ export function isType(operationType) {
           field: 'operation',
           label: '执行操作',
           component: 'Select',
-          require: true,
+          required: true,
           componentProps: {
             options: [
               { label: '等于', value: Boolean_Operation.EQUAL },
@@ -522,7 +522,7 @@ export function isType(operationType) {
           field: 'value',
           label: '操作值',
           component: 'Select',
-          require: true,
+          required: true,
           componentProps: {
             options: [
               {
@@ -545,7 +545,7 @@ export function isType(operationType) {
         {
           field: 'operation',
           label: '执行操作',
-          require: true,
+          required: true,
           component: 'Select',
           componentProps: {
             options: [
@@ -564,7 +564,7 @@ export function isType(operationType) {
         {
           field: 'value',
           label: '操作值',
-          require: true,
+          required: true,
           component: 'DatePicker',
           componentProps: {
             showTime: true,
--- a/src/views/rule/linkedge/cpns/ClearAlarm.vue
View file @382d203
+++ b/src/views/rule/linkedge/cpns/ClearAlarm.vue
View file @382d203
@@ -31,11 +31,13 @@
   import { ref, provide } from 'vue';
   import { CollapseContainer } from '/@/components/Container/index';
   import { BasicForm, useForm } from '/@/components/Form/index';
-  import { RadioGroup, Card, Select } from 'ant-design-vue';
+  import { Radio, Card, Select } from 'ant-design-vue';
   import { trigger_condition_schema } from '../config';
   import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
   import ConditionScreening from './ConditionScreening.vue';
+  const RadioGroup = Radio.Group;
+
   const [registerForm, { resetFields, getFieldsValue, updateSchema, setFieldsValue }] = useForm({
     schemas: trigger_condition_schema,
     showActionButtonGroup: false,
--- a/src/views/rule/linkedge/cpns/ConditionScreening.vue
View file @382d203
+++ b/src/views/rule/linkedge/cpns/ConditionScreening.vue
View file @382d203
@@ -62,9 +62,6 @@
     const attributes = [];
     const fieldsValue = props.childGetFieldsValue();
     for (let i = 0; i < unref(refItem.conditionScreeningRefs).length; i++) {
-      // const valid = await unref(refItem.conditionScreeningRefs)[i].validate();
-      console.log(unref(refItem.conditionScreeningRefs)[i]);
-      // if (!valid) return;
       if (i === 0) {
         const attr = conditionPreView(
           [
@@ -76,14 +73,19 @@
           fieldsValue.operationType
         );
         firstAttribute.value = attr[0];
+        await unref(refItem.conditionScreeningRefs)[i].validate();
         continue;
       }
+      const valid = await unref(refItem.conditionScreeningRefs)[i].validate();
+      if (!valid) return;
+
       attributes.push({
         ...unref(refItem.conditionScreeningRefs)[i].getFieldsValue(),
         attribute: fieldsValue.type2,
       });
     }
     otherAttribute.value = conditionPreView(attributes, fieldsValue.operationType);
+
     collapseContainerRef.value.handleExpand();
   };
--- a/src/views/rule/linkedge/cpns/condition.vue
View file @382d203
+++ b/src/views/rule/linkedge/cpns/condition.vue
View file @382d203
@@ -36,12 +36,13 @@
   import { ref, provide } from 'vue';
   import { CollapseContainer } from '/@/components/Container/index';
   import { BasicForm, useForm } from '/@/components/Form/index';
-  import { Tooltip, RadioGroup, Card, Select } from 'ant-design-vue';
+  import { Tooltip, Radio, Card, Select } from 'ant-design-vue';
   import { trigger_condition_schema } from '../config';
   import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
   import { Icon } from '/@/components/Icon';
   import ConditionScreening from './ConditionScreening.vue';
+  const RadioGroup = Radio.Group;
   defineProps({
     conditionIndex: {
--- a/src/views/rule/linkedge/cpns/trigger.vue
View file @382d203
+++ b/src/views/rule/linkedge/cpns/trigger.vue
View file @382d203
@@ -42,10 +42,12 @@
   import { CollapseContainer } from '/@/components/Container/index';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { Icon } from '/@/components/Icon';
-  import { Tooltip, RadioGroup, Card, Select } from 'ant-design-vue';
+  import { Tooltip, Radio, Card, Select } from 'ant-design-vue';
   import { trigger_condition_schema } from '../config';
   import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
   import ConditionScreening from './ConditionScreening.vue';
+  const RadioGroup = Radio.Group;
+
   defineProps({
     triggerIndex: {
       type: Number,