fix(types): add definition for type TNode in common and miniprogram templates (#756)

* fix(types): add definition for type TNode in common and miniprogram templates

* chore: update base.tpl

* fix: fix cr

---------

Co-authored-by: anlyyao <[email protected]>

Author: betavs

packages/products/tdesign-miniprogram/packages/components/common/common.ts

@@ -6,9 +6,6 @@ export interface Styles {
 
 export type ImageEvent = any;
 
-/**
- * 通用全局类型
- * */
 export type PlainObject = { [key: string]: any };
 
 export type OptionData = {
@@ -19,15 +16,18 @@ export type OptionData = {
 export type TreeOptionData<T = string | number> = {
   children?: Array<TreeOptionData<T>> | boolean;
   /** option label content */
-  label?: string | TNode;
+  label?: string;
   /** option search text */
   text?: string;
   /** option value */
   value?: T;
   /** option node content */
-  content?: string | TNode;
+  content?: string;
 } & PlainObject;
 
+/**
+ * 通用全局类型
+ * */
 export type SizeEnum = 'small' | 'medium' | 'large';
 
 export type ShapeEnum = 'circle' | 'round';

packages/products/tdesign-mobile-react/src/common.ts

@@ -36,9 +36,6 @@ export interface UploadDisplayDragEvents {
 
 export type ImageEvent<T = any> = SyntheticEvent<T>;
 
-/**
- * 通用全局类型
- * */
 export type PlainObject = { [key: string]: any };
 
 export type OptionData = {
@@ -58,6 +55,9 @@ export type TreeOptionData<T = string | number> = {
   content?: string | TNode;
 } & PlainObject;
 
+/**
+ * 通用全局类型
+ * */
 export type SizeEnum = 'small' | 'medium' | 'large';
 
 export type ShapeEnum = 'circle' | 'round';

packages/products/tdesign-mobile-vue/src/common.ts

@@ -41,9 +41,6 @@ export interface UploadDisplayDragEvents {
 
 export type ImageEvent = Event;
 
-/**
- * 通用全局类型
- * */
 export type PlainObject = { [key: string]: any };
 
 export type OptionData = {
@@ -63,6 +60,9 @@ export type TreeOptionData<T = string | number> = {
   content?: string | TNode;
 } & PlainObject;
 
+/**
+ * 通用全局类型
+ * */
 export type SizeEnum = 'small' | 'medium' | 'large';
 
 export type ShapeEnum = 'circle' | 'round';

packages/products/tdesign-react/packages/components/common.ts

@@ -36,9 +36,6 @@ export interface UploadDisplayDragEvents {
 
 export type ImageEvent<T = any> = SyntheticEvent<T>;
 
-/**
- * 通用全局类型
- * */
 export type PlainObject = { [key: string]: any };
 
 export type OptionData = {
@@ -58,6 +55,9 @@ export type TreeOptionData<T = string | number> = {
   content?: string | TNode;
 } & PlainObject;
 
+/**
+ * 通用全局类型
+ * */
 export type SizeEnum = 'small' | 'medium' | 'large';
 
 export type ShapeEnum = 'circle' | 'round';

packages/products/tdesign-vue/src/common.ts

@@ -34,9 +34,6 @@ export interface UploadDisplayDragEvents {
 
 export type ImageEvent = Event;
 
-/**
- * 通用全局类型
- * */
 export type PlainObject = { [key: string]: any };
 
 export type OptionData = {
@@ -56,6 +53,9 @@ export type TreeOptionData<T = string | number> = {
   content?: string | TNode;
 } & PlainObject;
 
+/**
+ * 通用全局类型
+ * */
 export type SizeEnum = 'small' | 'medium' | 'large';
 
 export type ShapeEnum = 'circle' | 'round';

packages/scripts/types/global/base.tpl

@@ -2,25 +2,6 @@
 /**
  * 通用全局类型
  * */
-export type PlainObject = { [key: string]: any };
-
-export type OptionData = {
-  label?: string;
-  value?: string | number;
-} & PlainObject;
-
-export type TreeOptionData<T = string | number> = {
-  children?: Array<TreeOptionData<T>> | boolean;
-  /** option label content */
-  label?: string | TNode;
-  /** option search text */
-  text?: string;
-  /** option value */
-  value?: T;
-  /** option node content */
-  content?: string | TNode;
-} & PlainObject;
-
 export type SizeEnum = 'small' | 'medium' | 'large';
 
 export type ShapeEnum = 'circle' | 'round';

packages/scripts/types/global/index.js

@@ -18,20 +18,22 @@ function combineGlobals(framework) {
   // 通用全局变量
   const baseGlobalData = fs.readFileSync(baseGlobalPath);
   // 框架特有全局变量
-  const moreGlobalData = fs.readFileSync(path.resolve(__dirname, current.globalTplPath));
+  const moreGlobalData = fs.readFileSync(
+    path.resolve(__dirname, current.globalTplPath)
+  );
   const outputPath = path.resolve(current.globalPath);
   let data = moreGlobalData.toString() + baseGlobalData.toString();
   if (['React(PC)', 'React(Mobile)'].includes(framework)) {
     data = formatType(data);
   }
-  fs.writeFile(
-    outputPath,
-    data,
-    (err) => {
-      if (err) return console.error(err);
-      console.log(chalk.green(`globals: ${outputPath} has been created successfully!`));
-    },
-  );
+  const callback = (err) => {
+    if (err) return console.error(err);
+    // eslint-disable-next-line no-console
+    console.log(
+      chalk.green(`globals: ${outputPath} has been created successfully!`)
+    );
+  };
+  fs.writeFile(outputPath, data, callback);
 }
 
 module.exports = combineGlobals;

packages/scripts/types/global/miniprogram.tpl

@@ -5,3 +5,22 @@ export interface Styles {
 }
 
 export type ImageEvent = any;
+
+export type PlainObject = { [key: string]: any };
+
+export type OptionData = {
+  label?: string;
+  value?: string | number;
+} & PlainObject;
+
+export type TreeOptionData<T = string | number> = {
+  children?: Array<TreeOptionData<T>> | boolean;
+  /** option label content */
+  label?: string;
+  /** option search text */
+  text?: string;
+  /** option value */
+  value?: T;
+  /** option node content */
+  content?: string;
+} & PlainObject;

packages/scripts/types/global/react.tpl

@@ -35,3 +35,22 @@ export interface UploadDisplayDragEvents {
 }
 
 export type ImageEvent<T = any> = SyntheticEvent<T>;
+
+export type PlainObject = { [key: string]: any };
+
+export type OptionData = {
+  label?: string;
+  value?: string | number;
+} & PlainObject;
+
+export type TreeOptionData<T = string | number> = {
+  children?: Array<TreeOptionData<T>> | boolean;
+  /** option label content */
+  label?: string | TNode;
+  /** option search text */
+  text?: string;
+  /** option value */
+  value?: T;
+  /** option node content */
+  content?: string | TNode;
+} & PlainObject;

packages/scripts/types/global/vue.tpl

@@ -33,3 +33,22 @@ export interface UploadDisplayDragEvents {
 }
 
 export type ImageEvent = Event;
+
+export type PlainObject = { [key: string]: any };
+
+export type OptionData = {
+  label?: string;
+  value?: string | number;
+} & PlainObject;
+
+export type TreeOptionData<T = string | number> = {
+  children?: Array<TreeOptionData<T>> | boolean;
+  /** option label content */
+  label?: string | TNode;
+  /** option search text */
+  text?: string;
+  /** option value */
+  value?: T;
+  /** option node content */
+  content?: string | TNode;
+} & PlainObject;