chore: update

22d768cd · 王鹏飞 · 8ec30db3 · 22d768cd · 22d768cd · 22d768cd
--- a/package-lock.json
+++ b/package-lock.json
@@ -37,7 +37,7 @@
        "typescript": "~4.9.5",
        "unplugin-auto-import": "^0.15.2",
        "vite": "^4.3.1",
-        "vue-tsc": "^1.4.0"
+        "vue-tsc": "^1.2.0"
      }
    },
    "node_modules/@ampproject/remapping": {
@@ -1552,48 +1552,45 @@
      }
    },
    "node_modules/@volar/language-core": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmmirror.com/@volar/language-core/-/language-core-1.4.0.tgz",
-      "integrity": "sha512-zZg771L/v4MCPwM1KJxvnQ3q3QgbGJtEytivqf+PsxPr0kQ7XtwB1J30dd+YSGN869pXXZ0V6vWdHkDpWC8F3A==",
+      "version": "1.3.0-alpha.0",
+      "resolved": "https://registry.npmmirror.com/@volar/language-core/-/language-core-1.3.0-alpha.0.tgz",
+      "integrity": "sha512-W3uMzecHPcbwddPu4SJpUcPakRBK/y/BP+U0U6NiPpUX1tONLC4yCawt+QBJqtgJ+sfD6ztf5PyvPL3hQRqfOA==",
      "dev": true,
      "dependencies": {
-        "@volar/source-map": "1.4.0"
+        "@volar/source-map": "1.3.0-alpha.0"
      }
    },
    "node_modules/@volar/source-map": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmmirror.com/@volar/source-map/-/source-map-1.4.0.tgz",
-      "integrity": "sha512-gkV8ol9qtP7aMdgijc8a5Yoxxoo90TT55YCi9bsMbKxEUDsOAnlciFNlijR9Ebe42d67GV3w15/RzjveTRNGBw==",
+      "version": "1.3.0-alpha.0",
+      "resolved": "https://registry.npmmirror.com/@volar/source-map/-/source-map-1.3.0-alpha.0.tgz",
+      "integrity": "sha512-jSdizxWFvDTvkPYZnO6ew3sBZUnS0abKCbuopkc0JrIlFbznWC/fPH3iPFIMS8/IIkRxq1Jh9VVG60SmtsdaMQ==",
      "dev": true,
      "dependencies": {
        "muggle-string": "^0.2.2"
      }
    },
    "node_modules/@volar/typescript": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmmirror.com/@volar/typescript/-/typescript-1.4.0.tgz",
-      "integrity": "sha512-r6OMHj/LeS86iQy3LEjjS+qpmHr9I7BiH8gAwp9WEJP76FHlMPi/EPDQxhf3VcMQ/w6Pi5aBczqI+I3akr9t4g==",
+      "version": "1.3.0-alpha.0",
+      "resolved": "https://registry.npmmirror.com/@volar/typescript/-/typescript-1.3.0-alpha.0.tgz",
+      "integrity": "sha512-5UItyW2cdH2mBLu4RrECRNJRgtvvzKrSCn2y3v/D61QwIDkGx4aeil6x8RFuUL5TFtV6QvVHXnsOHxNgd+sCow==",
      "dev": true,
      "dependencies": {
-        "@volar/language-core": "1.4.0"
-      },
-      "peerDependencies": {
-        "typescript": "*"
+        "@volar/language-core": "1.3.0-alpha.0"
      }
    },
    "node_modules/@volar/vue-language-core": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmmirror.com/@volar/vue-language-core/-/vue-language-core-1.4.0.tgz",
