feat: 显示逻辑稳定版

didi · May 21, 2024 · 0982b1a · 0982b1a
1 parent 7b0c1c4
commit 0982b1a
Show file tree

Hide file tree

Showing 54 changed files with 1,474 additions and 385 deletions.
diff --git a/server/src/modules/survey/template/surveyTemplate/templateBase.json b/server/src/modules/survey/template/surveyTemplate/templateBase.json
@@ -48,5 +48,8 @@
       "contentConf": {
         "opacity": 100
       }
+    },
+    "logicConf": {
+      "showLogicConf": []
     }
   }
diff --git a/web/.gitignore b/web/.gitignore
@@ -15,6 +15,7 @@ yarn-error.log*
 pnpm-debug.log*
 package-lock.json
 pnpm-lock.yaml
+yarn.lock
 
 # Editor directories and files
 .idea

diff --git a/web/components.d.ts b/web/components.d.ts
@@ -11,40 +11,36 @@ declare module 'vue' {
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCollapse: typeof import('element-plus/es')['ElCollapse']
     ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
-    ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
-    ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
-    ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
-    ElIcon: typeof import('element-plus/es')['ElIcon']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
+    ElMenu: typeof import('element-plus/es')['ElMenu']
+    ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopover: typeof import('element-plus/es')['ElPopover']
     ElRadio: typeof import('element-plus/es')['ElRadio']
     ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElSelect: typeof import('element-plus/es')['ElSelect']
-    ElSlider: typeof import('element-plus/es')['ElSlider']
+    ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     ElTabPane: typeof import('element-plus/es')['ElTabPane']
     ElTabs: typeof import('element-plus/es')['ElTabs']
-    ElTag: typeof import('element-plus/es')['ElTag']
-    ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
-    'IEp-[]': typeof import('~icons/ep/[]')['default']
-    'IEp-[test]': typeof import('~icons/ep/[test]')['default']
-    'IEp-]': typeof import('~icons/ep/]')['default']
     IEpBottom: typeof import('~icons/ep/bottom')['default']
     IEpCheck: typeof import('~icons/ep/check')['default']
     IEpCirclePlus: typeof import('~icons/ep/circle-plus')['default']
     IEpClose: typeof import('~icons/ep/close')['default']
     IEpCopyDocument: typeof import('~icons/ep/copy-document')['default']
+    IEpDelete: typeof import('~icons/ep/delete')['default']
     IEpLoading: typeof import('~icons/ep/loading')['default']
+    IEpMinus: typeof import('~icons/ep/minus')['default']
+    IEpPlus: typeof import('~icons/ep/plus')['default']
     IEpQuestionFilled: typeof import('~icons/ep/question-filled')['default']
     IEpRank: typeof import('~icons/ep/rank')['default']
     IEpRemove: typeof import('~icons/ep/remove')['default']
@@ -58,6 +54,5 @@ declare module 'vue' {
   }
   export interface ComponentCustomProperties {
     vLoading: typeof import('element-plus/es')['ElLoadingDirective']
-    vPopover: typeof import('element-plus/es')['ElPopoverDirective']
   }
 }
diff --git a/web/package.json b/web/package.json
@@ -23,13 +23,15 @@
     "element-plus": "^2.7.0",
     "lodash-es": "^4.17.21",
     "moment": "^2.29.4",
+    "nanoid": "^5.0.7",
     "node-forge": "^1.3.1",
     "qrcode": "^1.5.3",
     "vue": "^3.4.15",
     "vue-router": "^4.2.5",
     "vuedraggable": "^4.1.0",
     "vuex": "^4.0.2",
-    "xss": "^1.0.14"
+    "xss": "^1.0.14",
+    "yup": "^1.4.0"
   },
   "devDependencies": {
     "@iconify-json/ep": "^1.1.15",

diff --git a/web/src/common/Editor/EditorV2.vue b/web/src/common/Editor/EditorV2.vue
diff --git a/web/src/common/Editor/ReadOnly.vue b/web/src/common/Editor/ReadOnly.vue
diff --git a/web/src/common/logicEngine/BasicType.ts b/web/src/common/logicEngine/BasicType.ts
@@ -0,0 +1,32 @@
+/**
+ * in：包含, 选择了，任一
+ * eq: 等于，选择了，全部
+ * nin: 不包含，不选择，任一
+ * neq：不等于，不选择，全部，可以实现“填写了”
+ */
+export enum Operator {
+  Include = 'in',
+  Equal = 'eq',
+  NotEqual = 'neq',
+  NotInclude = 'nin',
+}
+
+
+export enum PrefixID {
+  Rule = 'r',
+  Condition = 'c'
+}
+
+export enum Scope {
+  Question = 'question',
+  Option = 'option'
+}
+
+
+export type FieldTypes = string | string[];
+
+// 定义事实对象类型
+export type Fact = {
+  [key: string]: any;
+};
+