@_tc/template-core 0.0.1-bate.42 → 0.0.1-bate.43

package/fe/frontend/widgets/defaultPages/Schema/components/CallCom/PopFrom.js

@@ -15,7 +15,7 @@ const generateSchemas = (schema) => {
         return [];
     return Object.keys(schema.properties).reduce((schemas, key) => {
         const fieldInfo = schema.properties[key];
-        const option = fieldInfo.option;
+        const option = fieldInfo?.option;
         if (!option || option.visible === false)
             return schemas;
         const { comType = 'input', default: _defaultValue, visible: _visible, ...fieldProps } = option;
@@ -49,7 +49,7 @@ const generateDefaultValue = (schema, data) => {
     if (!schema?.properties)
         return defaultValue;
     Object.keys(schema.properties).forEach((key) => {
-        const defaultFieldValue = schema.properties[key].option?.default;
+        const defaultFieldValue = schema.properties[key]?.option?.default;
         if (typeof defaultFieldValue !== 'undefined' && typeof defaultValue[key] === 'undefined') {
             defaultValue[key] = defaultFieldValue;
         }

package/fe/model/types/data/component.d.ts

@@ -1,4 +1,4 @@
-import { FormItemProps, InputNumberProps, InputProps, SelectProps } from '../../../packages/ui/react';
+import type { FormFieldType, FormItemProps, SchemaFormAllPropsMap } from '../../../packages/ui/react';
 import { FetchInfo } from './fetchInfo';
 export type ComponentConfig = {
     createForm?: {
@@ -47,15 +47,9 @@ export type ComponentsOption = {
     editForm: ComponentsOption['createForm'];
     detailPanel: {};
 };
-export type ComponentOption = InputOption | SelectOption | InputNumberOption;
-type InputOption = {
-    comType: 'input';
-} & InputProps;
-type InputNumberOption = {
-    comType: 'inputNumber';
-} & InputNumberProps;
-type SelectOption = {
-    comType: 'select';
-} & SelectProps;
-export {};
+export type ComponentOption = {
+    [K in FormFieldType]: {
+        comType: K;
+    } & (K extends keyof SchemaFormAllPropsMap ? SchemaFormAllPropsMap[K] : unknown);
+}[FormFieldType];
 //# sourceMappingURL=component.d.ts.map

package/model/types/data/component.d.ts

@@ -1,4 +1,4 @@
-import { FormItemProps, InputNumberProps, InputProps, SelectProps } from '../../../fe/packages/ui/react';
+import type { FormFieldType, FormItemProps, SchemaFormAllPropsMap } from '../../../fe/packages/ui/react';
 import { FetchInfo } from './fetchInfo';
 export type ComponentConfig = {
     createForm?: {
@@ -47,15 +47,9 @@ export type ComponentsOption = {
     editForm: ComponentsOption['createForm'];
     detailPanel: {};
 };
-export type ComponentOption = InputOption | SelectOption | InputNumberOption;
-type InputOption = {
-    comType: 'input';
-} & InputProps;
-type InputNumberOption = {
-    comType: 'inputNumber';
-} & InputNumberProps;
-type SelectOption = {
-    comType: 'select';
-} & SelectProps;
-export {};
+export type ComponentOption = {
+    [K in FormFieldType]: {
+        comType: K;
+    } & (K extends keyof SchemaFormAllPropsMap ? SchemaFormAllPropsMap[K] : unknown);
+}[FormFieldType];
 //# sourceMappingURL=component.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@_tc/template-core",
-  "version": "0.0.1-bate.42",
+  "version": "0.0.1-bate.43",
   "description": "A TypeScript Koa framework template - Monorepo root",
   "main": "./index.js",
   "types": "./index.d.ts",