@skyfox2000/webui 1.3.12 → 1.3.14

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@skyfox2000/webui",
-   "version": "1.3.12",
+   "version": "1.3.14",
    "description": "后台前端通用组件定义",
    "type": "module",
    "keywords": [],

package/src/components/content/dialog/index.vue

@@ -94,11 +94,8 @@ const doDialogClose = () => {
 };
 </script>
 <template>
-   <Modal
-      v-model:open="open"
-      :wrapClassName="'modal mx-auto min-w-[430px] ' + (full ? 'full-modal w-full' : '')"
-      :width="width"
-   >
+   <Modal v-model:open="open" :wrapClassName="'modal mx-auto min-w-[430px] ' + (full ? 'full-modal w-full' : '')"
+      :width="width">
       <div class="overflow-y-auto w-full h-full">
          <slot></slot>
       </div>
@@ -107,20 +104,12 @@ const doDialogClose = () => {
             <Button @click="doDialogClose" v-if="cancelText !== ''">
                {{ cancelText ?? '取消' }}
             </Button>
-            <Button
-               @click="doDialogSaveAs"
-               v-if="saveAsText !== '' && editorCtrl?.saveAsBtnVisible !== false"
-               type="primary"
-               :loading="editorCtrl?.isFormSaving.value"
-            >
+            <Button @click="doDialogSaveAs" v-if="saveAsText !== '' && editorCtrl?.saveAsBtnVisible !== false"
+               type="primary" :loading="editorCtrl?.isFormSaving.value">
                {{ saveAsText ?? '另存为' }}
             </Button>
-            <Button
-               @click="doDialogSave"
-               v-if="saveText !== '' && editorCtrl?.saveBtnVisible !== false"
-               type="primary"
-               :loading="editorCtrl?.isFormSaving.value"
-            >
+            <Button @click="doDialogSave" v-if="saveText !== '' && editorCtrl?.saveBtnVisible !== false" type="primary"
+               :loading="editorCtrl?.isFormSaving.value">
                {{ saveText ?? '保存' }}
             </Button>
          </Space>

package/src/components/content/table/index.vue

@@ -193,40 +193,22 @@ onMounted(async () => {
 });
 </script>
 <template>
-   <Toolbar
-      :grid-ctrl="gridCtrl"
-      :editor-ctrl="gridCtrl.editor!"
-      v-if="gridCtrl.buttons?.value.length || gridCtrl.tools?.length"
-   />
-   <Table
-      v-if="visible"
-      class="w-full"
-      :row-key="props.primaryKey ?? gridCtrl.primaryKey ?? 'Id'"
-      :data-source="dataList"
-      :loading="gridCtrl.isGridLoading.value"
-      :columns="columns"
-      :pagination="pagination"
-      :row-selection="rowSelection"
-      :scroll="props.scroll || { x: 700, y: 1000 }"
-      :size="gridCtrl.tableSize.value"
-      bordered
-      v-bind="attrs"
-   >
+   <Toolbar :grid-ctrl="gridCtrl" :editor-ctrl="gridCtrl.editor!"
+      v-if="gridCtrl.buttons?.value.length || gridCtrl.tools?.length" />
+   <Table v-if="visible" class="w-full min-h-[480px]" :row-key="props.primaryKey ?? gridCtrl.primaryKey ?? 'Id'"
+      :data-source="dataList" :loading="gridCtrl.isGridLoading.value" :columns="columns" :pagination="pagination"
+      :row-selection="rowSelection" :scroll="props.scroll || { x: 700 }" :size="gridCtrl.tableSize.value" bordered
+      v-bind="attrs">
       <template #bodyCell="bodyCell">
          <slot name="bodyCell" :column="bodyCell?.column" :record="bodyCell?.record"></slot>
          <template v-if="gridCtrl && bodyCell?.column?.dataIndex === 'enabled'">
-            <Switch
-               v-model:checked="bodyCell.record.Enabled"
+            <Switch v-model:checked="bodyCell.record.Enabled"
                v-auth:disable="{ url: currentPath, role: ['Super', 'Admin'], permit: ':enabled' }"
-               :disabled="statusDisabled ? statusDisabled(bodyCell.record) : false"
-               :data="OPTIONS.EnableDisable"
-               @click="gridStatusUpdate(gridCtrl, bodyCell.record)"
-               :class="[
+               :disabled="statusDisabled ? statusDisabled(bodyCell.record) : false" :data="OPTIONS.EnableDisable"
+               @click="gridStatusUpdate(gridCtrl, bodyCell.record)" :class="[
                   'w-[58px]',
                   statusDisabled && statusDisabled(bodyCell.record) ? 'cursor-not-allowed disabled' : '',
-               ]"
-               :loading="bodyCell?.record.isLoading"
-            />
+               ]" :loading="bodyCell?.record.isLoading" />
          </template>
          <template v-if="gridCtrl && bodyCell?.column?.dataIndex === 'operation'">
             <slot name="operate" :record="bodyCell?.record">

