@vunk/form 1.1.47 → 1.1.49

package/components/form/index.js

@@ -8,6 +8,7 @@ import { getValue } from '@vunk/core/shared/helper';
 import { VkfTemplatesDefault } from '@vunk/form/components/templates-default';
 import { VkfTemplatesLayout } from '@vunk/form/components/templates-layout';
 import { pickObject } from '@vunk/core/shared/utils-object';
+import { genTemplateIfFunc } from '@vunk/form/shared/form';
 
 var __defProp$1 = Object.defineProperty;
 var __defProps$1 = Object.defineProperties;
@@ -163,6 +164,13 @@ const _sfc_main = defineComponent({
             a.push(c);
             return a;
           }
+          if (Reflect.has(c, "templateIf")) {
+            const templateIfFunc = genTemplateIfFunc(c.templateIf);
+            const flag = templateIfFunc(props2.data);
+            if (!flag) {
+              return a;
+            }
+          }
           const colItem = genColItem(c, props2.colSource);
           if (!lastRow || getRowEmptySpan(lastRow) < itemSpan) {
             a.push(genRowItem(colItem, props2.rowSource));

package/components/form-item-renderer/index.js

@@ -1,4 +1,5 @@
 import { defineComponent, shallowReactive, provide, h, nextTick } from 'vue';
+import { genTemplateIfFunc } from '@vunk/form/shared/form';
 
 const props = {
   source: {
@@ -56,25 +57,13 @@ const VkfFormItemRenderer = defineComponent({
           Reflect.deleteProperty(slotData, "templateType");
           Reflect.deleteProperty(slotData, "templateSlots");
           Reflect.deleteProperty(slotData, "templateIf");
-          const createTemplateIf = () => {
-            if (typeof c.templateIf === "boolean") {
-              const flag = c.templateIf;
-              return () => flag;
-            } else if (typeof c.templateIf === "string") {
-              const templateIf = new Function("data", c.templateIf);
-              return templateIf;
-            } else if (typeof c.templateIf === "function") {
-              return c.templateIf;
-            }
-            return () => true;
-          };
           const nodes = templateInstances[c.templateType].slots.default?.({
             data: slotData,
             raw: c,
             Renderer,
             k: currentK,
             key: currentK.join(",") + "-" + c.templateType + "-" + c?.prop || "no-prop",
-            templateIf: createTemplateIf()
+            templateIf: genTemplateIfFunc(c.templateIf)
           });
           nodes && a.push(nodes);
         } else if (c.templateSlots?.default) {

package/components/templates-default/index.js

@@ -256,8 +256,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       _: 1
     }),
     createVNode(_component_VkfFormItemRendererTemplate, { type: "Component" }, {
-      default: withCtx(({ data, raw, templateIf }) => [
-        templateIf(data) ? (openBlock(), createBlock(resolveDynamicComponent(typeof data.is === "function" ? data.is(raw) : data.is), normalizeProps(mergeProps({ key: 0 }, _ctx.pickObject(data, { excludes: ["is"] }))), null, 16)) : createCommentVNode("v-if", true)
+      default: withCtx(({ data: props2, raw, templateIf }) => [
+        templateIf(_ctx.data) ? (openBlock(), createBlock(resolveDynamicComponent(typeof raw.is === "function" ? raw.is(raw) : raw.is), normalizeProps(mergeProps({ key: 0 }, _ctx.pickObject(props2, { excludes: ["is"] }))), null, 16)) : createCommentVNode("v-if", true)
       ]),
       _: 1
     })

package/components/upload-plus/index.js

@@ -1,6 +1,6 @@
 import { _VkfFormItemCtx, VkfFormItem } from '@vunk/form/components/form-item';
 import { openBlock, createElementBlock, createElementVNode, defineComponent, reactive, ref, computed, watchEffect, resolveComponent, createBlock, mergeProps, withCtx, createVNode, normalizeClass, createCommentVNode, Fragment, renderList, normalizeStyle, createTextVNode } from 'vue';
-import { ElInput, ElButtonGroup, ElButton, ElIcon } from 'element-plus';
+import { ElInput, ElButtonGroup, ElButton, ElIcon, ElMessage } from 'element-plus';
 import { createFileChunk, calculateFileHashSample } from '@vunk/form/shared/upload';
 import { RestFetch } from '@vunk/core/shared/utils-fetch';
 
@@ -37,7 +37,9 @@ const props = __spreadProps(__spreadValues({}, _VkfFormItemCtx.props), {
     default: ""
   }
 });
-const emits = {};
+const emits = {
+  success: (file) => file
+};
 
 var Status = /* @__PURE__ */ ((Status2) => {
   Status2["wait"] = "wait";
@@ -111,7 +113,7 @@ const merge = async (data) => {
     url: "/dict/nfs/chunk/merge",
     data
   }).then((res) => {
-    return res.datas;
+    return res.data;
   });
 };
 
@@ -360,6 +362,13 @@ const _sfc_main = defineComponent({
         filename: container.file.name,
         identifier: container.hash,
         dictId: props2.dictId
+      }).then((res) => {
+        emit("success", res);
+      }).catch(() => {
+        ElMessage({
+          type: "error",
+          message: "\u5408\u5E76\u5931\u8D25"
+        });
       });
     }
     return {

package/components/upload-plus/src/api.d.ts

@@ -1,5 +1,5 @@
 import { RestFetch } from '@vunk/core/shared/utils-fetch';
-import { Chunk } from './types';
+import { Chunk, FileInfo } from './types';
 export declare const restFetch: RestFetch;
 /**
  * https://app.apifox.com/link/project/2335162/apis/api-92811427
@@ -28,4 +28,4 @@ export declare const merge: (data: {
     identifier: string;
     filename: string;
     dictId?: string;
-}) => Promise<any>;
+}) => Promise<FileInfo>;

package/components/upload-plus/src/api.js

@@ -58,7 +58,7 @@ const merge = async (data) => {
     url: "/dict/nfs/chunk/merge",
     data
   }).then((res) => {
-    return res.datas;
+    return res.data;
   });
 };
 

package/components/upload-plus/src/ctx.d.ts

@@ -1,3 +1,4 @@
+import { FileInfo } from './types';
 export declare const props: {
     size: {
         type: NumberConstructor;
@@ -40,6 +41,9 @@ export declare const props: {
     inlineMessage: import("element-plus/es/utils").EpPropFinalized<readonly [StringConstructor, BooleanConstructor], unknown, unknown, "", boolean>;
     showMessage: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     formItemSize: {
+        /**
+         * 上传目录
+         */
         type: import("vue").PropType<"default" | "small" | "large">;
         default: string;
     };
@@ -64,4 +68,6 @@ export declare const props: {
         default: string;
     };
 };
-export declare const emits: {};
+export declare const emits: {
+    success: (file: FileInfo) => FileInfo;
+};

package/components/upload-plus/src/ctx.js

@@ -33,6 +33,8 @@ const props = __spreadProps(__spreadValues({}, _VkfFormItemCtx.props), {
     default: ""
   }
 });
-const emits = {};
+const emits = {
+  success: (file) => file
+};
 
 export { emits, props };

package/components/upload-plus/src/index.vue.d.ts

@@ -103,7 +103,9 @@ declare const _default: import("vue").DefineComponent<{
     Status: typeof Status;
     filePrefixIcon: import("vue").ComputedRef<import("vue").DefineComponent<{}, {}, {}, import("vue").ComputedOptions, import("vue").MethodOptions, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>>;
     handlePause: () => void;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+    success: (file: import("./types").FileInfo) => import("./types").FileInfo;
+}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     size: {
         type: NumberConstructor;
         default: number;
@@ -165,7 +167,9 @@ declare const _default: import("vue").DefineComponent<{
         type: import("vue").PropType<"right">;
         default: string;
     };
-}>>, {
+}>> & {
+    onSuccess?: ((file: import("./types").FileInfo) => any) | undefined;
+}, {
     required: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
     labelWidth: import("element-plus/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown>;
     inlineMessage: import("element-plus/es/utils").EpPropMergeType<readonly [StringConstructor, BooleanConstructor], unknown, unknown>;

package/components/upload-plus/src/types.d.ts

@@ -21,4 +21,15 @@ export interface Chunk {
     sliceSize: number;
     status: Status;
 }
+/**
+ * @example
+ *    "filePath": "/raster/07b93085a0a5145cb09d9a1d39f43c07_微信图片_20211017140156.png",
+        "fileName": "微信图片_20211017140156.png",
+        "fileId": "/raster/07b93085a0a5145cb09d9a1d39f43c07_微信图片_20211017140156.png"
+ */
+export interface FileInfo {
+    filePath: string;
+    fileName: string;
+    fileId: string;
+}
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vunk/form",
-  "version": "1.1.47",
+  "version": "1.1.49",
   "description": "",
   "main": "index.esm.js",
   "scripts": {

package/shared/form/index.d.ts

@@ -1,3 +1,4 @@
+import { Func, NormalObject } from '@vunk/core';
 /**
  * 表单验证失败, 处理方式
  * 消息提示
@@ -7,3 +8,11 @@ export declare const validateCatch: (err: any, init?: {
     prefix?: string;
     suffix?: string;
 }) => void;
+/**
+ * 根据 templateIf 生成 显隐函数
+ * @param templateIfRaw
+ * @returns
+ */
+export declare const genTemplateIfFunc: Func<[
+    any
+], (e?: NormalObject) => boolean>;

package/shared/form/index.js

@@ -14,5 +14,17 @@ const validateCatch = (err, init = {}) => {
     message: msg
   });
 };
+const genTemplateIfFunc = (templateIfRaw) => {
+  if (typeof templateIfRaw === "boolean") {
+    const flag = templateIfRaw;
+    return () => flag;
+  } else if (typeof templateIfRaw === "string") {
+    const templateIf = new Function("data", templateIfRaw);
+    return templateIf;
+  } else if (typeof templateIfRaw === "function") {
+    return templateIfRaw;
+  }
+  return () => true;
+};
 
-export { validateCatch };
+export { genTemplateIfFunc, validateCatch };