@jari-ace/element-plus-component 0.4.0 → 0.4.1

package/packages/components/radioGroup/README.md

@@ -0,0 +1,24 @@
+# JaRadioGroup 单选框组组件
+
+`JaRadioGroup` 是对 Element Plus `ElRadioGroup` 的封装，集成了 `JaForm` 表单上下文注入。
+
+## 组件用途
+
+用于在 `JaForm` 中创建单选框组，自动绑定数据模型。
+
+## 属性 API
+
+该组件继承了 [ElRadioGroup](https://element-plus.org/zh-CN/component/radio.html#radiogroup-attributes) 的所有属性。
+
+| 属性名 | 类型 | 默认值 | 说明 |
+| :--- | :--- | :--- | :--- |
+| - | - | - | 支持所有 ElRadioGroup 属性 |
+
+## 使用示例
+
+```vue
+<ja-radio-group>
+  <el-radio :label="3">Option A</el-radio>
+  <el-radio :label="6">Option B</el-radio>
+</ja-radio-group>
+```

package/packages/components/scrollbar/README.md

@@ -0,0 +1,23 @@
+# Scrollbar 滚动条组件
+
+`Scrollbar` 是对 Element Plus `ElScrollbar` 的扩展，支持可视区域检测（Intersection Observer）。
+
+## 组件用途
+
+用于内容滚动，并支持检测子元素是否在可视区域内（用于懒加载等场景）。
+
+## 属性 API
+
+该组件继承了 [ElScrollbar](https://element-plus.org/zh-CN/component/scrollbar.html#scrollbar-attributes) 的所有属性。
+
+| 属性名 | 类型 | 默认值 | 说明 |
+| :--- | :--- | :--- | :--- |
+| - | - | - | 支持所有 ElScrollbar 属性 |
+
+## 使用示例
+
+```vue
+<scrollbar height="400px">
+  <div v-for="item in 100" :key="item">{{ item }}</div>
+</scrollbar>
+```

package/packages/components/scrollbar/Scrollbar.vue

@@ -1,11 +1,18 @@
 <script setup lang="ts">
 import {ElScrollbar} from "element-plus";
-import {nextTick, onMounted, onUnmounted, provide, type Ref, ref, watch} from "vue";
+import type { ScrollbarProps } from "element-plus";
+import {nextTick, onMounted, onUnmounted, provide, type Ref, ref, watch, computed} from "vue";
 import {
     SCROLL_BAR_WRAPPED_INJECT_KEY,
     type ScrollbarWrapped
 } from "./utils";
 
+export interface JaScrollbarProps extends Partial<ScrollbarProps> {
+    // Custom props if any
+}
+
+const props = defineProps<JaScrollbarProps>()
+
 const scroll = ref<InstanceType<typeof ElScrollbar>>();
 const wrappedItems: Ref<ScrollbarWrapped[]> = ref([]);
 const wrappedItemsMap: Map<Element, ScrollbarWrapped> = new Map();
@@ -35,7 +42,7 @@ const observer = new IntersectionObserver((entries) => {
 async function observeWrappedItemInView() {
     await nextTick();
     const wrap = scroll.value?.$el;
-    if (!wrappedItems.value) return;
+    if (!wrappedItems.value || !wrap) return;
     try {
         for (let i = 0; i < wrappedItems.value.length; i++) {
             if (wrappedItems.value[i]) {
@@ -74,11 +81,15 @@ onUnmounted(() => {
     })
 })
 
+const elementProps = computed(() => {
+    return props
+})
+
 </script>
 
 <template>
     <el-scrollbar ref="scroll" class="scroll-container"
-                  v-bind="$attrs">
+                  v-bind="{ ...elementProps, ...$attrs }">
         <template v-for="(_, name) in $slots" v-slot:[name]>
             <slot :name="name"></slot>
         </template>

package/packages/components/select/JaSelect.vue

@@ -1,36 +1,48 @@
 <script setup lang="ts">
 import type {ValidationInstance} from '../../hooks/useBackendValidations'
-import {inject, ref, watch} from "vue";
+import {inject, ref, watch, computed} from "vue";
 import {ElSelect} from "element-plus";
+import type { SelectProps } from 'element-plus'
 import type {EpPropFinalized} from "element-plus/es/utils";
 import {getValue, setValue} from "../../utils/objectUtils";
 
-const input = ref<typeof ElSelect>({} as typeof ElSelect)
+const input = ref<InstanceType<typeof ElSelect>>()
 const model = inject('aceFormModel') as Record<string, any>
 const prop = inject('aceFormItemProp') as string
 const validator = inject('aceFormValidator') as ValidationInstance
 const emit = defineEmits<{
-    change: [value: string]
+    change: [value: any]
 }>()
 
-function onChange(value: string) {
+export interface JaSelectProps extends Partial<SelectProps> {
+}
+
+const props = defineProps<JaSelectProps>()
+
+function onChange(value: any) {
     validator.removeFieldError(prop)
     setValue(model.formData, prop, mv.value);
     emit('change', value)
 }
 
-type modelType = EpPropFinalized<(ArrayConstructor | ObjectConstructor | NumberConstructor | BooleanConstructor | StringConstructor)[], unknown, unknown, undefined, boolean>;
+// type modelType = EpPropFinalized<(ArrayConstructor | ObjectConstructor | NumberConstructor | BooleanConstructor | StringConstructor)[], unknown, unknown, undefined, boolean>;
+type ModelType = any; // Select value can be complex
 
-const mv = ref(getValue(model.formData, prop) as modelType);
+const mv = ref(getValue(model.formData, prop) as ModelType);
 watch(() => model.formData, () => {
-    mv.value = getValue(model.formData, prop) as modelType
+    mv.value = getValue(model.formData, prop) as ModelType
 }, {
     deep: true
 })
 
+const elementProps = computed(() => {
+    const { modelValue, ...rest } = props as any
+    return rest
+})
+
 defineExpose({
-    focus: () => input.value.focus(),
-    blur: () => input.value.blur(),
+    focus: () => input.value?.focus?.(),
+    blur: () => input.value?.blur?.(),
     elSelect: input
 })
 </script>
@@ -40,7 +52,7 @@ defineExpose({
         ref="input"
         v-model="mv"
         @change="onChange"
-        v-bind="$attrs">
+        v-bind="{ ...elementProps, ...$attrs }">
         <template v-for="(_, name) in $slots" v-slot:[name]>
             <slot :name="name"></slot>
         </template>

package/packages/components/select/README.md

@@ -0,0 +1,24 @@
+# JaSelect 选择器组件
+
+`JaSelect` 是对 Element Plus `ElSelect` 的封装，集成了 `JaForm` 表单上下文注入。
+
+## 组件用途
+
+用于在 `JaForm` 中进行选择，自动绑定数据模型。
+
+## 属性 API
+
+该组件继承了 [ElSelect](https://element-plus.org/zh-CN/component/select.html#select-attributes) 的所有属性。
+
+| 属性名 | 类型 | 默认值 | 说明 |
+| :--- | :--- | :--- | :--- |
+| - | - | - | 支持所有 ElSelect 属性 |
+
+## 使用示例
+
+```vue
+<ja-select>
+  <el-option label="Zone 1" value="shanghai" />
+  <el-option label="Zone 2" value="beijing" />
+</ja-select>
+```

package/packages/components/switch/JaSwitch.vue

@@ -1,11 +1,12 @@
 <script setup lang="ts">
 import type {ValidationInstance} from '../../hooks/useBackendValidations'
-import {inject, ref, watch} from "vue";
+import {inject, ref, watch, computed} from "vue";
 import {ElSwitch} from "element-plus";
+import type { SwitchProps } from 'element-plus'
 import {getValue, setValue} from "../../utils/objectUtils";
 import type {EpPropMergeType} from "element-plus/es/utils";
 
-const input = ref<typeof ElSwitch>()
+const input = ref<InstanceType<typeof ElSwitch>>()
 const model = inject('aceFormModel') as Record<string, any>
 const prop = inject('aceFormItemProp') as string
 const validator = inject('aceFormValidator') as ValidationInstance
@@ -13,6 +14,11 @@ const emit = defineEmits<{
     change: [value: boolean | string | number]
 }>()
 
+export interface JaSwitchProps extends Partial<SwitchProps> {
+}
+
+const props = defineProps<JaSwitchProps>()
+
 function onChange(value: boolean | string | number) {
     validator.removeFieldError(prop)
     setValue(model.formData, prop, mv.value);
@@ -30,9 +36,14 @@ watch(() => model.formData, () => {
     deep: true
 })
 
+const elementProps = computed(() => {
+    const { modelValue, ...rest } = props
+    return rest
+})
+
 defineExpose({
-    focus: () => input.value?.focus(),
-    blur: () => input.value?.blur(),
+    focus: () => (input.value as any)?.focus?.(),
+    blur: () => (input.value as any)?.blur?.(),
     elSwitch: input
 })
 </script>
@@ -42,7 +53,7 @@ defineExpose({
         ref="input"
         v-model="mv"
         @change="onChange"
-        v-bind="$attrs">
+        v-bind="{ ...elementProps, ...$attrs }">
         <template v-for="(_, name) in $slots" v-slot:[name]>
             <slot :name="name"></slot>
         </template>

package/packages/components/switch/README.md

@@ -0,0 +1,21 @@
+# JaSwitch 开关组件
+
+`JaSwitch` 是对 Element Plus `ElSwitch` 的封装，集成了 `JaForm` 表单上下文注入。
+
+## 组件用途
+
+用于在 `JaForm` 中切换状态，自动绑定数据模型。
+
+## 属性 API
+
+该组件继承了 [ElSwitch](https://element-plus.org/zh-CN/component/switch.html#switch-attributes) 的所有属性。
+
+| 属性名 | 类型 | 默认值 | 说明 |
+| :--- | :--- | :--- | :--- |
+| - | - | - | 支持所有 ElSwitch 属性 |
+
+## 使用示例
+
+```vue
+<ja-switch />
+```

package/packages/components/timePicker/JaTimePicker.vue

@@ -1,10 +1,11 @@
 <script setup lang="ts">
 import type {ValidationInstance} from '../../hooks/useBackendValidations'
-import {inject, onMounted, ref, watch} from "vue";
+import {inject, onMounted, ref, watch, computed} from "vue";
 import {ElTimePicker} from "element-plus";
+import type { TimePickerDefaultProps } from 'element-plus'
 import {getValue, setValue} from "../../utils/objectUtils";
 
-const input = ref<typeof ElTimePicker>({} as typeof ElTimePicker)
+const input = ref<InstanceType<typeof ElTimePicker>>()
 const model = inject('aceFormModel') as Record<string, any>
 const prop = inject('aceFormItemProp') as string
 const validator = inject('aceFormValidator') as ValidationInstance
@@ -12,6 +13,11 @@ const emit = defineEmits<{
     change: [value: string]
 }>()
 
+export interface JaTimePickerProps extends Partial<TimePickerDefaultProps> {
+}
+
+const props = defineProps<JaTimePickerProps>()
+
 const exposeMethods = ref<any>({})
 
 function onChange(value: string) {
@@ -20,7 +26,7 @@ function onChange(value: string) {
     emit('change', value);
 }
 
-type ModelType = string | number | object;
+type ModelType = string | number | object | any;
 
 const mv = ref(getValue(model.formData, prop) as ModelType);
 watch(() => model.formData, () => {
@@ -29,11 +35,18 @@ watch(() => model.formData, () => {
     deep: true
 })
 
+const elementProps = computed(() => {
+    const { modelValue, ...rest } = props
+    return rest
+})
+
 onMounted(() => {
-    const refMethods = Object.entries(input.value).filter(([_, v]) => v instanceof Function);
-    refMethods.forEach(([key, val]) => {
-        exposeMethods.value[key] = val;
-    })
+    if (input.value) {
+        const refMethods = Object.entries(input.value).filter(([_, v]) => v instanceof Function);
+        refMethods.forEach(([key, val]) => {
+            exposeMethods.value[key] = val;
+        })
+    }
 })
 
 defineExpose(exposeMethods.value);
@@ -44,7 +57,7 @@ defineExpose(exposeMethods.value);
         ref="input"
         v-model="model.formData[prop]"
         @change="onChange"
-        v-bind="$attrs">
+        v-bind="{ ...elementProps, ...$attrs }">
         <template v-for="(_, name) in $slots" v-slot:[name]>
             <slot :name="name"></slot>
         </template>

package/packages/components/timePicker/README.md

@@ -0,0 +1,21 @@
+# JaTimePicker 时间选择器组件
+
+`JaTimePicker` 是对 Element Plus `ElTimePicker` 的封装，集成了 `JaForm` 表单上下文注入。
+
+## 组件用途
+
+用于在 `JaForm` 中选择时间，自动绑定数据模型。
+
+## 属性 API
+
+该组件继承了 [ElTimePicker](https://element-plus.org/zh-CN/component/time-picker.html#timepicker-attributes) 的所有属性。
+
+| 属性名 | 类型 | 默认值 | 说明 |
+| :--- | :--- | :--- | :--- |
+| - | - | - | 支持所有 ElTimePicker 属性 |
+
+## 使用示例
+
+```vue
+<ja-time-picker placeholder="Arbitrary time" />
+```

package/packages/components/tip/README.md

@@ -0,0 +1,20 @@
+# AceTip 提示组件
+
+`AceTip` 是一个简单的提示信息展示组件。
+
+## 组件用途
+
+用于显示警告、提示或说明信息。
+
+## 属性 API
+
+| 属性名 | 类型 | 默认值 | 说明 |
+| :--- | :--- | :--- | :--- |
+| `type` | `'primary' \| 'success' \| 'warning' \| 'danger' \| 'info'` | `'primary'` | 提示类型（颜色） |
+| `text` | `string` | `''` | 提示文本 |
+
+## 使用示例
+
+```vue
+<ace-tip type="warning" text="请注意，此操作不可逆！" />
+```

package/packages/components/tip/src/AceTip.vue

@@ -14,10 +14,18 @@
 </template>
 
 <script setup lang="ts">
-const props = withDefaults(defineProps<{
+export interface AceTipProps {
+    /**
+     * 提示类型
+     */
     type?: "primary" | "success" | "warning" | "danger" | "info";
+    /**
+     * 提示文本
+     */
     text?: string;
-}>(), {
+}
+
+const props = withDefaults(defineProps<AceTipProps>(), {
     type: "primary",
     text: "",
 });

package/packages/components/upload/JaUploader.vue

@@ -1,9 +1,10 @@
 <script setup lang="ts">
 import type {ValidationInstance} from '../../hooks/useBackendValidations'
-import {inject, ref, watch} from "vue";
+import {inject, ref, watch, computed} from "vue";
 import {getValue, setValue} from "../../utils/objectUtils";
 import Uploader from "./uploader.vue";
-const props = defineProps<{
+
+export interface JaUploaderProps {
     /**
      * 应用名
      */
@@ -17,7 +18,7 @@ const props = defineProps<{
      */
     attachToken?: string,
     /**
-     * 数据密集
+     * 数据密级
      */
     classificationLevel?: number,
     /**
@@ -28,8 +29,10 @@ const props = defineProps<{
      * 文件列表最大高度
      */
     maxHeight?: string | number
-}>();
-const input = ref<typeof Uploader>({} as typeof Uploader)
+}
+
+const props = defineProps<JaUploaderProps>();
+const input = ref<InstanceType<typeof Uploader>>()
 const model = inject('aceFormModel') as Record<string, any>
 const prop = inject('aceFormItemProp') as string
 const validator = inject('aceFormValidator') as ValidationInstance
@@ -53,9 +56,7 @@ watch(() => model.formData, () => {
 })
 
 defineExpose({
-    focus: () => input.value.focus(),
-    blur: () => input.value.blur(),
-    elSelect: input
+    uploader: input
 })
 </script>
 

package/packages/components/upload/README.md

@@ -0,0 +1,24 @@
+# JaUploader 上传组件
+
+`JaUploader` 是基于 Uppy 的文件上传组件，集成了 `JaForm` 表单上下文注入。
+
+## 组件用途
+
+用于在 `JaForm` 中上传和管理文件附件。
+
+## 属性 API
+
+| 属性名 | 类型 | 默认值 | 说明 |
+| :--- | :--- | :--- | :--- |
+| `serviceName` | `string` | - | 应用服务名称 |
+| `configKey` | `string` | - | 附件配置 Key |
+| `attachToken` | `string` | - | 附件 Token |
+| `classificationLevel` | `number` | - | 数据密级 |
+| `height` | `string \| number` | - | 文件列表高度 |
+| `maxHeight` | `string \| number` | - | 文件列表最大高度 |
+
+## 使用示例
+
+```vue
+<ja-uploader serviceName="my-app" configKey="default" />
+```

package/packages/components/upload/uploader.vue

@@ -1,10 +1,13 @@
 <script setup lang="ts">
 import {
+    type ClassificationLevel,
     createAxiosWithoutCache,
-    type FileInfo, Jari,
+    type FileInfo,
+    Jari,
+    type UploadInitParams,
     useFilesApi,
-    useLoginUser,
-    type ClassificationLevel, type UploadInitParams, useLoading
+    useLoading,
+    useLoginUser
 } from "@jari-ace/app-bolts";
 import { nextTick, onMounted, onUnmounted, ref, watch } from "vue";
 import { ArrowDown, Download, Upload } from "@element-plus/icons-vue";
@@ -67,7 +70,23 @@ const props = defineProps<{
     /**
      * 文件列表最大高度
      */
-    maxHeight?: string | number
+    maxHeight?: string | number,
+    /**
+     * 是否允许上传, 为空表示采用应用里的附件设置
+     */
+    allowUpload?: boolean,
+    /**
+     * 是否允许下载，为空表示采用应用里的附件设置
+     */
+    allowDownload?: boolean,
+    /**
+     * 是否允许删除，为空表示采用应用里的附件设置
+     */
+    allowDelete?: boolean,
+    /**
+     * 是否允许预览，为空表示采用应用里的附件设置
+     */
+    allowPreview?: boolean,
 }>();
 const attachId = defineModel<string>({
     required: false
@@ -393,66 +412,71 @@ async function downloadAll() {
 }
 
 function checkAllowUpload() {
-    const cfg = uploadInitParams.value?.fileConfig;
-    if (cfg) {
-        let hasRole = true;
-        if (cfg.uploadAuthCode) {
-            const login = useLoginUser();
-            if (login) {
-                hasRole = login.hasRole(cfg.uploadAuthCode);
+    if (props.allowUpload == undefined) {
+        const cfg = uploadInitParams.value?.fileConfig;
+        if (cfg) {
+            let hasRole = true;
+            if (cfg.uploadAuthCode) {
+                const login = useLoginUser();
+                if (login) {
+                    hasRole = login.hasRole(cfg.uploadAuthCode);
+                }
+                return !cfg.disallowUpload && hasRole;
             }
-            return !cfg.disallowUpload && hasRole;
+            return !cfg.disallowUpload;
         }
-        return !cfg.disallowUpload;
+        console.log('file cfg is null')
     }
-    console.log('file cfg is null')
-    return false;
+    return props.allowUpload;
 }
 
 function checkAllowDownload() {
-    const cfg = uploadInitParams.value?.fileConfig;
-    if (cfg) {
-        let hasRole = true;
-        if (cfg.downloadAuthCode) {
-            const login = useLoginUser();
-            if (login) {
-                hasRole = login.hasRole(cfg.downloadAuthCode);
+    if (props.allowDownload == undefined) {
+        const cfg = uploadInitParams.value?.fileConfig;
+        if (cfg) {
+            let hasRole = true;
+            if (cfg.downloadAuthCode) {
+                const login = useLoginUser();
+                if (login) {
+                    hasRole = login.hasRole(cfg.downloadAuthCode);
+                }
+                return !cfg.disallowDownload && hasRole;
             }
-            return !cfg.disallowDownload && hasRole;
+            return !cfg.disallowDownload;
         }
-        return !cfg.disallowDownload;
     }
-    return false;
+    return props.allowDownload;
 }
 
 function checkAllowDelete() {
-    const cfg = uploadInitParams.value?.fileConfig;
-    if (cfg) {
-        let hasRole = true;
-        if (cfg.deleteAuthCode) {
-            const login = useLoginUser();
-            if (login) {
-                hasRole = login.hasRole(cfg.deleteAuthCode);
+    if (props.allowDelete == undefined) {
+        const cfg = uploadInitParams.value?.fileConfig;
+        if (cfg) {
+            let hasRole = true;
+            if (cfg.deleteAuthCode) {
+                const login = useLoginUser();
+                if (login) {
+                    hasRole = login.hasRole(cfg.deleteAuthCode);
+                }
+                return !cfg.disallowDelete && hasRole;
             }
-            return !cfg.disallowDelete && hasRole;
+            return !cfg.disallowDelete;
         }
-        return !cfg.disallowDelete;
     }
-    return false;
+    return props.allowDelete;
 }
 
 function checkAllowPreview(file: FileInfo) {
-    const cfg = uploadInitParams.value?.fileConfig;
-    if (cfg) {
-        if (cfg.disablePreview) {
-            return false;
-        }
-        if (!previewableFileExts.some(ext => file.fileName.endsWith(ext))) {
-            return false;
+    if (props.allowPreview == undefined) {
+        const cfg = uploadInitParams.value?.fileConfig;
+        if (cfg) {
+            if (cfg.disablePreview) {
+                return false;
+            }
+            return previewableFileExts.some(ext => file.fileName.endsWith(ext));
         }
-        return true;
     }
-    return false;
+    return props.allowPreview;
 }
 
 watch(() => props.attachToken, () => {