@tmagic/form 1.3.0-alpha.7 → 1.3.0-alpha.9

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.3.0-alpha.7",
+  "version": "1.3.0-alpha.9",
   "name": "@tmagic/form",
   "type": "module",
   "sideEffects": [
@@ -36,8 +36,8 @@
   },
   "dependencies": {
     "@element-plus/icons-vue": "^2.0.9",
-    "@tmagic/design": "1.3.0-alpha.7",
-    "@tmagic/utils": "1.3.0-alpha.7",
+    "@tmagic/design": "1.3.0-alpha.9",
+    "@tmagic/utils": "1.3.0-alpha.9",
     "lodash-es": "^4.17.21",
     "sortablejs": "^1.14.0",
     "vue": "^3.3.4"

package/src/fields/Select.vue

@@ -82,13 +82,17 @@ const equalValue = (value: any, v: any): boolean => {
 };
 
 const mapOptions = (data: any[]) => {
-  const { option } = props.config;
-  const { text } = option;
-  const { value } = option;
+  const {
+    option = {
+      text: 'text',
+      value: 'value',
+    },
+  } = props.config;
+  const { text = 'text', value = 'value' } = option;
 
   return data.map((item) => ({
-    text: typeof text === 'function' ? text(item) : item[text || 'text'],
-    value: typeof value === 'function' ? value(item) : item[value || 'value'],
+    text: typeof text === 'function' ? text(item) : item[text],
+    value: typeof value === 'function' ? value(item) : item[value],
   }));
 };
 
@@ -103,8 +107,10 @@ const getOptions = async () => {
 
   let items: SelectOption[] | SelectGroupOption[] = [];
 
-  const { config } = props;
-  const { option } = config;
+  const { option } = props.config;
+
+  if (!option) return [];
+
   const { root = '', totalKey = 'total' } = option;
   let { body = {}, url } = option;
 
@@ -224,8 +230,10 @@ const getInitLocalOption = async () => {
 const getInitOption = async () => {
   if (!props.model) return [];
 
-  const { config } = props;
-  const { option } = config;
+  const { option } = props.config;
+
+  if (!option) return [];
+
   const { root = '', initRoot = '' } = option;
   let { initBody = {} } = option;
 

package/src/schema.ts

@@ -435,9 +435,9 @@ export interface SelectConfig extends FormItem, Input {
   allowCreate?: boolean;
   filterable?: boolean;
   group?: boolean;
-  options: SelectConfigOption[] | SelectConfigGroupOption[] | SelectOptionFunction;
-  remote: true;
-  option: {
+  options?: SelectConfigOption[] | SelectConfigGroupOption[] | SelectOptionFunction;
+  remote?: true;
+  option?: {
     url: string | ((mForm: FormState | undefined, data: { model: any; formValue: any }) => string);
     initUrl?: string | ((mForm: FormState | undefined, data: { model: any; formValue: any }) => string);
     method?: 'jsonp' | string;

package/types/schema.d.ts

@@ -347,9 +347,9 @@ export interface SelectConfig extends FormItem, Input {
     allowCreate?: boolean;
     filterable?: boolean;
     group?: boolean;
-    options: SelectConfigOption[] | SelectConfigGroupOption[] | SelectOptionFunction;
-    remote: true;
-    option: {
+    options?: SelectConfigOption[] | SelectConfigGroupOption[] | SelectOptionFunction;
+    remote?: true;
+    option?: {
         url: string | ((mForm: FormState | undefined, data: {
             model: any;
             formValue: any;