st-comp 0.0.190 → 0.0.192

package/package.json

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

package/packages/CustomFunction/index.vue

@@ -148,16 +148,17 @@ watch(
         :key="item.id"
         :label="item.funcName"
         :value="item.funcName"
+        @click="handleInsert"
       >
         <div class="func-option">
           <span>{{ item.funcName }}</span>
           <div class="icons">
-            <el-icon @click.stop="handleAddOrEdit(item)">
-              <Edit />
-            </el-icon>
             <el-icon @click.stop="handleAddOrEdit(item, true)">
               <DocumentCopy />
             </el-icon>
+            <el-icon @click.stop="handleAddOrEdit(item)">
+              <Edit />
+            </el-icon>
             <el-popconfirm
               :title="`确认是否删除?`"
               confirm-button-text="确认"

package/packages/User/index.vue

@@ -48,6 +48,9 @@ const setPasswordCallBack = () => {
         </div>
         <template #dropdown>
           <el-dropdown-menu>
+            <!-- 自定义菜单项插槽 -->
+            <slot name="dropdown-items"></slot>
+            
             <el-dropdown-item
               v-if="userData.canSet"
               @click="SetPasswordDialogRef?.open()"
@@ -107,4 +110,4 @@ const setPasswordCallBack = () => {
     }
   }
 }
-</style>
+</style>

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

@@ -32,7 +32,7 @@ const stVarSelectDialogRef = ref();
 // 弹窗开关
 const visible = ref(false);
 const visibleDescriptions = ref(false);
-const factorType = ref("模版");
+const factorType = ref("脚本");
 // 弹窗表单
 const dialogFormRef = ref(null);
 const dialogForm = ref({
@@ -52,16 +52,6 @@ const dialogForm = ref({
   factorSelectExpr: "",
 });
 
-watch(
-  () => [factorType.value, visible.value],
-  () => {
-    if (factorType.value === "模版" || visible.value === false) {
-      stVarSelectDialogRef.value.close();
-    }
-  },
-  { deep: true }
-);
-
 // 打开
 const handleOpenDialog = () => {
   const { list, sqlEnable, sqlValue, factorSelectExpr } = data.value;
@@ -74,12 +64,12 @@ const handleOpenDialog = () => {
   // 保证因子筛选最少一条
   if (!dialogForm.value.list.length) handleAppendFactor();
   visible.value = true;
-  // 解决初次访问样式错乱问题
+  // 解决刚打开时, 如果是脚本的样式错乱问题
   nextTick(() => {
     if (factorSelectExpr) {
       factorType.value = "脚本";
       monacoEditorRef.value.setValue(factorSelectExpr);
-    } else factorType.value = "模版";
+    }
     monacoEditorRef.value.resize();
   });
 };
@@ -295,6 +285,16 @@ const handleInsertCustomFunction = (value) => {
     editorIns.focus();
   }
 };
+
+watch(
+  () => [factorType.value, visible.value],
+  () => {
+    if (factorType.value === "模版" || visible.value === false) {
+      stVarSelectDialogRef.value.close();
+    }
+  },
+  { deep: true }
+);
 </script>
 
 <template>

package/src/pages/User/index.vue

@@ -1,20 +1,24 @@
 <template>
-  <div style="width: 100%;height: 100%;">
-    <st-user :config="config" @loginout="loginoutFn" />
+  <div style="width: 100%; height: 100%">
+    <st-user
+      :config="config"
+      @loginout="loginoutFn"
+    >
+      <template #dropdown-items>
+        <el-dropdown-item>自定义菜单项</el-dropdown-item>
+      </template>
+    </st-user>
   </div>
 </template>
 
 <script setup lang="ts">
-
 const config = {
   loginoutToLogin: false,
-}
+};
 
 const loginoutFn = () => {
-  location.reload()
-}
+  location.reload();
+};
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>