-      "integrity": "sha512-AIl9iW/6qac1FIJNi6cL27HNNWQWN1gzYkAA3qgcyvpx83a7YEbm9uPC9oelQhiODwFtdt3f3U5ta0l/5kKqjw==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/@volar/vue-language-core/-/vue-language-core-1.2.0.tgz",
+      "integrity": "sha512-w7yEiaITh2WzKe6u8ZdeLKCUz43wdmY/OqAmsB/PGDvvhTcVhCJ6f0W/RprZL1IhqH8wALoWiwEh/Wer7ZviMQ==",
      "dev": true,
      "dependencies": {
-        "@volar/language-core": "1.4.0",
-        "@volar/source-map": "1.4.0",
-        "@vue/compiler-dom": "^3.2.0",
-        "@vue/compiler-sfc": "^3.2.0",
-        "@vue/reactivity": "^3.2.0",
-        "@vue/shared": "^3.2.0",
-        "minimatch": "^9.0.0",
+        "@volar/language-core": "1.3.0-alpha.0",
+        "@volar/source-map": "1.3.0-alpha.0",
+        "@vue/compiler-dom": "^3.2.47",
+        "@vue/compiler-sfc": "^3.2.47",
+        "@vue/reactivity": "^3.2.47",
+        "@vue/shared": "^3.2.47",
+        "minimatch": "^6.1.6",
        "muggle-string": "^0.2.2",
        "vue-template-compiler": "^2.7.14"
      }
@@ -1608,25 +1605,25 @@
      }
    },
    "node_modules/@volar/vue-language-core/node_modules/minimatch": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-9.0.0.tgz",
-      "integrity": "sha512-0jJj8AvgKqWN05mrwuqi8QYKx1WmYSUoKSxu5Qhs9prezTz10sxAHGNZe9J9cqIJzta8DWsleh2KaVaLl6Ru2w==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-6.2.0.tgz",
+      "integrity": "sha512-sauLxniAmvnhhRjFwPNnJKaPFYyddAgbYdeUpHULtCT/GhzdCx/MDNy+Y40lBxTQUrMzDE8e0S43Z5uqfO0REg==",
      "dev": true,
      "dependencies": {
        "brace-expansion": "^2.0.1"
      },
      "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": ">=10"
      }
    },
    "node_modules/@volar/vue-typescript": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmmirror.com/@volar/vue-typescript/-/vue-typescript-1.4.0.tgz",
-      "integrity": "sha512-DOwKNuK4ScK+NXOU+kxMqVbOK9vCIj9TSOX7iBA34CHzIdnjDWK3ne1Iw74ltat2VX1PEyVQKzC74ZxoInV9bw==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/@volar/vue-typescript/-/vue-typescript-1.2.0.tgz",
+      "integrity": "sha512-zjmRi9y3J1EkG+pfuHp8IbHmibihrKK485cfzsHjiuvJMGrpkWvlO5WVEk8oslMxxeGC5XwBFE9AOlvh378EPA==",
      "dev": true,
      "dependencies": {
-        "@volar/typescript": "1.4.0",
-        "@volar/vue-language-core": "1.4.0"
+        "@volar/typescript": "1.3.0-alpha.0",
+        "@volar/vue-language-core": "1.2.0"
      }
    },
    "node_modules/@vue-flow/controls": {
@@ -5764,14 +5761,13 @@
      }
    },
    "node_modules/vue-tsc": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmmirror.com/vue-tsc/-/vue-tsc-1.4.0.tgz",
-      "integrity": "sha512-zASWNqFTIHaY6K8ua0ifFpiX7lA4pz8zKkevLAVYyzBQu6Jc63xWdY3eH0qCUJm7L4K4h9nzbwysta89sfq7ZQ==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/vue-tsc/-/vue-tsc-1.2.0.tgz",
+      "integrity": "sha512-rIlzqdrhyPYyLG9zxsVRa+JEseeS9s8F2BbVVVWRRsTZvJO2BbhLEb2HW3MY+DFma0378tnIqs+vfTzbcQtRFw==",
      "dev": true,
      "dependencies": {
-        "@volar/vue-language-core": "1.4.0",
-        "@volar/vue-typescript": "1.4.0",
-        "semver": "^7.3.8"
+        "@volar/vue-language-core": "1.2.0",
+        "@volar/vue-typescript": "1.2.0"
      },
      "bin": {
        "vue-tsc": "bin/vue-tsc.js"

--- a/package.json
+++ b/package.json
@@ -44,6 +44,6 @@
    "typescript": "~4.9.5",
    "unplugin-auto-import": "^0.15.2",
    "vite": "^4.3.1",
-    "vue-tsc": "^1.4.0"
+    "vue-tsc": "^1.2.0"
  }
 }
