st-comp 0.0.173 → 0.0.175

package/package.json

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

package/packages/VarSelectDialog/index.vue

@@ -239,9 +239,13 @@ defineExpose({
           <!-- Tip示例 -->
           <el-tooltip
             effect="dark"
-            :content="formatItem.tip"
             placement="top-start"
           >
+            <template #content>
+              <div style="max-width: 820px;">
+                <span style="white-space: pre-line">{{ formatItem.tip }}</span>
+              </div>
+            </template>
             <el-icon><InfoFilled /></el-icon>
           </el-tooltip>
         </div>

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

@@ -1,7 +1,7 @@
 <!-- 因子筛选组件 -->
 <script setup name="FactorScreen">
 import { nextTick, ref, watch } from "vue";
-import { Plus, CircleCloseFilled, InfoFilled } from "@element-plus/icons-vue";
+import { Close, Plus, CircleCloseFilled, InfoFilled } from "@element-plus/icons-vue";
 import { handleVerifyScore, extractConditionDetails } from "./tools.js";
 import FactorDescription from "./FactorDescription.vue";
 import MonacoEditor from "../../../MonacoEditor/index.vue";
@@ -224,12 +224,18 @@ const handleDeleteTag = (aciton, index) => {
       break;
     }
     case "scriptTag": {
-      data.value = {
-        list: [],
-        sqlEnable: 0,
-        sqlValue: null,
-        factorSelectExpr: "",
-      };
+      ElMessageBox.confirm("是否确认删除因子筛选: 脚本模式", "删除操作", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        data.value = {
+          list: [],
+          sqlEnable: 0,
+          sqlValue: null,
+          factorSelectExpr: "",
+        };
+      });
       break;
     }
   }
