p-pc-ui 1.3.12 → 1.3.13

package/dist/components/p-button-rounded/p-button-rounded.vue

@@ -60,7 +60,7 @@ const btnClick = useDebounceFn(async () => {
 
   <a-tooltip color="var(--secondary-color-light)" :overlayInnerStyle="{ color: '#fff' }" :title="tooltip"
     v-bind="$attrs">
-    <a-button @click="btnClick" @keydown.enter.prevent="btnClick" :loading="loading || builtInLoading" class="font-semibold"
+    <a-button @click="btnClick" :loading="loading || builtInLoading" class="font-semibold"
       :class="disabled ? 'cursor-not-allowed' : 'hover:opacity-80 active:opacity-100'" :style="{
         background: disabled ? '#b5b5b5' : bgColor,
         color: disabled ? '#fff' : color,

package/dist/components/p-form/p-form.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, reactive, onMounted, render, onBeforeMount, useSlots, toRaw, shallowRef } from "vue";
+import { ref, reactive, onMounted, render, onBeforeMount, useSlots, toRaw, shallowRef, isRef, isReactive } from "vue";
 import type { FormDataItem } from "./index";
 import {
   Button as AButton,
@@ -16,6 +16,7 @@ import {
   Upload as AUpload,
   Textarea as ATextarea,
   Space as ASpace,
+  DatePicker as ADatePicker,
 } from "ant-design-vue";
 import type { FormInstance } from "ant-design-vue";
 import * as _ from "../../utils/dataUtils";
@@ -137,14 +138,13 @@ const buildSelectLoadParams = (renderItem: FormDataItem & { [key: string]: any }
 const normalizeSelectLoadResult = (res: SelectLoadResult, state: SelectLoadState) => {
   const list = Array.isArray(res) ? res : res?.data || [];
 
-  const hasMore =
-    Array.isArray(res)
-      ? list.length >= state.pageSize
-      : typeof res?.pages?.total === "number" && typeof res?.pages?.now === "number"
+  const hasMore = Array.isArray(res)
+    ? list.length >= state.pageSize
+    : typeof res?.pages?.total === "number" && typeof res?.pages?.now === "number"
       ? res.pages.now < res.pages.total
       : typeof res?.count === "number"
-      ? state.pageNum * state.pageSize < res.count
-      : list.length >= state.pageSize;
+        ? state.pageNum * state.pageSize < res.count
+        : list.length >= state.pageSize;
 
   return {
     list,
@@ -154,7 +154,7 @@ const normalizeSelectLoadResult = (res: SelectLoadResult, state: SelectLoadState
 
 const fetchSelectOptions = async (
   renderItem: FormDataItem & { [key: string]: any },
-  options: { reset?: boolean; keyword?: string } = {}
+  options: { reset?: boolean; keyword?: string } = {},
 ) => {
   if (renderItem.type !== "select" || !renderItem.loadDataFunc) return;
   const state = ensureSelectLoadState(renderItem);
@@ -258,7 +258,6 @@ const disposeRenderData = async (renderData: FormDataItem[]) => {
         fieldType = "array";
       }
 
-
       if (required) {
         rules.push({
           type: renderItem.type == "uploadOss" || renderItem.type == "uploadTos" ? "array" : renderItem.fieldType,
@@ -294,8 +293,6 @@ const disposeRenderData = async (renderData: FormDataItem[]) => {
       }
     }
 
-
-
     renderItem.rules = rules;
 
     // 处理下拉选择
@@ -491,6 +488,10 @@ const getFormData = async (options: { no_check?: Boolean } = {}) => {
       _.set(returnFormData, key.split("__"), formData[key]);
     } else if (renderItem.type == "datePicker") {
       returnFormData[key] = dayjs(formData[key]).format("YYYY-MM-DD HH:mm:ss");
+    } 
+    else if ( isRef(formData[key]) || isReactive(formData[key]) ) {
+
+      returnFormData[key] = toRaw(formData[key]);
     } else {
       returnFormData[key] = formData[key];
     }
@@ -510,9 +511,13 @@ const resetForm = () => {
  * 确认按钮点击
  */
 const confirmClick = async () => {
-  const formData = await getFormData();
-  if (Object.keys(formData).length == 0) return;
-  emits("confirm", formData, resetForm);
+  try {
+    const formData = await getFormData();
+    if (Object.keys(formData).length == 0) return;
+    emits("confirm", formData, resetForm);
+  } catch (error) {
+    console.warn("Form validation failed:", error);
+  }
 };
 
 const uploadChange = (e, renderItem) => {
@@ -621,26 +626,46 @@ defineExpose({
 </script>
 
 <template>
-  <a-form ref="formRef" :model="formState" name="basic" autocomplete="off" :layout="layout"
-    :required-mark="requiredMark">
+  <a-form
+    ref="formRef"
+    :model="formState"
+    name="basic"
+    autocomplete="off"
+    :layout="layout"
+    :required-mark="requiredMark"
+  >
     <div v-for="(renderItem, index) in renderData">
-      <a-form-item :label-col="{ span: renderItem.hideLabel ? 0 : renderItem.labelSpan || labelSpan }"
+      <a-form-item
+        :label-col="{ span: renderItem.hideLabel ? 0 : renderItem.labelSpan || labelSpan }"
         :wrapper-col="{ span: renderItem.hideLabel ? undefined : renderItem.valueSpan || valueSpan }"
         v-show="!renderItem.visibleHook || (renderItem.visibleHook && renderItem.visibleHook(formState))"
-        :label="renderItem.label && !renderItem.hideLabel ? renderItem.label : ''" :name="renderItem.key"
-        :colon="renderItem.colon == undefined ? true : renderItem.colon" :rules="!renderItem.visibleHook || (renderItem.visibleHook && renderItem.visibleHook(formState))
-          ? renderItem.rules
-          : undefined
-          " :style="{
-            marginBottom: isSearchForm ? '20px' : '0px',
-          }" :tooltip="renderItem.tooltip" :label-align="renderItem.labelAlign || 'right'">
-        <div :style="{
-          opacity: renderItem.disabled ? 0.6 : 1,
-          cursor: renderItem.disabled ? 'not-allowed' : 'auto',
-        }">
-          <a-input v-model:value="formState[renderItem.key]"
-            v-if="renderItem.type == 'input' && [undefined, 'string'].includes(renderItem.fieldType)" type="text"
-            :disabled="renderItem.disabled" :placeholder="renderItem.placeholder || `请输入${renderItem.label}`">
+        :label="renderItem.label && !renderItem.hideLabel ? renderItem.label : ''"
+        :name="renderItem.key"
+        :colon="renderItem.colon == undefined ? true : renderItem.colon"
+        :rules="
+          !renderItem.visibleHook || (renderItem.visibleHook && renderItem.visibleHook(formState))
+            ? renderItem.rules
+            : undefined
+        "
+        :style="{
+          marginBottom: isSearchForm ? '20px' : '0px',
+        }"
+        :tooltip="renderItem.tooltip"
+        :label-align="renderItem.labelAlign || 'right'"
+      >
+        <div
+          :style="{
+            opacity: renderItem.disabled ? 0.6 : 1,
+            cursor: renderItem.disabled ? 'not-allowed' : 'auto',
+          }"
+        >
+          <a-input
+            v-model:value="formState[renderItem.key]"
+            v-if="renderItem.type == 'input' && [undefined, 'string'].includes(renderItem.fieldType)"
+            type="text"
+            :disabled="renderItem.disabled"
+            :placeholder="renderItem.placeholder || `请输入${renderItem.label}`"
+          >
             <template v-if="renderItem.prefix" v-slot:prefix>
               <component :is="renderItem.prefix" />
             </template>
@@ -649,9 +674,13 @@ defineExpose({
             </template>
           </a-input>
 
-          <a-input v-model:value.number="formState[renderItem.key]"
-            v-if="renderItem.type == 'input' && renderItem.fieldType == 'number'" type="number"
-            :disabled="renderItem.disabled" :placeholder="renderItem.placeholder || `请输入${renderItem.label}`">
+          <a-input
+            v-model:value.number="formState[renderItem.key]"
+            v-if="renderItem.type == 'input' && renderItem.fieldType == 'number'"
+            type="number"
+            :disabled="renderItem.disabled"
+            :placeholder="renderItem.placeholder || `请输入${renderItem.label}`"
+          >
             <template v-if="renderItem.prefix" v-slot:prefix>
               <component :is="renderItem.prefix" />
             </template>
@@ -660,25 +689,37 @@ defineExpose({
             </template>
           </a-input>
 
-          <a-input-password v-model:value="formState[renderItem.key]" v-if="renderItem.type == 'password'"
-            type="password" :disabled="renderItem.disabled"
-            :placeholder="renderItem.placeholder || `请输入${renderItem.label}`">
+          <a-input-password
+            v-model:value="formState[renderItem.key]"
+            v-if="renderItem.type == 'password'"
+            type="password"
+            :disabled="renderItem.disabled"
+            :placeholder="renderItem.placeholder || `请输入${renderItem.label}`"
+          >
             <template v-if="renderItem.prefix" v-slot:prefix>
               <component :is="renderItem.prefix" />
             </template>
           </a-input-password>
 
-          <a-input v-model:value="formState[renderItem.key]"
-            v-if="renderItem.type == 'code' && [undefined, 'string'].includes(renderItem.fieldType)" type="text"
-            :disabled="renderItem.disabled" :placeholder="renderItem.placeholder || `请输入${renderItem.label}`">
+          <a-input
+            v-model:value="formState[renderItem.key]"
+            v-if="renderItem.type == 'code' && [undefined, 'string'].includes(renderItem.fieldType)"
+            type="text"
+            :disabled="renderItem.disabled"
+            :placeholder="renderItem.placeholder || `请输入${renderItem.label}`"
+          >
             <template v-if="renderItem.prefix" v-slot:prefix>
               <component :is="renderItem.prefix" />
             </template>
             <template v-slot:suffix>
-              <span v-if="
-                (!renderItem.activityFunc || (renderItem.activityFunc && renderItem.activityFunc(formState))) &&
-                renderItem.sendStatus != 'sending'
-              " class="send-notice send-notice-activity" @click="sendNoticeClick(renderItem)">
+              <span
+                v-if="
+                  (!renderItem.activityFunc || (renderItem.activityFunc && renderItem.activityFunc(formState))) &&
+                  renderItem.sendStatus != 'sending'
+                "
+                class="send-notice send-notice-activity"
+                @click="sendNoticeClick(renderItem)"
+              >
                 {{ renderItem.codeName }}
               </span>
               <span v-else class="send-notice">
@@ -687,50 +728,83 @@ defineExpose({
             </template>
           </a-input>
 
-          <a-textarea v-model:value="formState[renderItem.key]" v-if="renderItem.type == 'textarea'"
-            :disabled="renderItem.disabled" :placeholder="renderItem.placeholder || `请输入${renderItem.label}`"
-            :auto-size="{ minRows: 2, maxRows: 10 }" />
-
-          <a-select style="min-width: 170px; margin-right: 15px" v-model:value="formState[renderItem.key]"
-            :placeholder="renderItem.placeholder || `请选择`" v-if="renderItem.type == 'select'"
-            :disabled="renderItem.disabled" :fieldNames="renderItem.fieldNames || { label: 'label', value: 'value' }"
-            :options="renderItem.optionList" :mode="renderItem.isMultiple ? 'multiple' : undefined"
+          <a-textarea
+            v-model:value="formState[renderItem.key]"
+            v-if="renderItem.type == 'textarea'"
+            :disabled="renderItem.disabled"
+            :placeholder="renderItem.placeholder || `请输入${renderItem.label}`"
+            :auto-size="{ minRows: 2, maxRows: 10 }"
+          />
+
+          <a-select
+            style="min-width: 170px; margin-right: 15px"
+            v-model:value="formState[renderItem.key]"
+            :placeholder="renderItem.placeholder || `请选择`"
+            v-if="renderItem.type == 'select'"
+            :disabled="renderItem.disabled"
+            :fieldNames="renderItem.fieldNames || { label: 'label', value: 'value' }"
+            :options="renderItem.optionList"
+            :mode="renderItem.isMultiple ? 'multiple' : undefined"
             :show-search="renderItem.enableSearch || !!renderItem.loadDataFunc"
             :filter-option="renderItem.loadDataFunc ? false : !!renderItem.enableSearch"
             :option-filter-prop="renderItem.fieldNames?.label || 'label'"
             :loading="(renderItem as any).__selectState?.loading"
             @search="(keyword) => onSelectSearch(keyword, renderItem as any)"
-            @popupScroll="(e) => onSelectPopupScroll(e, renderItem as any)"></a-select>
-
-          <a-radio-group v-if="renderItem.type == 'radio'" v-model:value="formState[renderItem.key]"
-            :disabled="renderItem.disabled">
+            @popupScroll="(e) => onSelectPopupScroll(e, renderItem as any)"
+          ></a-select>
+
+          <a-radio-group
+            v-if="renderItem.type == 'radio'"
+            v-model:value="formState[renderItem.key]"
+            :disabled="renderItem.disabled"
+          >
             <a-radio v-for="item in renderItem.optionList" :value="item[renderItem.fieldNames?.value || 'value']">
               {{ item[renderItem.fieldNames?.label || "label"] }}
             </a-radio>
           </a-radio-group>
 
-          <a-date-picker v-model:value="formState[renderItem.key]" v-if="renderItem.type === 'datePicker'" show-time
-            :disabled="renderItem.disabled" :placeholder="`请选择${renderItem.label}`" class="ant-input"
-            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
-
-          <a-tree-select style="min-width: 170px; margin-right: 15px" v-model:value="formState[renderItem.key]"
-            :tree-data="renderItem.optionList" v-if="renderItem.type == 'treeSelect'" :disabled="renderItem.disabled"
+          <a-date-picker
+            v-model:value="formState[renderItem.key]"
+            v-if="renderItem.type === 'datePicker'"
+            show-time
+            :disabled="renderItem.disabled"
+            :placeholder="`请选择${renderItem.label}`"
+            class="ant-input"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          />
+
+          <a-tree-select
+            style="min-width: 170px; margin-right: 15px"
+            v-model:value="formState[renderItem.key]"
+            :tree-data="renderItem.optionList"
+            v-if="renderItem.type == 'treeSelect'"
+            :disabled="renderItem.disabled"
             :fieldNames="renderItem.fieldNames || { children: 'children', label: 'name', value: 'id' }"
-            :placeholder="renderItem.placeholder || `请选择`"></a-tree-select>
+            :placeholder="renderItem.placeholder || `请选择`"
+          ></a-tree-select>
 
           <a-upload
             v-if="renderItem.type == 'uploadOss' || renderItem.type == 'uploadTos' || renderItem.type == 'upload'"
-            :file-list="formState[renderItem.key]" :multiple="true" :max-count="renderItem?.maxCount || 1"
-            @preview="handlePicPreview" :customRequest="(e) => {
-              uploadRequest(e, renderItem);
-            }
-              " @change="
-                (e) => {
-                  uploadChange(e, renderItem);
-                }
-              " :headers="{
-                'Cache-Control': 'max-age=15552000',
-              }" :list-type="renderItem.uploadType == 'pic' ? 'picture-card' : undefined">
+            :file-list="formState[renderItem.key]"
+            :multiple="true"
+            :max-count="renderItem?.maxCount || 1"
+            @preview="handlePicPreview"
+            :customRequest="
+              (e) => {
+                uploadRequest(e, renderItem);
+              }
+            "
+            @change="
+              (e) => {
+                uploadChange(e, renderItem);
+              }
+            "
+            :headers="{
+              'Cache-Control': 'max-age=15552000',
+            }"
+            :list-type="renderItem.uploadType == 'pic' ? 'picture-card' : undefined"
+          >
             <div v-if="renderItem.uploadType == 'pic'">
               <plus-outlined />
               <div style="margin-top: 8px">{{ renderItem.label }}</div>
@@ -744,8 +818,11 @@ defineExpose({
             </div>
           </a-upload>
 
-          <component v-if="renderItem.type == 'component'" :is="renderItem.component"
-            v-model:[renderItem.key]="formState[renderItem.key]"></component>
+          <component
+            v-if="renderItem.type == 'component'"
+            :is="renderItem.component"
+            v-model:[renderItem.key]="formState[renderItem.key]"
+          ></component>
         </div>
       </a-form-item>
     </div>
@@ -753,10 +830,10 @@ defineExpose({
     <div v-if="uSlots.button || showResetButton || showSubmitButton" style="display: flex; justify-content: center">
       <slot name="button"></slot>
       <a-space size="small">
-        <a-button v-if="showResetButton" @click="resetForm" @keydown.enter.prevent="resetForm" style="padding: 0 30px">
+        <a-button v-if="showResetButton" @click="resetForm" style="padding: 0 30px">
           {{ resetButtonText || "取消" }}
         </a-button>
-        <a-button type="primary" @click="confirmClick" @keydown.enter.prevent="confirmClick" v-if="showSubmitButton" style="padding: 0 30px">
+        <a-button type="primary" @click="confirmClick" v-if="showSubmitButton" style="padding: 0 30px">
           {{ submitButtonText || "确认" }}
         </a-button>
       </a-space>

package/dist/components/p-modal/p-modal.vue

@@ -62,7 +62,7 @@ const confirmClick = async () => {
 
 <template>
   <a-modal
-    v-model:visible="show"
+    v-model:open="show"
     :width="width"
     centered
     wrapClassName="p-modal"

package/dist/components/p-modal-confirm/p-modal-confirm.vue

@@ -44,7 +44,7 @@ const confirmClick = async () => {
 </script>
 
 <template>
-  <a-modal v-model:visible="show" :width="width" centered wrapClassName="p-modal">
+  <a-modal v-model:open="show" :width="width" centered wrapClassName="p-modal">
     <template #title v-if="title">
       <div class="modal-title">
         {{ title }}
@@ -60,7 +60,6 @@ const confirmClick = async () => {
         <a-button
           class="modal-btn modal-cancel-btn"
           @click="show = false"
-          @keydown.enter.prevent="show = false"
         >
           取消
         </a-button>
@@ -72,7 +71,6 @@ const confirmClick = async () => {
             backgroundColor: confrimBtnBgColor,
           }"
           @click="confirmClick"
-          @keydown.enter.prevent="confirmClick"
           :loading="loading"
         >
           确定

package/dist/components/p-modal-form/p-form-modal.vue

@@ -65,8 +65,12 @@ onMounted(() => {
 
 
 const ok = async () => {
-    let formData = await PFormRef.value.getFormData();
-    emits('confirm', formData)
+    try {
+        let formData = await PFormRef.value.getFormData();
+        emits('confirm', formData)
+    } catch (error) {
+        console.warn('Form validation failed:', error);
+    }
 }
 
 

package/dist/components/p-table/p-table.vue

@@ -474,8 +474,8 @@ defineExpose({
       layout="inline"
     >
       <template v-slot:button>
-        <a-button type="primary" @click="searchClick" @keydown.enter.prevent="searchClick" style="margin-left: 20px"> 搜索 </a-button>
-        <a-button style="margin-left: 10px" @click="resetSearch" @keydown.enter.prevent="resetSearch"> 重置 </a-button>
+        <a-button type="primary" @click="searchClick" style="margin-left: 20px"> 搜索 </a-button>
+        <a-button style="margin-left: 10px" @click="resetSearch"> 重置 </a-button>
       </template>
     </PForm>
   </div>
@@ -485,7 +485,7 @@ defineExpose({
     style="display: flex; justify-content: flex-end; gap: 10px; margin-bottom: 10px; padding: 20px"
   >
     <slot name="button"></slot>
-    <a-button v-if="enableExport" type="primary" @click="openExportModal" @keydown.enter.prevent="openExportModal">导出Excel</a-button>
+    <a-button v-if="enableExport" type="primary" @click="openExportModal">导出Excel</a-button>
   </div>
 
   <a-table
@@ -532,16 +532,13 @@ defineExpose({
               v-if="!item.visibleFunc || (item.visibleFunc && item.visibleFunc(record))"
               class="operate-a"
               @click="item.click(record)"
-              @keydown.enter.prevent="item.click(record)"
-              tabindex="0"
-              role="button"
             >
               {{ item.label }}</a
             >
           </span>
-          <a class="operate-a" v-if="editableData[record.index]" @click="save(record.index)" @keydown.enter.prevent="save(record.index)" tabindex="0" role="button">保存</a>
-          <a class="operate-a" v-if="editableData[record.index]" @click="cancel(record.index)" @keydown.enter.prevent="cancel(record.index)" tabindex="0" role="button">退出</a>
-          <a v-if="editColumns.length > 0" class="operate-a" @click="edit(record.index)" @keydown.enter.prevent="edit(record.index)" tabindex="0" role="button">编辑</a>
+          <a class="operate-a" v-if="editableData[record.index]" @click="save(record.index)">保存</a>
+          <a class="operate-a" v-if="editableData[record.index]" @click="cancel(record.index)">退出</a>
+          <a v-if="editColumns.length > 0" class="operate-a" @click="edit(record.index)">编辑</a>
         </div>
       </template>
 

package/package.json

@@ -1,7 +1,6 @@
 {
   "name": "p-pc-ui",
-  "version": "1.3.12",
-  "type": "module",
+  "version": "1.3.13",
   "module": "dist/index.ts",
   "main": "dist/index.ts",
   "files": [