@lingxiteam/ebe-utils 0.1.33 → 0.2.0

package/es/index.d.ts

@@ -71,7 +71,7 @@ export declare const init: () => Promise<void>;
 export declare const fetchData: ({ appId, services, platform, baseUrl, onProgress, needTranslatePagePathToEnglish, incrementalConstruction, hasAppFileResource, hasExtendsApp, }: CodeOptions) => Promise<{
     options: {
         platform: string;
-        appId: string;
+        appId: any;
         pageIdMapping: any;
         compAssetList: any;
         baseUrl: string;

package/es/index.js

@@ -32,11 +32,15 @@ var isArray = function isArray(arr) {
   }
 };
 export var clearAppInfo = function clearAppInfo(appInfo) {
-  var includes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ['appId', 'appCode', 'appName', 'applicationIcon', 'updatorId', 'updatedTime'];
+  var includes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ['appId', 'appCode', 'appName', 'applicationIcon', 'updatorId', 'initialAppId', 'updatedTime'];
   return Object.keys(appInfo || {}).reduce(function (pre, key) {
     if (includes.includes(key)) {
       pre[key] = appInfo[key];
     }
+    // 如果存在 initialAppId 则需要覆盖 appId
+    if (pre.initialAppId) {
+      pre.appId = pre.initialAppId;
+    }
     return pre;
   }, {});
 };
@@ -748,7 +752,7 @@ export var fetchData = /*#__PURE__*/function () {
           pageRules = _context3.sent;
           options = {
             platform: getPlatform(platform),
-            appId: appId,
+            appId: appInfo.initialAppId,
             pageIdMapping: pageIdMapping,
             compAssetList: compAssetList || [],
             baseUrl: baseUrl,

package/es/node/copyStatic.js

@@ -1,4 +1,4 @@
-import fs from 'fs';
+import fs from 'fs-extra';
 import path from 'path';
 
 /**

package/lib/node/copyStatic.js

@@ -32,21 +32,21 @@ __export(copyStatic_exports, {
   copyStatic: () => copyStatic
 });
 module.exports = __toCommonJS(copyStatic_exports);
-var import_fs = __toESM(require("fs"));
+var import_fs_extra = __toESM(require("fs-extra"));
 var import_path = __toESM(require("path"));
 var copyStatic = (target, output) => {
   const copyRecursive = (source, destination) => {
-    if (import_fs.default.lstatSync(source).isDirectory()) {
-      if (!import_fs.default.existsSync(destination)) {
-        import_fs.default.mkdirSync(destination);
+    if (import_fs_extra.default.lstatSync(source).isDirectory()) {
+      if (!import_fs_extra.default.existsSync(destination)) {
+        import_fs_extra.default.mkdirSync(destination);
       }
-      import_fs.default.readdirSync(source).forEach((file) => {
+      import_fs_extra.default.readdirSync(source).forEach((file) => {
         const sourcePath = import_path.default.join(source, file);
         const destinationPath = import_path.default.join(destination, file);
         copyRecursive(sourcePath, destinationPath);
       });
     } else {
-      import_fs.default.copyFileSync(source, destination);
+      import_fs_extra.default.copyFileSync(source, destination);
     }
   };
   copyRecursive(target, output);

package/lib/pcpublic/src/components/pcfactory/src/ReactECharts/ReactECharts.tsx

@@ -458,14 +458,70 @@ const ReactECharts: LingXiFC<MyReactEChartsProps> = (props, ref) => {
           obj = {
             type,
             ...obj,
-            data: datasource?.map((j: Record<string, any>) => j[`y${i}`]) || [],
+            data:
+              datasource?.map((j: Record<string, any>) => {
+                if (
+                  Object.prototype.toString.call(chartColor) ===
+                  '[object Object]'
+                ) {
+                  if (chartColor.targetVal) {
+                    const itemStyle = sandBoxSafeRun(chartColor.targetVal, {
+                      charItem: j,
+                    });
+                    if (typeof itemStyle === 'string') {
+                      return {
+                        value: j[`y${i}`],
+                        itemStyle: {
+                          color: itemStyle,
+                        },
+                      };
+                    }
+                    if (
+                      Object.prototype.toString.call(itemStyle) ===
+                      '[object Object]'
+                    ) {
+                      return {
+                        value: j[`y${i}`],
+                        itemStyle,
+                      };
+                    }
+                  }
+                }
+                return j[`y${i}`];
+              }) || [],
           };
           if (isDataMap) {
             obj.data =
-              datasource?.map(
-                (j: Record<string, any>) =>
-                  j[(transferDataMap as any)[`y${i}`] || `y${i}`],
-              ) || [];
+              datasource?.map((j: Record<string, any>) => {
+                if (
+                  Object.prototype.toString.call(chartColor) ===
+                  '[object Object]'
+                ) {
+                  if (chartColor.targetVal) {
+                    const itemStyle = sandBoxSafeRun(chartColor.targetVal, {
+                      charItem: j,
+                    });
+                    if (typeof itemStyle === 'string') {
+                      return {
+                        value: j[(transferDataMap as any)[`y${i}`] || `y${i}`],
+                        itemStyle: {
+                          color: itemStyle,
+                        },
+                      };
+                    }
+                    if (
+                      Object.prototype.toString.call(itemStyle) ===
+                      '[object Object]'
+                    ) {
+                      return {
+                        value: j[(transferDataMap as any)[`y${i}`] || `y${i}`],
+                        itemStyle,
+                      };
+                    }
+                  }
+                }
+                return j[(transferDataMap as any)[`y${i}`] || `y${i}`];
+              }) || [];
           }
           if (
             obj.areaStyle?.showColor &&

package/lib/pcpublic/src/components/pcfactory/src/Table/EditComponent/index.tsx

@@ -163,6 +163,7 @@ const EditComponent: React.FC<MyEditComponent> = (props) => {
   }, [format, edittype, initValue]);
 
   const initialValueType = typeof initialValue;
+  const isNaNValue = useMemo(() => isNaN(initialValue), [initialValue]);
 
   const validateDateCustomExpress = useMemo<any>(() => {
     if (customExpression && customExpression.code && sandBoxSafeRun) {
@@ -230,15 +231,25 @@ const EditComponent: React.FC<MyEditComponent> = (props) => {
       });
     };
     res = getRules(res);
+    const requiredType = rules?.[0]?.type;
     // 添加数组类型校验
-    if (rules?.[0]?.type && rules?.[0]?.type !== initialValueType) {
-      res.push({
-        type: rules?.[0]?.type,
-        message: getLocale?.('Table.dateTypeWarning'),
-      });
+    if (requiredType && requiredType !== initialValueType) {
+      // 数字输入框时，格式为数字型字符串视为合法类型
+      if (
+        !(
+          requiredType === 'number' &&
+          initialValueType === 'string' &&
+          !isNaNValue
+        )
+      ) {
+        res.push({
+          type: requiredType,
+          message: getLocale?.('Table.dateTypeWarning'),
+        });
+      }
     }
     return res?.length > 0 ? res : null;
-  }, [initialValueType, rules, validateDateCustomExpress]);
+  }, [initialValueType, isNaNValue, rules, validateDateCustomExpress]);
 
   const getDisabledDate = useCallback(
     (current: Moment) => {

package/lib/pcpublic/src/components/pcfactory/src/Table/hooks/useDataSource.ts

@@ -21,6 +21,7 @@ const useDataSource = (props: any) => {
     setReplaceBoundDataSource,
     outerDataSource,
     outerDataSourceRef,
+    setCurrentPage,
   } = props;
 
   const [dataSource, setDataSource] = useState<any[]>([]);
@@ -155,7 +156,17 @@ const useDataSource = (props: any) => {
       };
     });
     setDataSource(fd);
-  }, [outerDataSourceRef.current, currentRowKey, boundDataSource]);
+    if (!hasPageChangeEvent && page && typeof setCurrentPage === 'function') {
+      // 前端分页时，数据变化重置分页
+      setCurrentPage(1);
+    }
+  }, [
+    outerDataSourceRef.current,
+    currentRowKey,
+    boundDataSource,
+    hasPageChangeEvent,
+    page,
+  ]);
 
   return {
     outerDataSource,

package/lib/pcpublic/src/components/pcfactory/src/Table/index.tsx

@@ -128,6 +128,7 @@ const MyTable = React.forwardRef<any, MyTableProps>((props, ref) => {
     setReplaceBoundDataSource,
     outerDataSource,
     outerDataSourceRef,
+    setCurrentPage,
   });
 
   const {

package/lib/public/src/components/ExpSQLServiceModal/index.tsx

@@ -228,12 +228,12 @@ const ExpSQLServiceModal = forwardRef<
 
   const onCheckAllChange = (e: any) => {
     if (e.target.checked) {
-      setSelectedKeys(curDataSource.map((item) => item.attrCode));
+      setSelectedKeys(curDataSource.map((item) => item.code));
     } else {
       setSelectedKeys(
         curDataSource
           .filter((item) => item.isRequired === 'T')
-          .map((item) => item.attrCode),
+          .map((item) => item.code),
       );
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingxiteam/ebe-utils",
-  "version": "0.1.33",
+  "version": "0.2.0",
   "description": "",
   "keywords": [],
   "author": "",
@@ -19,7 +19,7 @@
     "@babel/types": "^7.12.12",
     "cac": "^6.7.14",
     "fs-extra": "9.x",
-    "@lingxiteam/ebe": "0.1.33"
+    "@lingxiteam/ebe": "0.2.0"
   },
   "publishConfig": {
     "access": "public"