@tmagic/form 1.5.16 → 1.5.18

package/dist/tmagic-form.js

@@ -7,6 +7,7 @@ import dayjs from 'dayjs';
 import utc from 'dayjs/plugin/utc';
 import Sortable from 'sortablejs';
 import { createPopper } from '@popperjs/core';
+export * from '@tmagic/form-schema';
 
 const isTableSelect = (type) => typeof type === "string" && ["table-select", "tableSelect"].includes(type);
 const asyncLoadConfig = (value, initValue2, { asyncLoad, name, type }) => {
@@ -4095,7 +4096,10 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
       if (typeof option.beforeRequest === "function") {
         postOptions = option.beforeRequest(mForm, postOptions, {
           model: props.model,
-          formValue: mForm?.values
+          formValue: mForm?.values,
+          formValues: mForm?.values,
+          prop: props.prop,
+          config: props.config
         });
       }
       if (option.method?.toLocaleLowerCase() === "jsonp") {
@@ -4108,6 +4112,7 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
           formValue: mForm?.values,
           formValues: mForm?.values,
           config: props.config,
+          prop: props.prop,
           postOptions
         });
       }
@@ -4193,7 +4198,10 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
       if (typeof option.beforeInitRequest === "function") {
         postOptions = option.beforeInitRequest(mForm, postOptions, {
           model: props.model,
-          formValue: mForm?.values
+          formValue: mForm?.values,
+          formValues: mForm?.values,
+          config: props.config,
+          prop: props.prop
         });
       }
       if (option.method?.toLocaleLowerCase() === "jsonp") {
@@ -4207,6 +4215,7 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
           formValue: mForm?.values,
           formValues: mForm?.values,
           config: props.config,
+          prop: props.prop,
           postOptions
         });
       }

package/dist/tmagic-form.umd.cjs

@@ -1,8 +1,8 @@
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('vue'), require('@element-plus/icons-vue'), require('@tmagic/design'), require('@tmagic/utils'), require('dayjs'), require('dayjs/plugin/utc'), require('sortablejs'), require('@popperjs/core')) :
-  typeof define === 'function' && define.amd ? define(['exports', 'vue', '@element-plus/icons-vue', '@tmagic/design', '@tmagic/utils', 'dayjs', 'dayjs/plugin/utc', 'sortablejs', '@popperjs/core'], factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.TMagicForm = {}, global.Vue, global.iconsVue, global.design, global.utils, global.dayjs, global.utc, global.Sortable, global.core));
-})(this, (function (exports, vue, iconsVue, design, utils, dayjs, utc, Sortable, core) { 'use strict';
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('vue'), require('@element-plus/icons-vue'), require('@tmagic/design'), require('@tmagic/utils'), require('dayjs'), require('dayjs/plugin/utc'), require('sortablejs'), require('@popperjs/core'), require('@tmagic/form-schema')) :
+  typeof define === 'function' && define.amd ? define(['exports', 'vue', '@element-plus/icons-vue', '@tmagic/design', '@tmagic/utils', 'dayjs', 'dayjs/plugin/utc', 'sortablejs', '@popperjs/core', '@tmagic/form-schema'], factory) :
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.TMagicForm = {}, global.Vue, global.iconsVue, global.design, global.utils, global.dayjs, global.utc, global.Sortable, global.core, global.formSchema));
+})(this, (function (exports, vue, iconsVue, design, utils, dayjs, utc, Sortable, core, formSchema) { 'use strict';
 
   /** Detect free variable `global` from Node.js. */
   var freeGlobal = typeof global == 'object' && global && global.Object === Object && global;
@@ -7026,7 +7026,10 @@
         if (typeof option.beforeRequest === "function") {
           postOptions = option.beforeRequest(mForm, postOptions, {
             model: props.model,
-            formValue: mForm?.values
+            formValue: mForm?.values,
+            formValues: mForm?.values,
+            prop: props.prop,
+            config: props.config
           });
         }
         if (option.method?.toLocaleLowerCase() === "jsonp") {
@@ -7039,6 +7042,7 @@
             formValue: mForm?.values,
             formValues: mForm?.values,
             config: props.config,
+            prop: props.prop,
             postOptions
           });
         }
@@ -7124,7 +7128,10 @@
         if (typeof option.beforeInitRequest === "function") {
           postOptions = option.beforeInitRequest(mForm, postOptions, {
             model: props.model,
-            formValue: mForm?.values
+            formValue: mForm?.values,
+            formValues: mForm?.values,
+            config: props.config,
+            prop: props.prop
           });
         }
         if (option.method?.toLocaleLowerCase() === "jsonp") {
@@ -7138,6 +7145,7 @@
             formValue: mForm?.values,
             formValues: mForm?.values,
             config: props.config,
+            prop: props.prop,
             postOptions
           });
         }
