@yxhl/specter-pui-vtk 1.0.71 → 1.0.73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yxhl/specter-pui-vtk",
-  "version": "1.0.71",
+  "version": "1.0.73",
   "description": "雅心互联 Vue 3 + Vuetify3 组件库",
   "type": "module",
   "main": "./dist/specter-pui.umd.js",

package/src/commons/filters/dictionary.js

@@ -1,73 +1,75 @@
-/**
- * 将数值转换成中文 '0:未启/1:已启'
- *
- * @param {*} val 数值
- * @param {*} map 值对
- * @return {string} 中文值
- */
-export function dict(val, map) {
-    let value = "";
-    if (val && val.includes(",")) {
-        value = val.split(",").map(item => pre(item, map)).join();
-    } else {
-        value = pre(val, map);
-    }
-    return value;
-}
-
-function pre(value, map) {
-    if (value) {
-        var val = Array.isArray(value) ? value : value.split(",");
-        var maps = map?.split("/");
-        var results = [];
-        for (var j = 0; j < val?.length; j++) {
-            var currentVal = val[j];
-            for (var i in maps) {
-                var kv = maps[i].split(":");
-                if (kv[0] == currentVal) {
-                    results.push(kv[1]);
-                    break;
-                }
-            }
-        }
-        return results.length > 0 ? results.join() : "其他";
-    }
-}
-
-/**
- * 1,2字符残疾类别转换
- *
- * @param {*} val 数值
- * @return {string} 中文值
- */
-export function analyType(val) {
-    if (!val) {
-        return "";
-    }
-    let newVal = "";
-    let arr = ["视力", "听力", "言语", "肢体", "智力", "精神", "多重"];
-    for (let i = 1; i < 8; i++) {
-        if (i === 1) {
-            newVal = val.replace(i.toString(), arr[i - 1]);
-        } else {
-            newVal = newVal.replace(i.toString(), arr[i - 1]);
-        }
-    }
-    return newVal;
-}
-
-export function analyLevel(val) {
-    if (!val) {
-        return "";
-    }
-    let newVal = "";
-    let arr = ["一级", "二级", "三级", "四级", "不限等级"];
-    for (let i = 1; i < 7; i++) {
-        if (i === 1) {
-            newVal = val.replace(i.toString(), arr[i - 1]);
-        } else {
-            newVal = newVal.replace(i.toString(), arr[i - 1]);
-        }
-    }
-    return newVal;
-}
+/**
+ * 将数值转换成中文 '0:未启/1:已启'
+ * 
+ * @param {*} val 数值
+ * @param {*} map 值对
+ * @return {string} 中文值
+ */
+export function dict(val, map) {
+    let value = "";
+    if (val && val.includes(",")) {
+        value = val.split(",").map(item => pre(item, map)).join();
+    } else {
+        value = pre(val, map)
+    }
+    return value;
+}
+
+function pre(value, map) {
+    if (value) {
+        var val = Array.isArray(value) ? value : value.split(",");
+        var maps = map?.split("/");
+        var results = []; // 创建一个空数组，用于存储匹配到的值
+        // 遍历 val 数组
+        for (var j = 0; j < val?.length; j++) {
+            var currentVal = val[j]; // 获取当前要查找的键
+            for (var i in maps) {
+                var kv = maps[i].split(":");
+                if (kv[0] == currentVal) {
+                    results.push(kv[1]); // 将匹配到的值添加到结果数组中
+                    break; // 找到匹配项后，跳出内层循环
+                }
+            }
+        }
+        return results.length > 0 ? results.join() : "其他";
+    }
+
+}
+
+
+/**
+ * 1,2字符残疾类别转换
+ * 
+ * @param {*} val 数值
+ * @return {string} 中文值
+ */
+export function analyType(val) {
+    if (!val) {
+        return ''
+    }
+    let newVal = ''
+    let arr = ['视力', '听力', '言语', '肢体', '智力', '精神', '多重']
+    for (let i = 1; i < 8; i++) {
+        if (i === 1) {
+            newVal = val.replace(i.toString(), arr[i - 1])
+        } else {
+            newVal = newVal.replace(i.toString(), arr[i - 1])
+        }
+    }
+    return newVal;
+}
+export function analyLevel(val) {
+    if (!val) {
+        return ''
+    }
+    let newVal = ''
+    let arr = ['一级', '二级', '三级', '四级', '不限等级']
+    for (let i = 1; i < 7; i++) {
+        if (i === 1) {
+            newVal = val.replace(i.toString(), arr[i - 1])
+        } else {
+            newVal = newVal.replace(i.toString(), arr[i - 1])
+        }
+    }
+    return newVal;
+}