--- a/src/components/flow/components/RuleTemplate.vue
+++ b/src/components/flow/components/RuleTemplate.vue
--- a/src/components/flow/components/conditionalBranch/attributeJudgment/Rule.vue
+++ b/src/components/flow/components/conditionalBranch/attributeJudgment/Rule.vue
 <script setup lang="ts">
 import RuleTemplate from '../../RuleTemplate.vue'
+import { useUserAttr } from '../../../composables/useAllData'

-defineProps<{ node: any }>()
+const props = defineProps<{ node: any }>()
+
+const { getUserAttr } = useUserAttr()
+
+const config = computed(() => {
+  return props.node.data.teacher || {}
+})
+
+function paramsParse(data: any) {
+  return data.rules
+}
 </script>

 <template>
-  <RuleTemplate :node="node" step>
-    <template #header-answer>答案</template>
+  <RuleTemplate :node="node" step :paramsParse="paramsParse">
+    <template #header-answer>
+      <span class="is-answer" v-for="(item, index) in config.rules" :key="index">
+        {{ getUserAttr(item.attr_id)?.name }} {{ item.operate }} {{ item.value }}
+      </span>
+    </template>
  </RuleTemplate>
 </template>
--- a/src/components/flow/components/triggeringConditions/realTimeTrigger/Rule.vue
+++ b/src/components/flow/components/triggeringConditions/realTimeTrigger/Rule.vue
@@ -5,7 +5,7 @@ const props = defineProps<{ node: any }>()

 function onSubmit(form: any) {
  form.expected_user_total = form.user_total
-  Object.assign(props.node.data, { rule: { form, params: {} } })
+  Object.assign(props.node.data, { rule: form, rule_params: {} })
 }
 </script>


--- a/src/components/flow/composables/useQueryUser.ts
+++ b/src/components/flow/composables/useQueryUser.ts
@@ -44,7 +44,7 @@ export function useQueryUser(node: any) {
    const filters = prevNodes.map(node => ({
      type: node.data.type,
      component_type: node.data.component_type,
-      params: node.data.rule?.params || {}
+      params: node.data.rule_params || {}
    }))
    const { data } = await ruleQuery({
      experiment_id: route.query.experiment_id as string,
@@ -53,5 +53,21 @@ export function useQueryUser(node: any) {
    expectedTotal.value = data.count
  }

-  return { total, expectedTotal, query }
+  // 上一节点
+  const prevNode = computed(() => {
+    const prevEdges = sortEdges(node.id, edges.value)
+    const prevNodes = sortNodes(node.id, prevEdges, nodes.value)
+    return prevNodes[prevNodes.length - 2]
+  })
+
+  const prevNodeRule = computed(() => {
+    return prevNode.value?.data?.rule ?? {}
+  })
+
+  // 上一节点预期用户数量
+  const prevNodeExpectedTotal = computed(() => {
+    return prevNodeRule.value?.expected_user_total ?? 0
+  })
+
+  return { total, expectedTotal, prevNode, prevNodeRule, prevNodeExpectedTotal, query }
 }
--- a/src/modules/group/components/FormDialog.vue
+++ b/src/modules/group/components/FormDialog.vue
@@ -63,7 +63,9 @@ function fetchInfo() {
    const { detail } = res.data
    const [user_attr_rule = { current_logic_operate: 'and', items: [] }] = detail.user_attr_rule
    const [event_attr_rule = { current_logic_operate: 'and', items: [] }] = detail.event_attr_rule
-    const [tag_rule = { current_logic_operate: 'and', items: [] }] = detail.tag_rule
+    const [tag_rule = { current_logic_operate: 'and', items: [] }] = detail.tag_rule.map((item: any) => {
+      return { ...item, items: item.items.map((item: any) => item.id) }
+    })
    Object.assign(form, { user_attr_rule, event_attr_rule, tag_rule })
  })
 }