package/src/components/form/index.ts

@@ -43,6 +43,9 @@ export { Switch };
 import Textarea from './textarea/index.vue';
 export { Textarea };
 
+import TimePicker from './timePicker/index.vue';
+export { TimePicker };
+
 import Transfer from './transfer/index.vue';
 export { Transfer };
 import TransferTable from './transfer/transferTable.vue';

package/src/components/form/timePicker/index.vue

@@ -0,0 +1,24 @@
+<script setup lang="ts">
+import { ref } from 'vue';
+import { TimePicker } from 'ant-design-vue';
+import locale from 'ant-design-vue/es/date-picker/locale/zh_CN';
+import { formValidate, useInputFactory } from '@/index';
+const props = defineProps<{
+    valueFormat?: string;
+}>();
+
+const { editorCtrl, labelText, errInfo } = useInputFactory();
+const onBlur = () => {
+    if (errInfo?.value.errClass && editorCtrl) {
+        /// 重新开始验证
+        formValidate(editorCtrl);
+    }
+};
+
+const timeFormat = ref<string>(props.valueFormat ?? 'HH:mm');
+</script>
+<template>
+    <TimePicker class="w-full"
+        :class="[errInfo?.errClass === 'error' ? 'error !border-red-300 shadow-[0_0_3px_0px_#ff4d4f]' : '']"
+        :placeholder="'请选择' + labelText" :locale="locale" :valueFormat="timeFormat" @blur="onBlur" />
+</template>

package/src/components/index.ts

