p-pc-ui 1.2.1 → 1.2.2

package/dist/components/p-form/index.d.ts

@@ -74,7 +74,7 @@ interface UploadBase extends Base {
 
 export interface UploadOss extends UploadBase {
     type: 'uploadOss',
-    getOssToken: (file_name) => Promise<any>,
+    getOssToken: ({file_name}) => Promise<any>,
     baseOssUrl: string,
 }
 

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

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref, reactive, onMounted, render, onBeforeMount, useSlots, toRaw, shallowRef } from "vue";
-import type { FormDataItem } from "./index.d";
+import type { FormDataItem } from "./index";
 import {
   Button as AButton,
   message,
@@ -80,15 +80,21 @@ const disposeRenderData = (renderData: FormDataItem[]) => {
   const _renderData = _.cloneDeep(renderData).map((val) => ({
     ...val,
     rules: [] as any,
-  }));
+  })) as (FormDataItem & {rules:[]})[];
 
   for (const renderItem of _renderData) {
-    const { fieldType, fieldRules, label } = renderItem;
+    let { fieldType, fieldRules, label } = renderItem;
     // 处理校验规则
     const rules: any = [];
     const operateType = ["select", "treeSeect", "date", "datePicker"].includes(renderItem.type) ? "选择" : "输入";
     for (const fieldRule of fieldRules || []) {
       const { msg, required, min, max } = fieldRule;
+      
+      // 图片需要额外处理
+
+      if((renderItem.type == 'uploadOss' || renderItem.type== 'upload') && renderItem.fieldType == 'string'){
+          fieldType ='array'
+      }
 
       if (required) {
         rules.push({
@@ -184,7 +190,7 @@ const initFormState = (renderData: FormDataItem[], initFromData = {}) => {
           break;
         case "string":
           // 如果是图片类型, 并且是string类型,代表用户只需要1张图片,并且已文本的形式存放
-          if (renderItem.type == "uploadOss") {
+          if (renderItem.type == "uploadOss" || renderItem.type == 'upload') {
             initValue = [];
           } else {
             initValue = "";
@@ -272,9 +278,9 @@ const getFormData = async (options: { no_check?: Boolean } = {}) => {
     else if (renderItem.type == "uploadOss") {
       const fileData = toRaw(formData[key]);
       console.log("asdasdasd", fileData);
-      const keys = fileData.map((val) => val.response.key);
+      const keys = fileData.map((val)=>{return val?.response?.key ||  val.key});
       returnFormData[key] = renderItem?.fieldType == "string" ? keys[0] : keys;
-    }
+    } 
     // 获取file对象
     else if (renderItem.type == "upload") {
       console.log("上传数据", formState[key]);
@@ -368,7 +374,8 @@ const uploadRequest = async (options, renderItem: FormDataItem) => {
   if (renderItem.type == "uploadOss") {
     const config: any = await renderItem.getOssToken({ file_name: file.name });
 
-    const key = await uploadOss(file, config.key);
+    const key = await uploadOss(file, config);
+    console.log("上传结果",key)
 
     options.onSuccess({ key }, file);
   } else {

package/dist/components/p-table/index.d.ts

@@ -1,6 +1,5 @@
 
 interface TableBase {
-    key: string;
     title: string;
     width?: number;
     sorter?: boolean;
@@ -11,6 +10,7 @@ interface TableBase {
 }
 
 interface TablePic extends TableBase {
+    key: string;
     type: 'pic';
     showOssUrlFunc?: (ossKey: string) => string;
     picWidth?: number;
@@ -18,21 +18,23 @@ interface TablePic extends TableBase {
 }
 
 interface TableLink extends TableBase {
+    key: string;
     type: 'link';
 }
 
 interface TableCommon extends TableBase {
-    type?: 'common';
+    key: string;
+    type: 'common';
 }
 
 interface TableDate extends TableBase {
+    key: string;
     type: 'date';
     format?: string;
 }
 
 interface TableOperate extends TableBase {
     type: 'operate',
-    key?: string,
     operateButtons: { label: string; click: Function; visibleFunc?: Function }[];
 
 }

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

@@ -1,4 +1,3 @@
-
 <script lang="ts" setup>
 // import "viewerjs/dist/viewer.css";
 import { api as viewerApi } from "v-viewer";
@@ -6,7 +5,7 @@ import PForm from "../p-form/p-form.vue";
 import { h, ref, reactive, onMounted, toRaw } from "vue";
 import * as _ from "../../utils/dataUtils";
 import dayjs from "dayjs";
-import {Table as ATable} from 'ant-design-vue'
+import { Table as ATable, Button as AButton } from "ant-design-vue";
 import type { FormDataItem } from "../p-form/index.d";
 import type { TableColumn } from "./index.d";
 const SearchFormRef = ref();
@@ -237,7 +236,7 @@ defineExpose({
       :is-search-form="true"
       :render-data="searchRenderData"
       :init-form="initSearchFormData"
-      layout="row"
+      layout="inline"
     >
       <template v-slot:button>
         <a-button type="primary" @click="searchClick" style="margin-left: 20px"> 搜索 </a-button>
@@ -270,11 +269,13 @@ defineExpose({
     }"
     bordered
     @change="onchange"
-  ></a-table>
+  >
+    <template #bodyCell="slotProps">
+      <slot name="bodyCell" v-bind="slotProps" />
+    </template>
+  </a-table>
 </template>
 
-
-
 <style>
 .ant-table-striped :deep(.table-striped) td {
   background-color: #fafafa;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "p-pc-ui",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "type": "module",
   "module": "dist/index.ts",
   "main": "dist/index.ts",