@@ -8245,6 +8253,12 @@
   exports.getRules = getRules;
   exports.initValue = initValue;
   exports.useAddField = useAddField;
+  Object.keys(formSchema).forEach(k => {
+    if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
+      enumerable: true,
+      get: () => formSchema[k]
+    });
+  });
 
   Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: 'Module' } });
 

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.5.16",
+  "version": "1.5.18",
   "name": "@tmagic/form",
   "type": "module",
   "sideEffects": [
@@ -51,8 +51,9 @@
   "peerDependencies": {
     "vue": ">=3.5.0",
     "typescript": "*",
-    "@tmagic/design": "1.5.16",
-    "@tmagic/utils": "1.5.16"
+    "@tmagic/form-schema": "1.5.18",
+    "@tmagic/design": "1.5.18",
+    "@tmagic/utils": "1.5.18"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/Form.vue

@@ -13,7 +13,7 @@
       <Container
         v-for="(item, index) in config"
         :disabled="disabled"
-        :key="item[keyProp] ?? index"
+        :key="(item as Record<string, any>)[keyProp] ?? index"
         :config="item"
         :model="values"
         :last-values="lastValuesProcessed"

package/src/containers/Panel.vue

@@ -20,7 +20,7 @@
         <div style="flex: 1">
           <Container
             v-for="(item, index) in items"
-            :key="item[mForm?.keyProp || '__key'] ?? index"
+            :key="(item as Record<string, any>)[mForm?.keyProp || '__key'] ?? index"
             :config="item"
             :model="name ? model[name] : model"
             :lastValues="name ? lastValues[name] : lastValues"
@@ -40,7 +40,7 @@
       <template v-else>
         <Container
           v-for="(item, index) in items"
-          :key="item[mForm?.keyProp || '__key'] ?? index"
+          :key="(item as Record<string, any>)[mForm?.keyProp || '__key'] ?? index"
           :config="item"
           :model="name ? model[name] : model"
           :lastValues="name ? lastValues[name] : lastValues"

package/src/containers/Row.vue

@@ -2,7 +2,7 @@
   <TMagicRow :gutter="10">
     <Col
       v-for="(col, index) in config.items"
-      :key="col[mForm?.keyProp || '__key'] ?? index"
+      :key="(col as Record<string, any>)[mForm?.keyProp || '__key'] ?? index"
       :span="col.span || config.span || 24 / config.items.length"
       :config="col"
       :labelWidth="config.labelWidth || labelWidth"

package/src/containers/Step.vue

@@ -15,7 +15,7 @@
         <Container
           v-if="item"
           v-show="active - 1 === index"
-          :key="item[mForm?.keyProp || '__key']"
+          :key="(item as Record<string, any>)[mForm?.keyProp || '__key']"
           :config="item"
           :model="step.name ? model[step.name] : model"
           :lastValues="step.name ? lastValues[step.name] : lastValues"

package/src/containers/Tabs.vue

@@ -34,7 +34,7 @@
       </template>
       <Container
         v-for="item in tabItems(tab)"
-        :key="item[mForm?.keyProp || '__key']"
+        :key="(item as Record<string, any>)[mForm?.keyProp || '__key']"
         :config="item"
         :disabled="disabled"
         :model="

package/src/fields/Select.vue

@@ -191,6 +191,9 @@ const getOptions = async () => {
     postOptions = option.beforeRequest(mForm, postOptions, {
       model: props.model,
       formValue: mForm?.values,
+      formValues: mForm?.values,
+      prop: props.prop,
+      config: props.config,
     });
   }
 
@@ -206,6 +209,7 @@ const getOptions = async () => {
       formValue: mForm?.values,
       formValues: mForm?.values,
       config: props.config,
+      prop: props.prop,
       postOptions,
     });
   }
@@ -315,6 +319,9 @@ const getInitOption = async () => {
     postOptions = option.beforeInitRequest(mForm, postOptions, {
       model: props.model,
       formValue: mForm?.values,
+      formValues: mForm?.values,
+      config: props.config,
+      prop: props.prop,
     });
   }
 
@@ -331,6 +338,7 @@ const getInitOption = async () => {
       formValue: mForm?.values,
       formValues: mForm?.values,
       config: props.config,
+      prop: props.prop,
       postOptions,
     });
   }