st-comp 0.0.150 → 0.0.152

package/package.json

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

package/packages/PasswordPrompt/index.vue

@@ -133,6 +133,7 @@ const levelText = computed(() => {
 
 defineExpose({
   pwdValidators,
+  levelValue,
   // 提供给表单校验使用
   ruleFormPassword: [
     { required: true, trigger: "blur", message: "密码不能为空" },

package/packages/User/index.vue

@@ -37,6 +37,7 @@
         ref="changePasswordFormRef"
         :model="changePasswordForm"
         :rules="changePasswordRules"
+        :validate-on-rule-change="false"
         @submit.native.prevent="changePasswordFn"
         @keyup.enter.native="changePasswordFn"
         label-width="auto"
@@ -125,10 +126,7 @@ const changePasswordForm = ref({
   confirmPassword: "",
 });
 const changePasswordRules = ref({
-  oldPassword: [
-    { required: true, message: "请输入原密码", trigger: "blur" },
-    { min: 6, max: 18, trigger: "blur", message: "密码长度为6到18位" },
-  ],
+  oldPassword: [{ required: true, message: "请输入原密码", trigger: "blur" }],
   newPassword: [],
   confirmPassword: [
     { required: true, message: "请输入确认密码", trigger: "blur" },
@@ -144,7 +142,6 @@ const changePasswordRules = ref({
       },
       trigger: "blur",
     },
-    { min: 6, max: 18, trigger: "blur", message: "密码长度为6到18位" },
   ],
 });
 const isFocusNewPassword = ref(false); // 是否聚焦新密码
@@ -176,11 +173,6 @@ const changePasswordDialogOpen = () => {
   if (changePasswordRules.value.newPassword.length === 0) {
     nextTick(() => {
       changePasswordRules.value.newPassword = PasswordPromptRef.value?.ruleFormPassword;
-      // 宏任务清除element-plus表单规则调整后的自动校验
-      let timer = setTimeout(() => {
-        changePasswordFormRef.value.resetFields();
-        clearTimeout(timer);
-      }, 0);
     });
   }
 };

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

@@ -2,6 +2,14 @@
 <script setup name="CommonIndicator">
 import { ref, watch, computed } from "vue";
 
+const perVolumnRadioOptions = [
+  { label: '近2周', value: 'last2WeekVolumn' },
+  { label: '近1个月', value: 'last1MonthVolumn' },
+  { label: '近3个月', value: 'last3MonthVolumn' },
+  { label: '近6个月', value: 'last6MonthVolumn' },
+  { label: '近1年', value: 'last12MonthVolumn' },
+]
+
 const data = defineModel("data", { default: [] });
 const props = defineProps({
   config: { type: Object, default: () => {} },
@@ -85,6 +93,24 @@ const clickIndicator = (item) => {
       };
       break;
     }
+    // 成交量
+    case "perVolumn": {
+      indicatorValue.value = {
+        ...baseParams,
+        radio: 'last12MonthVolumn',
+        levels: [],
+      };
+      break;
+    }
+    // 主力净流入资金
+    case "mainFlow": {
+      indicatorValue.value = {
+        ...baseParams,
+        mainFlowRadioType: '0',
+        rankRange: [null, null],
+      };
+      break;
+    }
     // 其它的通用处理
     default: {
       indicatorValue.value = {
@@ -149,6 +175,39 @@ const submitDialog = () => {
       indicatorValue.value.tagText = `${label}: ${optionsCpType === 1 ? "看涨" : "看跌"}`;
       break;
     }
+    // 成交量
+    case "perVolumn": {
+      const { label, radio, levels } = indicatorValue.value;
+      // 校验
+      if (!levels?.length) return ElMessage.warning("格式错误: 请选择分位");
+      // 格式化文案
+      indicatorValue.value.tagText = `${label}: ${
+        perVolumnRadioOptions.find(item => item.value === radio)?.label
+      }${
+        levels.map(i => `${i}分位`).join('、')
+      }`;
+      break;
+    }
+    // 主力净流入资金
+    case "mainFlow": {
+      const { label, mainFlowRadioType, radio, rankRange } = indicatorValue.value;
+      const checkNumber = (val) => {
+        if (val === '' || val === null || val === undefined) return false;
+        const num = Number(val)
+        if (isNaN(num)) return false;
+        return true
+      }
+      // 校验
+      if (!radio) return ElMessage.warning("格式错误: 请选择时间");
+      if (!checkNumber(rankRange[0]) || !checkNumber(rankRange[1])) {
+        return ElMessage.warning(`格式错误: 请填写${mainFlowRadioType === '0' ? '涨幅范围' : '排名范围'}`);
+      }
+      // 格式化文案
+      indicatorValue.value.tagText = `${label}: ${radio}日${
+        mainFlowRadioType === '0' ? '涨幅范围' : '排名范围'
+      }: ${rankRange[0]}${mainFlowRadioType === '0' ? '%' : ''} ~ ${rankRange[1]}${mainFlowRadioType === '0' ? '%' : ''}`;
+      break;
+    }
     // 其它的通用处理
     default: {
       const { label, unit, radioType } = indicatorValue.value;
@@ -257,6 +316,11 @@ watch(
     }
   }
 );
+
+const changeMainFlowRadioType = () => {
+  indicatorValue.value.radio = null;
+  indicatorValue.value.rankRange = [null, null];
+}
 </script>
 
 <template>
@@ -315,6 +379,17 @@ watch(
           <el-radio-button :disabled="rankKey && rankKey !== nowIndicator.key" label="排名" value="1" />
         </el-radio-group>
       </template>
+      <template #header v-else-if="nowIndicator.key === 'mainFlow'">
+        <span style="font-size: 18px;">{{ nowIndicator.label }}</span>
+        <el-radio-group
+          v-model="indicatorValue.mainFlowRadioType"
+          style="vertical-align: 4px; margin-left: 12px;"
+          @change="changeMainFlowRadioType"
+        >
+          <el-radio-button label="涨幅范围" value="0" />
+          <el-radio-button label="排名范围" value="1" />
+        </el-radio-group>
+      </template>
       
       <template v-if="nowIndicator.type === undefined && indicatorValue.radioType === '1'">
         <!-- 输入框区域 -->
@@ -336,7 +411,7 @@ watch(
         <!-- 便捷配置项区域 -->
         <div
           class="convenient-option-box"
-          v-if="nowIndicator.convenientOptions.length"
+          v-if="nowIndicator.convenientOptions?.length"
         >
           <el-button
             v-for="item in nowIndicator.convenientOptions"
@@ -491,6 +566,51 @@ watch(
             />
           </el-radio-group>
         </div>
+        <!-- 成交量 -->
+        <div v-if="nowIndicator.key === 'perVolumn'">
+          <el-radio-group v-model="indicatorValue.radio">
+            <el-radio
+              v-for="item in perVolumnRadioOptions"
+              :key="item.value"
+              :value="item.value"
+            >{{ item.label }}</el-radio>
+          </el-radio-group>
+          <el-select
+            v-model="indicatorValue.levels"
+            multiple
+            clearable
+            placeholder="请选择"
+            style="width: 420px"
+          >
+            <el-option
+              v-for="item in [1, 2, 3, 4, 5]"
+              :key="item"
+              :label="`${item}分位`"
+              :value="item"
+            />
+          </el-select>
+        </div>
+        <!-- 主力净流入资金 -->
+        <div v-if="nowIndicator.key === 'mainFlow'">
+          <el-radio-group v-model="indicatorValue.radio">
+            <el-radio value="3">3日</el-radio>
+            <el-radio value="5">5日</el-radio>
+            <el-radio value="10">10日</el-radio>
+            <el-radio value="20">20日</el-radio>
+          </el-radio-group>
+          <div style="display: flex; align-items: center;">
+            <span>{{ indicatorValue.mainFlowRadioType === '0' ? '涨幅范围' : '排名范围' }}:&nbsp;</span>
+            <el-input
+              v-model="indicatorValue.rankRange[0]"
+              style="flex: 1"
+            />
+            ~
+            <el-input
+              v-model="indicatorValue.rankRange[1]"
+              style="flex: 1"
+            />
+          </div>
+        </div>
       </template>
       <!-- 确定 -->
       <template #footer>

package/packages/VarietySearch/config.js

@@ -295,6 +295,16 @@ export default {
         // 默认数值
         defaultRankRange: [0, 25],
       },
+      // 成交量
+      {
+        key: "perVolumn",
+        label: "成交量",
+        type: "custom",
+        parent: {
+          varietyMarketIds: [3, 5, 7],
+          commonOptionIds: [4, 6, 12, 14, 15, 16],
+        },
+      },
       // 净资产收益率roe
       {
         key: "roe",
@@ -367,6 +377,16 @@ export default {
         },
         type: "custom",
       },
+      // 主力净流入资金
+      {
+        key: "mainFlow",
+        label: "主力净流入资金",
+        type: "custom",
+        parent: {
+          varietyMarketIds: [3, 5, 7],
+          commonOptionIds: [4, 6, 12, 14, 15, 16],
+        },
+      },
 
       // ----------期权-----------
 
@@ -469,7 +489,7 @@ export default {
       // 成交量
       {
         key: "volume",
-        label: "成交量",
+        label: "成交量(期权)",
         parent: {
           varietyMarketIds: [8],
           commonOptionIds: [11],

package/packages/VarietySearch/index.vue

@@ -266,7 +266,7 @@ defineExpose({
       const QIQUANKYES = ["expireDays", "virtualRealDegree", "yearProfitRate", "impliedVolatility", "levelMultiplier", "turnover", "volume", "openInterest", "optionsCpType", "optionGear"];
       // 1.常用指标-基本面(type:undefined的指标, 且[期权]的常用指标不计入基本面)
       const query = data.commonIndicator.reduce((result, item) => {
-        const { key, type, range, unit, radioType, rankRange } = item;
+        const { key, type, range, unit, radioType, mainFlowRadioType, radio, rankRange } = item;
         // 排名模式
         if (radioType === "1") {
           params.sortBy = {
@@ -286,6 +286,12 @@ defineExpose({
             end,
           });
         }
+        // 主力净流入资金
+        else if (key === 'mainFlow') {
+          let [start, end] = rankRange;
+          let column = mainFlowRadioType === '0' ? `netInfow${radio}d` : `last${radio}DayMianFlowRank`
+          result.push({ column, start, end });
+        }
         // 其它基本面指标
         else if (type === undefined && !QIQUANKYES.includes(key)) {
           let [start, end] = range;
@@ -402,6 +408,14 @@ defineExpose({
             break;
         }
       });
+      // 7.常用指标-成交量
+      const perVolumnIndicator = data.commonIndicator.find(({ key }) => key === "perVolumn");
+      if (perVolumnIndicator) {
+        params.perVolumn = {
+          type: perVolumnIndicator.radio,
+          value: perVolumnIndicator.levels,
+        };
+      }
       if (Object.keys(searchOptionDto).length) {
         params.searchOptionDto = {
           ...params.searchOptionDto,

package/src/pages/PasswordPrompt/index.vue

@@ -1,12 +1,12 @@
-<template>
-  <div>
-    PasswordPrompt
-  </div>
-</template>
-
-<script setup lang="ts">
-</script>
-
-<style lang="scss" scoped>
-
-</style>
+<template>
+  <div>
+    PasswordPrompt
+  </div>
+</template>
+
+<script setup lang="ts">
+</script>
+
+<style lang="scss" scoped>
+
+</style>

package/es/index-ce3223db.cjs

@@ -1 +0,0 @@
-"use strict";require("./base-0ca7c43a.cjs");const e=require("vue"),f=require("./index-afc88a4b.cjs"),h=require("./_plugin-vue_export-helper-f246444f.cjs");const g={key:0,class:"rule-box"},x={key:0,class:"level-box"},V={class:"level-color"},C={class:"level-text"},w={__name:"index",props:{value:{type:String,default:""},isFocus:{type:Boolean,default:!1},textColor:{type:[String,null],default:null}},setup(n,{expose:m}){const v=n,u=[{text:"不能包含空格",validator:t=>!/\s/.test(t)},{text:"长度为8-18个字符",validator:t=>t.length>=8&&t.length<=18},{text:"必须包含字母、数字、符号中至少2种",validator:t=>{const l=/[a-zA-Z]/.test(t),o=/\d/.test(t),r=/[^a-zA-Z0-9]/.test(t);return[l,o,r].filter(Boolean).length>=2}},{text:"请勿输入连续、重复6位以上字母或数字, 0123456, 1111111",validator:t=>{if(/([a-zA-Z0-9])\1{6,}/.test(t)||/(?:0123456|1234567|2345678|3456789|9876543|8765432|7654321|6543210)/.test(t))return!1;const r=t.toLowerCase(),d=s=>{if(!/^[a-z]+$/.test(s))return!1;for(let a=1;a<s.length;a++)if(s.charCodeAt(a)!==s.charCodeAt(a-1)+1)return!1;return!0};for(let s=0;s<=r.length-7;s++){const a=r.substr(s,7);if(d(a))return!1}return!0}}],p=e.computed(()=>!u.map(l=>l.validator(v.value)).includes(!1)),c=e.computed(()=>{const t=v.value;if(!t)return 0;let l=0;return t.length>=8&&l++,t.length>=12&&l++,/\d/.test(t)&&l++,/[a-z]/.test(t)&&l++,/[A-Z]/.test(t)&&l++,/[^a-zA-Z0-9]/.test(t)&&l++,l<=2?1:l<=4?2:3}),i=e.computed(()=>{switch(c.value){case 1:return"lv1";case 2:return"lv2";case 3:return"lv3";default:return""}}),_=e.computed(()=>{switch(c.value){case 1:return"弱";case 2:return"中";case 3:return"强";default:return""}});return m({pwdValidators:u,ruleFormPassword:[{required:!0,trigger:"blur",message:"密码不能为空"},...u.map(t=>({trigger:"blur",validator:(l,o,r)=>{t.validator(o)?r():r(t.text)}}))]}),(t,l)=>{const o=f.ElIcon;return e.openBlock(),e.createElementBlock("div",{class:"password-prompt",style:e.normalizeStyle({color:n.textColor??"var(--el-color-info)"})},[e.createVNode(e.Transition,{name:"slide-down"},{default:e.withCtx(()=>[n.isFocus?(e.openBlock(),e.createElementBlock("div",g,[(e.openBlock(),e.createElementBlock(e.Fragment,null,e.renderList(u,(r,d)=>e.createElementVNode("div",{class:"rule-item",key:d},[e.withDirectives(e.createVNode(o,null,{default:e.withCtx(()=>[e.createVNode(e.unref(f.circle_check_default))]),_:2},1536),[[e.vShow,r.validator(n.value)]]),e.createElementVNode("span",null,e.toDisplayString(r.text),1)])),64))])):e.createCommentVNode("",!0)]),_:1}),!n.isFocus&&p.value?(e.openBlock(),e.createElementBlock("div",x,[e.createElementVNode("div",V,[e.createElementVNode("div",{class:e.normalizeClass(["levelValue-block",[c.value>=1?i.value:""]])},null,2),e.createElementVNode("div",{class:e.normalizeClass(["levelValue-block",[c.value>=2?i.value:""]])},null,2),e.createElementVNode("div",{class:e.normalizeClass(["levelValue-block",[c.value>=3?i.value:""]])},null,2)]),e.createElementVNode("div",C,"密码强度: "+e.toDisplayString(_.value),1)])):e.createCommentVNode("",!0)],4)}}},N=h._export_sfc(w,[["__scopeId","data-v-b9fee9dd"]]);exports.PasswordPrompt=N;