@@ -46,6 +46,7 @@ export {
    Select,
    Switch,
    Textarea,
+   TimePicker,
    Transfer,
    TransferTable,
    TreeSelect,

package/src/index.ts

@@ -266,6 +266,7 @@ export {
    Select,
    Switch,
    Textarea,
+   TimePicker,
    Transfer,
    TransferTable,
    TreeSelect,

package/src/stores/hostInfo.ts

@@ -41,7 +41,20 @@ export const useHostInfo = defineStore('hostInfo', {
    }),
    actions: {
       /**
-       * 加载站点信息，如加载失败，则使用本地缓存或默认参数
+       * 获取站点API地址
+       */
+      getSiteHostApi(): string {
+         // 首先检查环境变量中是否有VITE_SITEHOST_API
+         if (import.meta.env.VITE_SITEHOST_API) {
+            return import.meta.env.VITE_SITEHOST_API;
+         }
+
+         // 默认返回空字符串
+         return '';
+      },
+
+      /**
+       * 加载站点信息
        * @param hostApi 启动配置主机地址
        * @param hostKey 站点信息，默认为当前主域名
        * @param mainOpenApis 宿主机开放接口
@@ -51,19 +64,20 @@ export const useHostInfo = defineStore('hostInfo', {
             this._setHostInfo(mainOpenApis.getHostInfo());
             return;
          }
+
+         // 如果没有传入hostApi，则尝试从环境变量获取
+         let siteHostApi = (hostApi || this.getSiteHostApi()).trim();
+         if (!siteHostApi || siteHostApi === '/') {
+            siteHostApi = window.location.origin;
+         }
+         if (siteHostApi.endsWith('/')) {
+            siteHostApi = siteHostApi.slice(0, -1);
+         }
+
          return new Promise((resolve) => {
-            if (!API_HOST['SITEHOST_API']) API_HOST['SITEHOST_API'] = hostApi;
+            if (!API_HOST['SITEHOST_API']) API_HOST['SITEHOST_API'] = siteHostApi;
 
             const host = hostKey || window.location.origin;
-            // const cacheKey = `${CacheKeys.HOST_INFO}${host}`;
-
-            // 尝试从缓存获取
-            // const cachedHostInfo = Cache.getData<HostInfo>(cacheKey);
-            // if (cachedHostInfo) {
-            //    this._setHostInfo(cachedHostInfo);
-            //    resolve();
-            //    return;
-            // }
 
             // 从服务器获取
             httpPost<HostInfo>(HostUrlList.host, {
@@ -74,13 +88,8 @@ export const useHostInfo = defineStore('hostInfo', {
                if (result?.status === ResStatus.SUCCESS && result.data) {
                   const hostInfo = result.data as HostInfo;
                   this._setHostInfo(hostInfo);
-
-                  // 使用缓存代替持久化存储
-                  // 检查是否有 lastTime 字段
-                  // if (hostInfo.lastTime) {
-                  //    Cache.setWithServerTime(cacheKey, hostInfo, hostInfo.lastTime);
-                  // }
-                  // 不存储，避免数据无法更新
+               } else {
+                  this._setHostInfo(null);
                }
                resolve();
             });
@@ -88,18 +97,59 @@ export const useHostInfo = defineStore('hostInfo', {
       },
 
       /**
-       * 设置主机信息（私有方法）
+       * 清除主机信息
+       */
+      clear(): void {
+         this.hostInfo = {
+            Host: '',
+            Title: '',
+            API_HOST: {},
+            SERVER_HOST: {},
+            MIDDLEWARES: {},
+            ExtraProps: {},
+            ExtraPropLines: [],
+         } as HostInfo;
+      },
+
+      /**
+       * 设置主机信息
        */
-      _setHostInfo(hostInfo: HostInfo): void {
+      _setHostInfo(hostInfo: HostInfo | null): void {
          this.hostInfo = {
             ...this.hostInfo,
             ...hostInfo,
          };
+
+         // 更新全局API配置
          if (this.hostInfo.API_HOST) {
-            for (const key in this.hostInfo.API_HOST) API_HOST[key] = this.hostInfo.API_HOST[key];
+            for (const key in this.hostInfo.API_HOST) {
+               let apiHost = this.hostInfo.API_HOST[key];
+               apiHost =
+                  apiHost.startsWith('http://') || apiHost.startsWith('https://') || apiHost.startsWith('//')
+                     ? apiHost
+                     : window.location.origin + apiHost;
+               if (apiHost.endsWith('/')) {
+                  apiHost = apiHost.slice(0, -1);
+               }
+               this.hostInfo.API_HOST[key] = apiHost;
+               API_HOST[key] = apiHost;
+            }
          }
+
+         // 更新全局服务器配置
          if (this.hostInfo.SERVER_HOST) {
-            for (const key in this.hostInfo.SERVER_HOST) SERVER_HOST[key] = this.hostInfo.SERVER_HOST[key];
+            for (const key in this.hostInfo.SERVER_HOST) {
+               let serverHost = this.hostInfo.SERVER_HOST[key];
+               serverHost =
+                  serverHost.startsWith('http://') || serverHost.startsWith('https://') || serverHost.startsWith('//')
+                     ? serverHost
+                     : window.location.origin + serverHost;
+               if (serverHost.endsWith('/')) {
+                  serverHost = serverHost.slice(0, -1);
+               }
+               this.hostInfo.SERVER_HOST[key] = serverHost;
+               SERVER_HOST[key] = serverHost;
+            }
          }
       },
 

package/src/utils/page.ts

@@ -90,7 +90,7 @@ const initUrls = (apiUrls: ApiUrls) => {
       if (!apiUrls.urls[urlKey]!.api) {
          apiUrls.urls[urlKey]!.api = apiUrls.api;
       }
-      if (!apiUrls.urls[urlKey]!.authorize) {
+      if (apiUrls.urls[urlKey]!.authorize === undefined) {
          apiUrls.urls[urlKey]!.authorize = apiUrls.authorize;
       }
    }