p-pc-ui 1.2.7 → 1.2.9

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

@@ -79,6 +79,13 @@ export interface UploadOss<K extends string = string> extends UploadBase<K> {
     baseOssUrl: string,
 }
 
+export interface UploadTos<K extends string = string> extends UploadBase<K> {
+    type: 'uploadTos',
+    getTosToken: ({file_name}) => Promise<any>,
+    baseTosUrl: string,
+}
+
+
 
 export interface Upload<K extends string = string> extends UploadBase<K> {
     type: 'upload',
@@ -113,6 +120,7 @@ export type FormDataItem<K extends string = string> =
     | Select<K>
     | Upload<K>
     | UploadOss<K>
+    | UploadTos<K>
     | Textarea<K>
     | DatePicker<K>
     | Component<K>

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

@@ -65,8 +65,8 @@ const emits = defineEmits(["confirm"]);
  */
 const editorRef = shallowRef();
 
-onBeforeMount(async() => {
-  renderData.value =await disposeRenderData(props.renderData);
+onBeforeMount(async () => {
+  renderData.value = await disposeRenderData(props.renderData);
   const _formState = initFormState(renderData.value, props.initForm);
   for (const key in _formState) {
     formState[key] = _formState[key];
@@ -76,11 +76,11 @@ onBeforeMount(async() => {
 /**
  * 处理渲染表单
  */
-const disposeRenderData = async(renderData: FormDataItem[]) => {
+const disposeRenderData = async (renderData: FormDataItem[]) => {
   const _renderData = _.cloneDeep(renderData).map((val) => ({
     ...val,
     rules: [] as any,
-  })) as (FormDataItem & {rules:[]})[];
+  })) as (FormDataItem & { rules: [] })[];
 
   for (const renderItem of _renderData) {
     let { fieldType, fieldRules, label } = renderItem;
@@ -89,16 +89,19 @@ const disposeRenderData = async(renderData: FormDataItem[]) => {
     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 (
+        (renderItem.type == "uploadOss" || renderItem.type == "uploadTos" || renderItem.type == "upload") &&
+        renderItem.fieldType == "string"
+      ) {
+        fieldType = "array";
       }
 
       if (required) {
         rules.push({
-          type: renderItem.type == "uploadOss" ? "array" : renderItem.fieldType,
+          type: renderItem.type == "uploadOss" || renderItem.type == "uploadTos" ? "array" : renderItem.fieldType,
           required: true,
           message: msg || `请${operateType}${label}`,
           trigger: "blur",
@@ -135,10 +138,10 @@ const disposeRenderData = async(renderData: FormDataItem[]) => {
           renderItem.placeholder = "加载中" + point.join("");
         }, 500);
 
-        const res = await  renderItem.loadDataFunc()
+        const res = await renderItem.loadDataFunc();
         renderItem["optionList"] = res;
-          clearInterval(interval);
-          renderItem.placeholder = `请选择${renderItem.label}`;
+        clearInterval(interval);
+        renderItem.placeholder = `请选择${renderItem.label}`;
       }
 
       // 渲染搜索框下拉框
@@ -188,7 +191,7 @@ const initFormState = (renderData: FormDataItem[], initFromData = {}) => {
           break;
         case "string":
           // 如果是图片类型, 并且是string类型,代表用户只需要1张图片,并且已文本的形式存放
-          if (renderItem.type == "uploadOss" || renderItem.type == 'upload') {
+          if (renderItem.type == "uploadOss" || renderItem.type == "uploadTos" || renderItem.type == "upload") {
             initValue = [];
           } else {
             initValue = "";
@@ -214,18 +217,13 @@ const initFormState = (renderData: FormDataItem[], initFromData = {}) => {
         renderItem.optionList = [];
       }
 
-
-      if (!initValue && renderItem.optionList ) {
+      if (!initValue && renderItem.optionList) {
         initValue = renderItem["optionList"][0]?.id;
       }
 
-
-      if(renderItem.loadDataFunc){
-        initValue =undefined
+      if (renderItem.loadDataFunc) {
+        initValue = undefined;
       }
-     
-
-
     } else if (renderItem.type == "uploadOss") {
       if (!_.isArray(initValue)) {
         initValue = [initValue];
@@ -280,13 +278,14 @@ const getFormData = async (options: { no_check?: Boolean } = {}) => {
     if (renderItem?.visibleHook && !renderItem.visibleHook(formData)) {
       continue;
     }
-
     // 上传到oss
-    else if (renderItem.type == "uploadOss") {
+    else if (renderItem.type == "uploadOss" || renderItem.type == "uploadTos") {
       const fileData = toRaw(formData[key]);
-      const keys = fileData.map((val)=>{return val?.response?.key ||  val.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") {
       const formatData = formState[key].map((val) => ({ base64: val.thumbUrl, file: val.originFileObj }));
@@ -368,6 +367,25 @@ const uploadOss = async (file, config) => {
   return config.key;
 };
 
+/**
+ * 上传到火山云TOS
+ */
+const uploadTos = async (file, config) => {
+  const formData = new FormData();
+  formData.append("key", config["key"]);
+  formData.append("policy", config["policy"]);
+  formData.append("x-tos-algorithm", config["x-tos-algorithm"]);
+  formData.append("x-tos-credential", config["x-tos-credential"]);
+  formData.append("x-tos-date", config["x-tos-date"]);
+  formData.append("x-tos-signature", config["x-tos-signature"]);
+  formData.append("file", file, file.fileName || file.name);
+  await fetch(config.host, {
+    method: "POST",
+    body: formData,
+  });
+
+  return config["key"];
+};
 /**
  * 自定义上传事件
  */
@@ -375,9 +393,11 @@ const uploadRequest = async (options, renderItem: FormDataItem) => {
   const file = options.file;
   if (renderItem.type == "uploadOss") {
     const config: any = await renderItem.getOssToken({ file_name: file.name });
-
     const key = await uploadOss(file, config);
-
+    options.onSuccess({ key }, file);
+  } else if (renderItem.type == "uploadTos") {
+    const config: any = await renderItem.getTosToken({ file_name: file.name });
+    const key = await uploadTos(file, config);
     options.onSuccess({ key }, file);
   } else {
     setTimeout(() => {
@@ -398,7 +418,6 @@ const editorUpload = async (renderItem, file, insertFn) => {
   insertFn(renderItem.baseOssUrl + key);
 };
 
-
 /**
  * 发送验证码
  */
@@ -571,7 +590,7 @@ defineExpose({
         ></a-tree-select>
 
         <a-upload
-          v-if="renderItem.type == 'uploadOss' || renderItem.type == 'upload'"
+          v-if="renderItem.type == 'uploadOss' || renderItem.type == 'uploadTos' || renderItem.type == 'upload'"
           :file-list="formState[renderItem.key]"
           :multiple="true"
           :max-count="renderItem?.maxCount || 1"

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "p-pc-ui",
-  "version": "1.2.7",
+  "version": "1.2.9",
   "type": "module",
-  "module": "index.ts",
+  "module": "dist/index.ts",
   "main": "dist/index.ts",
   "files": [
     "dist"