st-comp 0.0.58 → 0.0.59

package/package.json

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

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

@@ -11,7 +11,7 @@ const visible = ref(false);
 
 // 表单相关参数
 const dialogFormRef = ref(null);
-const dialogForm = ref({ factorScreen: [{ cycle: null, factor: null, score: [null, null] }] });
+const dialogForm = ref({ factorScreen: [{ cycle: props.config.cycleDefault ?? null, factor: null, score: [null, null] }] });
 // 特殊校验: 分数
 const scoreValidator = (rule, value, callback) => {
   // 检查开始和结束的分是否都没填
@@ -26,7 +26,7 @@ const scoreValidator = (rule, value, callback) => {
 const openDialog = () => {
   // 弹窗打开时, 重置表单
   if (data.value.length > 0) dialogForm.value.factorScreen = JSON.parse(JSON.stringify(data.value));
-  else dialogForm.value.factorScreen = [{ cycle: null, factor: null, score: [null, null] }];
+  else dialogForm.value.factorScreen = [{ cycle: props.config.cycleDefault ?? null, factor: null, score: [null, null] }];
   visible.value = true;
 };
 // 函数: 弹窗外-删除因子
@@ -36,7 +36,7 @@ const deleteTag = (index) => {
 
 // 函数: 弹窗内-添加因子
 const addFactor = () => {
-  dialogForm.value.factorScreen.push({ cycle: null, factor: null, score: [null, null] });
+  dialogForm.value.factorScreen.push({ cycle: props.config.cycleDefault ?? null, factor: null, score: [null, null] });
 };
 // 函数: 弹窗内-删除因子
 const deleteFactor = (index) => {
@@ -86,9 +86,10 @@ const handleTagName = (tag) => {
         <div v-for="(item, index) in dialogForm.factorScreen" class="form-row">
           <!-- 周期 -->
           <el-form-item
+            v-if="config.cycleShow"
             :prop="'factorScreen.' + index + '.cycle'"
             :rules="{ required: true, message: '周期不能为空', trigger: 'blur' }"
-            style="width: 100px"
+            style="width: 100px; margin-right: 10px;"
           >
             <el-select v-model="item.cycle" placeholder="选择周期" size="small">
               <el-option v-for="{ label, value } in config.cycleOptions" :label="label" :value="value" :key="value" />
@@ -98,7 +99,7 @@ const handleTagName = (tag) => {
           <el-form-item
             :prop="'factorScreen.' + index + '.factor'"
             :rules="{ required: true, message: '因子不能为空', trigger: 'blur' }"
-            style="width: 100px"
+            style="width: 100px; margin-right: 10px;"
           >
             <el-select v-model="item.factor" placeholder="选择因子" size="small">
               <el-option v-for="{ label, value } in config.factorOptions" :label="label" :value="value" :key="value" />
@@ -108,9 +109,9 @@ const handleTagName = (tag) => {
           <el-form-item
             :prop="'factorScreen.' + index + '.score'"
             :rules="{ validator: scoreValidator, trigger: 'blur' }"
-            style="width: 200px"
+            style="width: 200px; margin-right: 10px;"
           >
-            <div style="display: flex; align-items: center; width: 100%; height: 24px">
+            <div style="display: flex; align-items: center; width: 100%; height: 24px;">
               <el-input-number v-model="item.score[0]" size="small" controls-position="right" />
               <span>~</span>
               <el-input-number v-model="item.score[1]" size="small" controls-position="right" />
@@ -138,7 +139,7 @@ const handleTagName = (tag) => {
   .form-row {
     display: flex;
     align-items: center;
-    justify-content: space-between;
+    justify-content: start;
     margin-bottom: 18px;
     .el-form-item {
       margin: 0;

package/packages/VarietySearch/config.js

@@ -37,7 +37,9 @@ export default {
   // 因子筛选
   factorScreen: {
     show: true,
+    cycleDefault: null,
     cycleOptions: [],
+    cycleShow: true,
     factorOptions: [],
   },
   // 常用指标

package/src/pages/VarietySearch/index.vue

@@ -35,10 +35,12 @@ const varietySearchConfig = ref({
   // 因子筛选
   factorScreen: {
     show: true,
+    // cycleDefault: 1,
     cycleOptions: [
       { label: "周期一", value: 1 },
       { label: "周期二", value: 2 },
     ],
+    // cycleShow: true,
     factorOptions: [
       { label: "因子一", value: 1 },
       { label: "因子二", value: 2 },