package/src/commons/location.js

@@ -1,9 +1,12 @@
 import Request from "./request.js";
 import Storage from "./storage.js";
+import Message from "../components/message/index.js";
 
 function isAid(value) {
     const str = String(value || "");
     return !!str && !/^(https?:)?\/\//i.test(str) && !str.includes("/") && !str.includes("?");
+
+    
 }
 
 function getLinkFromResponse(data) {
@@ -109,6 +112,11 @@ export function GetQueryString(name, url = window.location.href) {
  * @return {Promise<string>} 拼接后的链接地址。
  */
 export async function appendAppParams(url, sobject = {}, sroute = "", stokenKey = "_mis_acis_token") {
+    if (url === undefined || url === null || url === "" || url === 0 || url === "0") {
+        Message.toast("应用标识错误", { color: "error" });
+        return "";
+    }
+
     const source = url || window.location.href;
 
     if (!source) {

package/src/components/assembly/VtkDateSelector.vue

@@ -3,7 +3,14 @@
     <div v-if="!inline" class="date-input" ref="inputRef" @click="togglePicker">
       <input type="text" :value="displayValue" :placeholder="placeholder" :disabled="disabled" readonly
         class="date-input-field" />
-      <span class="date-icon">📅</span>
+      <span class="date-icon" aria-hidden="true">
+        <svg viewBox="0 0 24 24" fill="none" class="date-icon-svg">
+          <path
+            d="M7 2.75a.75.75 0 0 1 .75.75V5h8.5V3.5a.75.75 0 0 1 1.5 0V5h.75A2.5 2.5 0 0 1 21 7.5v10A2.5 2.5 0 0 1 18.5 20h-13A2.5 2.5 0 0 1 3 17.5v-10A2.5 2.5 0 0 1 5.5 5h.75V3.5A.75.75 0 0 1 7 2.75ZM4.5 10v7.5c0 .552.448 1 1 1h13c.552 0 1-.448 1-1V10h-15Zm1-3.5c-.552 0-1 .448-1 1v1h15v-1c0-.552-.448-1-1-1h-.75v1a.75.75 0 0 1-1.5 0v-1h-8.5v1a.75.75 0 0 1-1.5 0v-1H5.5Zm2.25 5.75a.75.75 0 0 1 .75.75v.25a.75.75 0 0 1-1.5 0V13a.75.75 0 0 1 .75-.75Zm4.25 0a.75.75 0 0 1 .75.75v.25a.75.75 0 0 1-1.5 0V13a.75.75 0 0 1 .75-.75Zm4.25 0a.75.75 0 0 1 .75.75v.25a.75.75 0 0 1-1.5 0V13a.75.75 0 0 1 .75-.75Zm-8.5 3.75a.75.75 0 0 1 .75.75V17a.75.75 0 0 1-1.5 0v-.25a.75.75 0 0 1 .75-.75Zm4.25 0a.75.75 0 0 1 .75.75V17a.75.75 0 0 1-1.5 0v-.25a.75.75 0 0 1 .75-.75Z"
+            fill="currentColor"
+          />
+        </svg>
+      </span>
       <span v-if="displayValue && !disabled" class="clear-icon" @click.stop="clearValue">✕</span>
     </div>
 
@@ -311,9 +318,13 @@ const dropdownStyle = ref({});
 
 // 当前日期（用于判断未来日期）
 const today = new Date();
-const todayYear = today.getFullYear();
-const todayMonth = today.getMonth();
-const todayDate = today.getDate();
+const todayYear = today.getFullYear();
+const todayMonth = today.getMonth();
+const todayDate = today.getDate();
+
+// 年份面板固定展示 12 个年份，并尽量让锚点年份落在中间偏前位置
+const YEAR_PANEL_SIZE = 12;
+const YEAR_PANEL_CENTER_OFFSET = 4;
 
 // 周和月份名称
 const weekDays = ['日', '一', '二', '三', '四', '五', '六'];
@@ -351,10 +362,11 @@ const formatDisplay = (value) => {
 };
 
 // 年份列表（显示12年）
-const yearList = computed(() => {
-  const startYear = Math.floor(currentYear.value / 12) * 12;
-  return Array.from({ length: 12 }, (_, i) => startYear + i);
-});
+const yearList = computed(() => {
+  // 年份面板打开时，以当前锚点年份为中心生成 12 个年份选项
+  const startYear = currentYear.value - YEAR_PANEL_CENTER_OFFSET;
+  return Array.from({ length: YEAR_PANEL_SIZE }, (_, i) => startYear + i);
+});
 
 // 周列表
 const weekList = computed(() => {
@@ -843,13 +855,18 @@ const changeViewMode = (mode) => {
 };
 
 // 面板操作
-const togglePicker = () => {
-  if (props.disabled) return;
-  showPicker.value = !showPicker.value;
-  if (showPicker.value) {
-    tempValue.value = selectedValue.value ?
-      (Array.isArray(selectedValue.value) ? [...selectedValue.value] : selectedValue.value) :
-      (props.mode === 'range' ? [] : null);
+const togglePicker = () => {
+  if (props.disabled) return;
+  showPicker.value = !showPicker.value;
+  if (showPicker.value) {
+    // 年份单选打开面板时，优先围绕当前自然年展示年份列表
+    if (props.displayMode === 'year' && props.mode === 'single') {
+      currentYear.value = todayYear;
+    }
+
+    tempValue.value = selectedValue.value ?
+      (Array.isArray(selectedValue.value) ? [...selectedValue.value] : selectedValue.value) :
+      (props.mode === 'range' ? [] : null);
     viewMode.value = props.displayMode;
 
     // 初始化右侧日历/年份
@@ -999,7 +1016,15 @@ watch(() => props.modelValue, (newValue) => {
 .date-icon {
   margin-left: 8px;
   color: rgb(var(--v-theme-on-surface), 0.6);
-  font-size: 14px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.date-icon-svg {
+  width: 16px;
+  height: 16px;
+  display: block;
 }
 
 .clear-icon {

package/src/components/assembly/VtkSearch.vue

@@ -1,164 +1,182 @@
-<template>
-  <div class="search">
-    <VMenu
-      v-model="menu"
-      @update:model-value="obtain"
-      location="bottom end"
-      origin="top end"
-      offset="12"
-      :close-on-content-click="false"
-    >
-      <template v-slot:activator="{ props }">
-        <VTextField
-          v-model="queryParam.condition"
-          :placeholder="$attrs.placeholder || '请输入查询内容'"
-          :style="$attrs.styles"
-          class="box"
-          density="compact"
-          variant="outlined"
-          hide-details
-          @click:append="search"
-          @keyup.enter="search"
-          @click:clear="(queryParam.condition = ''), search()"
-          clearable
-        >
-          <template v-slot:append-inner>
-            <VBadge
-              dot
-              :content="initialIndex"
-              :model-value="initialIndex > 0"
-              color="error"
-              class="advanced-badge"
-            >
-              <span
-                v-bind="props"
-                class="text-blue vtk-cursor-pointer d-inline-flex align-center text-body-2"
-              >
-                高级
-              </span>
-            </VBadge>
-          </template>
-        </VTextField>
-      </template>
-      
-      <VCard style="width: 380px;margin-right: -16px;overflow: visible;">
-        <VCardTitle class="pr-3 d-flex justify-space-between align-center pb-5">
-          <span>高级搜索</span>
-          <VBtn class="mx-0" variant="text" icon @click="close" size="small">
-            <VIcon>mdi-close</VIcon>
-          </VBtn>
-        </VCardTitle>
-
-        <VCardText style="overflow: visible;">
-          <slot></slot>
-        </VCardText>
-        
-        <VCardActions class="pt-0 px-4 pb-3">
-          <slot name="actions"></slot>
-          <VSpacer />
-          <VBtn @click="search" variant="flat" color="primary">
-            <VIcon class="mr-1">mdi-magnify</VIcon>搜索
-          </VBtn>
-          <VBtn @click="reset" variant="flat" color="error">
-            <VIcon class="mr-1">mdi-sync</VIcon>重置
-          </VBtn>
-        </VCardActions>
-      </VCard>
-    </VMenu>
-  </div>
-</template>
-
-<script setup>
-import { ref, onMounted, watch } from 'vue';
-
-defineOptions({
-  name: "VtkSearch"
-});
-
-const props = defineProps({
-  value: {
-    type: Object,
-    default: () => ({})
-  }
-});
-
-const emit = defineEmits(['update:value', 'search']);
-
-// 响应式数据
-const user = ref({});
-const menu = ref(false);
-const queryParam = ref({ ...props.value });
-const initialIndex = ref(0);
-
-// 监听 props.value 的变化
-watch(
-  () => props.value,
-  (newVal) => {
-    queryParam.value = { ...newVal };
-  },
-  { deep: true }
-);
-
-onMounted(() => {
-  user.value = JSON.parse(localStorage.getItem("_mis_acis_users") || "{}");
-  initialIndex.value = 0;
-});
-
-// 方法
-const obtain = () => {
-  if (!menu.value) {
-    initialIndex.value = 0;
-  }
-};
-
-const close = () => {
-  menu.value = false;
-  obtain();
-};
-
-const search = () => {
-  close();
-  emit('update:value', queryParam.value);
-  emit("search");
-};
-
-// 重置
-const reset = () => {
-  // 简化版重置逻辑
-  Object.keys(queryParam.value).forEach(key => {
-    if (key !== 'condition') {
-      delete queryParam.value[key];
-    }
-  });
-
-  delete queryParam.value.condition;
-  initialIndex.value = 0;
-  emit('update:value', queryParam.value);
-  emit("search");
-  menu.value = false;
-};
-</script>
-
-<style lang="scss" scoped>
-.search {
-  position: relative;
-  min-width: 380px;
-  min-height: 40px;
-}
-
-.box {
-  min-width: 380px;
-  min-height: 40px;
-}
-
-:deep(.box .v-field__append-inner) {
-  cursor: pointer;
-  padding-left: 16px !important;
-  padding-right: 4px !important;
-  border-left: 1px #cccccc88 solid;
-  min-width: 50px;
-  display: flex;
-  align-items: center;
-}
-
-</style>
+<template>
+  <div class="search">
+    <VMenu
+      v-model="menu"
+      @update:model-value="obtain"
+      location="bottom end"
+      origin="top end"
+      offset="12"
+      :close-on-content-click="false"
+    >
+      <template v-slot:activator="{ props }">
+        <VTextField
+          v-model="queryParam.condition"
+          :placeholder="$attrs.placeholder || '请输入查询内容'"
+          :style="$attrs.styles"
+          class="box"
+          density="compact"
+          variant="outlined"
+          hide-details
+          @click:append="search"
+          @keyup.enter="search"
+          @click:clear="(queryParam.condition = ''), search()"
+          clearable
+        >
+          <template v-slot:append-inner>
+            <VBadge
+              dot
+              :content="initialIndex"
+              :model-value="initialIndex > 0"
+              color="error"
+              class="advanced-badge"
+            >
+              <span
+                v-bind="props"
+                class="text-blue vtk-cursor-pointer d-inline-flex align-center text-body-2"
+              >
+                高级
+              </span>
+            </VBadge>
+          </template>
+        </VTextField>
+      </template>
+
+      <VCard style="width: 380px; margin-right: -16px; overflow: visible;">
+        <VCardTitle class="pr-3 d-flex justify-space-between align-center pb-5">
+          <span>高级搜索</span>
+          <VBtn class="mx-0" variant="text" icon @click="close" size="small">
+            <VIcon>mdi-close</VIcon>
+          </VBtn>
+        </VCardTitle>
+
+        <VCardText style="overflow: visible;">
+          <slot :query-param="queryParam"></slot>
+        </VCardText>
+
+        <VCardActions class="pt-0 px-4 pb-3">
+          <slot name="actions"></slot>
+          <VSpacer />
+          <VBtn @click="search" variant="flat" color="primary">
+            <VIcon class="mr-1">mdi-magnify</VIcon>搜索
+          </VBtn>
+          <VBtn @click="handleResetClick" variant="flat" color="error">
+            <VIcon class="mr-1">mdi-sync</VIcon>重置
+          </VBtn>
+        </VCardActions>
+      </VCard>
+    </VMenu>
+  </div>
+</template>
+
+<script setup>
+import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue';
+
+defineOptions({
+  name: "VtkSearch"
+});
+
+const props = defineProps({
+  value: {
+    type: Object,
+    default: () => ({})
+  }
+});
+
+const emit = defineEmits(['update:value', 'search', 'reset']);
+const instance = getCurrentInstance();
+
+const user = ref({});
+const menu = ref(false);
+const queryParam = ref({ ...props.value });
+const initialQueryParam = ref({ ...props.value });
+
+const initialIndex = computed(() => {
+  return Object.entries(queryParam.value).filter(([key, val]) => {
+    if (key === 'condition') return false;
+    const initVal = initialQueryParam.value[key];
+    if (Array.isArray(val) && Array.isArray(initVal)) {
+      return JSON.stringify(val) !== JSON.stringify(initVal);
+    }
+    return val !== initVal;
+  }).length;
+});
+
+watch(
+  () => props.value,
+  (newVal) => {
+    queryParam.value = { ...newVal };
+  }
+);
+
+onMounted(() => {
+  user.value = JSON.parse(localStorage.getItem("_mis_acis_users") || "{}");
+});
+
+const obtain = () => {};
+
+const close = () => {
+  menu.value = false;
+  obtain();
+};
+
+const filterNull = (obj) => {
+  return Object.fromEntries(Object.entries(obj).filter(([, v]) => v !== null && v !== undefined));
+};
+
+const search = () => {
+  close();
+  emit('update:value', filterNull(queryParam.value));
+  emit("search");
+};
+
+const reset = () => {
+  queryParam.value = {
+    ...initialQueryParam.value,
+    condition: ''
+  };
+  emit('update:value', filterNull(queryParam.value));
+  emit("search");
+  menu.value = false;
+};
+
+const handleResetClick = () => {
+  const hasParentResetHandler = Boolean(instance?.vnode.props?.onReset);
+
+  if (hasParentResetHandler) {
+    emit('reset', { ...queryParam.value });
+    return;
+  }
+
+  reset();
+};
+
+defineExpose({ search, reset });
+
+</script>
+
+<style lang="scss" scoped>
+.search {
+  position: relative;
+  min-width: 380px;
+  min-height: 40px;
+}
+
+.box {
+  min-width: 380px;
+  min-height: 40px;
+}
+
+:deep(.box .v-field__append-inner) {
+  cursor: pointer;
+  padding-left: 16px !important;
+  padding-right: 4px !important;
+  border-left: 1px #cccccc88 solid;
+  min-width: 50px;
+  display: flex;
+  align-items: center;
+}
+
+:deep(.advanced-badge .v-badge__badge) {
+  transform: translate(10px, -2px);
+}
+</style>