st-comp 0.0.211 → 0.0.213

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "st-comp",
   "public": true,
-  "version": "0.0.211",
+  "version": "0.0.213",
   "type": "module",
   "scripts": {
     "dev": "vite",

package/packages/KlineConfig/index.vue

@@ -63,6 +63,12 @@ onMounted(() => {
   getCycleOptions();
   mainIndicatorOptions.value = props.indicatorStore.mainIndicatorList ?? [];
 });
+watch(
+  () => props.indicatorStore.mainIndicatorList,
+  () => {
+    mainIndicatorOptions.value = props.indicatorStore.mainIndicatorList ?? [];
+  },
+);
 defineExpose({
   // 打开
   open: async () => {

package/packages/VarietySearch/components/CompositeOrder/index.vue

@@ -11,7 +11,11 @@ const props = defineProps({
   commonOption: { type: Array, default: () => [] }, // 已选常用选项
 });
 const visible = ref(false);
-const compositeOrderForm = ref({ name: null, value: "desc" });
+const compositeOrderForm = ref({
+  id: null,
+  name: null, // 字段名
+  value: "desc", // 排序
+});
 
 // 组合排序数据源 [受到: 品种市场, 常用选项影响]
 const compositeOrderOptions = computed(() => {
@@ -41,7 +45,7 @@ const handleAction = (action, index) => {
   switch (action) {
     // 新增
     case "add": {
-      compositeOrderForm.value = { name: null, value: "desc" };
+      compositeOrderForm.value = { id: null, name: null, value: "desc" };
       visible.value = true;
       break;
     }
@@ -54,22 +58,37 @@ const handleAction = (action, index) => {
     }
     // 窗口确认
     case "submit": {
-      if (!compositeOrderForm.value.name) return ElMessage.warning("请选择需要排序的条件");
-      const { label } = compositeOrderOptions.value.find((item) => item.key === compositeOrderForm.value.name);
-      const tagText = `${label}-${compositeOrderForm.value.value === "asc" ? "正序↑" : "降序↓"}`;
-      // 判断data中是否已存在同字段条件, 是则替换, 否则push
-      const keyIndex = data.value.findIndex(({ name }) => name === compositeOrderForm.value.name);
-      if (keyIndex === -1) {
-        data.value.push({ ...compositeOrderForm.value, tagText });
-      } else {
-        data.value.splice(keyIndex, 1, { ...compositeOrderForm.value, tagText });
+      const { id, name, value } = compositeOrderForm.value;
+      if (!name) return ElMessage.warning("请选择需要排序的条件");
+      const { label } = compositeOrderOptions.value.find((item) => item.key === name);
+      const tagText = `${label}-${value === "asc" ? "正序↑" : "降序↓"}`;
+
+      // 新增确认逻辑
+      if (id === null) {
+        // 判断data中是否已存在同字段条件, 是则替换, 否则push
+        const index = data.value.findIndex((item) => item.name === name);
+        if (index === -1) {
+          data.value.push({ ...compositeOrderForm.value, id: name, tagText });
+        } else {
+          data.value.splice(index, 1, { ...compositeOrderForm.value, id: name, tagText });
+        }
+      }
+      // 编辑确认逻辑
+      else if (compositeOrderForm.value.id) {
+        // 修改当前位置的内容, 并将其他相同name的删除掉
+        const index = data.value.findIndex((item) => item.name === id);
+        const index2 = data.value.findIndex((item) => item.name === name);
+        data.value[index] = { ...compositeOrderForm.value, id: name, tagText };
+        if (index2 !== -1 && index !== index2) data.value.splice(index2, 1);
       }
+
       visible.value = false;
       break;
     }
     // 删除
     case "delete": {
       data.value.splice(index, 1);
+      visible.value = false;
       break;
     }
   }
@@ -84,7 +103,7 @@ watch(
         return compositeOrderOptions.value.find((item) => item.key === name);
       });
     }
-  }
+  },
 );
 </script>