@@ -313,280 +319,285 @@ const open = () => {
       width="1000"
       align-center
       destroy-on-close
+      :show-close="false"
     >
       <template #header="{ titleId, titleClass }">
         <div class="custom-header">
-          <span
-            :id="titleId"
-            :class="titleClass"
-          >
-            因子筛选
-          </span>
-          <el-tooltip
-            effect="dark"
-            content="点击查看: 因子使用说明"
-            placement="right"
-          >
-            <el-icon @click="visibleDescriptions = true"><InfoFilled /></el-icon>
-          </el-tooltip>
-          <el-radio-group
-            v-model="factorType"
-            size="small"
-            style="margin-left: 12px"
-          >
-            <el-radio-button
-              label="模版"
-              value="模版"
-            />
-            <el-radio-button
-              label="脚本"
-              value="脚本"
-            />
-          </el-radio-group>
-          <!-- 变量选择器 -->
-          <div
-            style="flex: 1; text-align: right"
-            v-if="factorType === '脚本'"
-          >
+          <div class="left">
+            <span
+              :id="titleId"
+              :class="titleClass"
+            >
+              因子筛选
+            </span>
+            <el-tooltip
+              effect="dark"
+              content="点击查看: 因子使用说明"
+              placement="right"
+            >
+              <el-icon @click="visibleDescriptions = true"><InfoFilled /></el-icon>
+            </el-tooltip>
+            <el-radio-group
+              v-model="factorType"
+              size="small"
+            >
+              <el-radio-button
+                label="模版"
+                value="模版"
+              />
+              <el-radio-button
+                label="脚本"
+                value="脚本"
+              />
+            </el-radio-group>
+          </div>
+          <!-- 变量选择器 + 关闭 -->
+          <div class="right">
             <el-button
+              v-if="factorType === '脚本'"
               size="small"
               type="primary"
               @click="open"
               >变量选择器</el-button
             >
+            <el-icon @click="visible = false"><Close /></el-icon>
           </div>
         </div>
       </template>
       <!-- 模版模式 -->
-      <el-form
+      <el-scrollbar
         v-if="factorType === '模版'"
-        ref="dialogFormRef"
-        :model="dialogForm"
+        height="400px"
       >
-        <!-- 因子筛选表格 -->
-        <div
-          v-for="(item, index) in dialogForm.list"
-          class="form-row"
+        <el-form
+          ref="dialogFormRef"
+          :model="dialogForm"
         >
-          <!-- 序列号 -->
-          <span class="index">{{ `条件${index + 1}` }}</span>
-          <!-- 对比因子: 分值因子 -->
-          <template v-if="item.key === 'compare'">
-            <!-- 周期 -->
-            <el-form-item
-              v-if="config.cycleShow"
-              :prop="'list.' + index + '.cycle'"
-              :rules="{ required: true, message: '周期不能为空', trigger: 'blur' }"
-              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"
-                />
-              </el-select>
-            </el-form-item>
-            <!-- 因子 -->
-            <el-form-item
-              :prop="'list.' + index + '.factor'"
-              :rules="{ required: true, message: '因子不能为空', trigger: 'blur' }"
-              style="width: 132px; margin-right: 10px"
-            >
-              <el-select
-                v-model="item.factor"
-                placeholder="选择因子"
-                filterable
-                size="small"
-                no-match-text="无匹配数据"
+          <!-- 因子筛选表格 -->
+          <div
+            v-for="(item, index) in dialogForm.list"
+            class="form-row"
+          >
+            <!-- 序列号 -->
+            <span class="index">{{ `条件${index + 1}` }}</span>
+            <!-- 对比因子: 分值因子 -->
+            <template v-if="item.key === 'compare'">
+              <!-- 周期 -->
+              <el-form-item
+                v-if="config.cycleShow"
+                :prop="'list.' + index + '.cycle'"
+                :rules="{ required: true, message: '周期不能为空', trigger: 'blur' }"
+                style="width: 100px; margin-right: 10px"
               >
-                <el-option
-                  v-for="{ label, value } in config.factorOptions?.filter((item) => [4].includes(item.type))"
-                  :label="label"
-                  :value="value"
-                  :key="value"
-                />
-              </el-select>
-            </el-form-item>
-            <!-- 对比符 -->
-            <el-form-item style="width: 52px; margin-right: 10px">
-              <el-select
-                v-model="item.compareType"
-                size="small"
+                <el-select
+                  v-model="item.cycle"
+                  placeholder="选择周期"
+                  size="small"
+                >
+                  <el-option
+                    v-for="{ label, value } in config.cycleOptions"
+                    :label="label"
+                    :value="value"
+                    :key="value"
+                  />
+                </el-select>
+              </el-form-item>
+              <!-- 因子 -->
+              <el-form-item
+                :prop="'list.' + index + '.factor'"
+                :rules="{ required: true, message: '因子不能为空', trigger: 'blur' }"
+                style="width: 132px; margin-right: 10px"
               >
-                <el-option
-                  v-for="item in ['>', '>=', '<', '<=']"
-                  :label="item"
-                  :value="item"
-                  :key="item"
-                />
-              </el-select>
-            </el-form-item>
-            <!-- 周期2 -->
-            <el-form-item
-              v-if="config.cycleShow"
-              :prop="'list.' + index + '.cycle2'"
-              :rules="{ required: true, message: '周期不能为空', trigger: 'blur' }"
-              style="width: 100px; margin-right: 10px"
-            >
-              <el-select
-                v-model="item.cycle2"
-                placeholder="选择周期"
-                size="small"
+                <el-select
+                  v-model="item.factor"
+                  placeholder="选择因子"
+                  filterable
+                  size="small"
+                  no-match-text="无匹配数据"
+                >
+                  <el-option
+                    v-for="{ label, value } in config.factorOptions?.filter((item) => [4].includes(item.type))"
+                    :label="label"
+                    :value="value"
+                    :key="value"
+                  />
+                </el-select>
+              </el-form-item>
+              <!-- 对比符 -->
+              <el-form-item style="width: 52px; margin-right: 10px">
+                <el-select
+                  v-model="item.compareType"
+                  size="small"
+                >
+                  <el-option
+                    v-for="item in ['>', '>=', '<', '<=']"
+                    :label="item"
+                    :value="item"
+                    :key="item"
+                  />
+                </el-select>
+              </el-form-item>
+              <!-- 周期2 -->
+              <el-form-item
+                v-if="config.cycleShow"
+                :prop="'list.' + index + '.cycle2'"
+                :rules="{ required: true, message: '周期不能为空', trigger: 'blur' }"
+                style="width: 100px; margin-right: 10px"
               >
-                <el-option
-                  v-for="{ label, value } in config.cycleOptions"
-                  :label="label"
-                  :value="value"
-                  :key="value"
-                />
-              </el-select>
-            </el-form-item>
-            <!-- 因子2 -->
-            <el-form-item
-              :prop="'list.' + index + '.factor2'"
-              :rules="{ required: true, message: '因子不能为空', trigger: 'blur' }"
-              style="width: 132px; margin-right: 10px"
-            >
-              <el-select
-                v-model="item.factor2"
-                placeholder="选择因子"
-                filterable
-                size="small"
-                no-match-text="无匹配数据"
+                <el-select
+                  v-model="item.cycle2"
+                  placeholder="选择周期"
+                  size="small"
+                >
+                  <el-option
+                    v-for="{ label, value } in config.cycleOptions"
+                    :label="label"
+                    :value="value"
+                    :key="value"
+                  />
+                </el-select>
+              </el-form-item>
+              <!-- 因子2 -->
+              <el-form-item
+                :prop="'list.' + index + '.factor2'"
+                :rules="{ required: true, message: '因子不能为空', trigger: 'blur' }"
+                style="width: 132px; margin-right: 10px"
               >
-                <el-option
-                  v-for="{ label, value } in config.factorOptions?.filter((item) => [4].includes(item.type))"
-                  :label="label"
-                  :value="value"
-                  :key="value"
-                />
-              </el-select>
-            </el-form-item>
-          </template>
-          <!-- 常规因子: 机器打分, 人工打分因子 -->
-          <template v-else>
-            <!-- 周期 -->
-            <el-form-item
-              v-if="config.cycleShow"
-              :prop="'list.' + index + '.cycle'"
-              :rules="{ required: true, message: '周期不能为空', trigger: 'blur' }"
-              style="width: 100px; margin-right: 10px"
-            >
-              <el-select
-                v-model="item.cycle"
-                placeholder="选择周期"
-                size="small"
+                <el-select
+                  v-model="item.factor2"
+                  placeholder="选择因子"
+                  filterable
+                  size="small"
+                  no-match-text="无匹配数据"
+                >
+                  <el-option
+                    v-for="{ label, value } in config.factorOptions?.filter((item) => [4].includes(item.type))"
+                    :label="label"
+                    :value="value"
+                    :key="value"
+                  />
+                </el-select>
+              </el-form-item>
+            </template>
+            <!-- 常规因子: 机器打分, 人工打分因子 -->
+            <template v-else>
+              <!-- 周期 -->
+              <el-form-item
+                v-if="config.cycleShow"
+                :prop="'list.' + index + '.cycle'"
+                :rules="{ required: true, message: '周期不能为空', trigger: 'blur' }"
+                style="width: 100px; margin-right: 10px"
               >
-                <el-option
-                  v-for="{ label, value } in config.cycleOptions"
-                  :label="label"
-                  :value="value"
-                  :key="value"
-                />
-              </el-select>
-            </el-form-item>
-            <!-- 因子 -->
-            <el-form-item
-              :prop="'list.' + index + '.factor'"
-              :rules="{ required: true, message: '因子不能为空', trigger: 'blur' }"
-              style="width: 194px; margin-right: 10px"
-            >
-              <el-select
-                v-model="item.factor"
-                placeholder="选择因子"
-                filterable
-                size="small"
-                no-match-text="无匹配数据"
+                <el-select
+                  v-model="item.cycle"
+                  placeholder="选择周期"
+                  size="small"
+                >
+                  <el-option
+                    v-for="{ label, value } in config.cycleOptions"
+                    :label="label"
+                    :value="value"
+                    :key="value"
+                  />
+                </el-select>
+              </el-form-item>
+              <!-- 因子 -->
+              <el-form-item
+                :prop="'list.' + index + '.factor'"
+                :rules="{ required: true, message: '因子不能为空', trigger: 'blur' }"
+                style="width: 194px; margin-right: 10px"
               >
-                <el-option
-                  v-for="{ label, value } in config.factorOptions?.filter((item) => [1, 3].includes(item.type))"
-                  :label="label"
-                  :value="value"
-                  :key="value"
-                />
-              </el-select>
-            </el-form-item>
-            <!-- 分数 -->
-            <el-form-item
-              :prop="'list.' + index + '.score'"
-              :rules="{ validator: handleVerifyScore, trigger: 'blur' }"
-              style="width: 200px; margin-right: 10px"
-            >
-              <div style="display: flex; align-items: center; width: 100%; height: 24px">
-                <el-input-number
-                  v-model="item.score[0]"
+                <el-select
+                  v-model="item.factor"
+                  placeholder="选择因子"
+                  filterable
                   size="small"
-                  controls-position="right"
+                  no-match-text="无匹配数据"
+                >
+                  <el-option
+                    v-for="{ label, value } in config.factorOptions?.filter((item) => [1, 3].includes(item.type))"
+                    :label="label"
+                    :value="value"
+                    :key="value"
+                  />
+                </el-select>
+              </el-form-item>
+              <!-- 分数 -->
+              <el-form-item
+                :prop="'list.' + index + '.score'"
+                :rules="{ validator: handleVerifyScore, trigger: 'blur' }"
+                style="width: 200px; margin-right: 10px"
+              >
+                <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"
+                  />
+                </div>
+              </el-form-item>
+            </template>
+            <!-- 删除 -->
+            <el-icon @click="handleDeleteFactor(index)"><CircleCloseFilled /></el-icon>
+          </div>
+          <el-button
+            type="primary"
+            plain
+            size="small"
+            :icon="Plus"
+            @click="handleAppendFactor"
+            style="margin-bottom: 10px"
+            >添加因子</el-button
+          >
+          <el-button
+            type="primary"
+            plain
+            size="small"
+            :icon="Plus"
+            @click="handleAppendFactor('compare')"
+            style="margin-bottom: 10px"
+            >添加因子对比</el-button
+          >
+          <!-- SQL功能 -->
+          <template v-if="config.sqlShow">
+            <el-form-item label="SQL功能: ">
+              <el-radio-group v-model="dialogForm.sqlEnable">
+                <el-radio
+                  label="关闭"
+                  :value="0"
                 />
-                <span>~</span>
-                <el-input-number
-                  v-model="item.score[1]"
-                  size="small"
-                  controls-position="right"
+                <el-radio
+                  label="启用"
+                  :value="1"
                 />
-              </div>
+              </el-radio-group>
+              <el-button
+                v-if="dialogForm.sqlEnable"
+                type="primary"
+                size="small"
+                @click="handleGenerateSql"
+                style="margin-left: auto"
+                >生成SQL</el-button
+              >
             </el-form-item>
-          </template>
-          <!-- 删除 -->
-          <el-icon @click="handleDeleteFactor(index)"><CircleCloseFilled /></el-icon>
-        </div>
-        <el-button
-          type="primary"
-          plain
-          size="small"
-          :icon="Plus"
-          @click="handleAppendFactor"
-          style="margin-bottom: 10px"
-          >添加因子</el-button
-        >
-        <el-button
-          type="primary"
-          plain
-          size="small"
-          :icon="Plus"
-          @click="handleAppendFactor('compare')"
-          style="margin-bottom: 10px"
-          >添加因子对比</el-button
-        >
-        <!-- SQL功能 -->
-        <template v-if="config.sqlShow">
-          <el-form-item label="SQL功能: ">
-            <el-radio-group v-model="dialogForm.sqlEnable">
-              <el-radio
-                label="关闭"
-                :value="0"
-              />
-              <el-radio
-                label="启用"
-                :value="1"
+            <template v-if="dialogForm.sqlEnable">
+              <el-input
+                v-model="dialogForm.sqlValue"
+                :autosize="{ minRows: 4 }"
+                type="textarea"
+                style="margin-bottom: 10px"
               />
-            </el-radio-group>
-            <el-button
-              v-if="dialogForm.sqlEnable"
-              type="primary"
-              size="small"
-              @click="handleGenerateSql"
-              style="margin-left: auto"
-              >生成SQL</el-button
-            >
-          </el-form-item>
-          <template v-if="dialogForm.sqlEnable">
-            <el-input
-              v-model="dialogForm.sqlValue"
-              :autosize="{ minRows: 4 }"
-              type="textarea"
-              style="margin-bottom: 10px"
-            />
-            <span>&&代表and，||代表or</span>
+              <span>&&代表and，||代表or</span>
+            </template>
           </template>
-        </template>
-      </el-form>
+        </el-form>
+      </el-scrollbar>
       <!-- 脚本模式 -->
       <div
         style="width: 968px; height: 400px"
@@ -626,8 +637,14 @@ const open = () => {
   .custom-header {
     display: flex;
     align-items: center;
+    justify-content: space-between;
+    .left,
+    .right {
+      display: flex;
+      align-items: center;
+      gap: 10px;
+    }
     .el-icon {
-      margin-left: 4px;
       cursor: pointer;
     }
   }

package/es/el-checkbox-group-020b49f5.cjs

@@ -1 +0,0 @@
-"use strict";const e=require("vue"),n=require("./base-bdc10baa.cjs"),m=require("./use-form-common-props-592797e2.cjs"),y=n.buildProps({type:{type:String,values:["primary","success","info","warning","danger",""],default:""},size:{type:String,values:m.componentSizes,default:""},truncated:Boolean,lineClamp:{type:[String,Number]},tag:{type:String,default:"span"}}),C=e.defineComponent({name:"ElText"}),b=e.defineComponent({...C,props:y,setup(v){const s=v,t=e.ref(),_=m.useFormSize(),o=n.useNamespace("text"),h=e.computed(()=>[o.b(),o.m(s.type),o.m(_.value),o.is("truncated",s.truncated),o.is("line-clamp",!n.isUndefined(s.lineClamp))]),x=e.useAttrs().title,c=()=>{var l,a,d,p,f;if(x)return;let u=!1;const g=((l=t.value)==null?void 0:l.textContent)||"";if(s.truncated){const i=(a=t.value)==null?void 0:a.offsetWidth,r=(d=t.value)==null?void 0:d.scrollWidth;i&&r&&r>i&&(u=!0)}else if(!n.isUndefined(s.lineClamp)){const i=(p=t.value)==null?void 0:p.offsetHeight,r=(f=t.value)==null?void 0:f.scrollHeight;i&&r&&r>i&&(u=!0)}u?t.value.setAttribute("title",g):t.value.removeAttribute("title")};return e.onMounted(c),e.onUpdated(c),(l,a)=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(l.tag),{ref_key:"textRef",ref:t,class:e.normalizeClass(e.unref(h)),style:e.normalizeStyle({"-webkit-line-clamp":l.lineClamp})},{default:e.withCtx(()=>[e.renderSlot(l.$slots,"default")]),_:3},8,["class","style"]))}});var S=n._export_sfc(b,[["__file","text.vue"]]);const T=n.withInstall(S);exports.ElText=T;