@meta2d/form-diagram - npm Package Compare versions

Comparing version 1.0.18 to 1.0.19

index.d.ts

@@ -8,2 +8,1 @@ export * from './src/table';
 export * from './src/time';
-export * from './src/table3';

index.js

@@ -8,3 +8,2 @@ export * from './src/table';
 export * from './src/time';
-export * from './src/table3';
 //# sourceMappingURL=index.js.map

package.json

 {
   "name": "@meta2d/form-diagram",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "description": "The form library based on le5le meta2d.",
@@ -5,0 +5,0 @@ "main": "index.js",

src/register.d.ts

@@ -5,4 +5,4 @@ import { le5leSwitch } from './switch';
 import { radio } from './radio';
+import { table2 } from './table2';
 import { time } from './time';
-import { table3 } from './table3';
 export declare function formPens(): {
@@ -13,4 +13,4 @@ radio: typeof radio;
     checkbox: typeof checkbox;
-    table: typeof table3;
-    table2: typeof table3;
+    table: typeof table2;
+    table2: typeof table2;
 };
@@ -17,0 +17,0 @@ export declare function formPath2DPens(): {

src/register.js

@@ -5,4 +5,4 @@ import { le5leSwitch } from './switch';
 import { radio } from './radio';
+import { table2 } from './table2';
 import { time } from './time';
-import { table3 } from './table3';
 export function formPens() {
@@ -14,4 +14,4 @@ return {
         checkbox: checkbox,
-        table: table3,
-        table2: table3,
+        table: table2,
+        table2: table2,
     };
@@ -18,0 +18,0 @@ }

src/table2.js

@@ -365,10 +365,27 @@ var __values = (this && this.__values) || function(o) {
             //样式条件成立
-            if (cellStyle.wheres &&
-                Array.isArray(cellStyle.wheres)) {
-                isSuccess = false;
-                isSuccess = cellStyle.wheres.every(function (where) {
-                    var fn = new Function('attr', "return attr " + where.comparison + " " + where.value);
-                    return fn(cell);
+            if (Array.isArray(cellStyle) && cellStyle.length > 0) {
+                var successIdx_1 = 0;
+                cellStyle.forEach(function (item, idx) {
+                    if (item.wheres) {
+                        var success = item.wheres.every(function (where) {
+                            var fn = new Function('attr', "return attr " + where.comparison + " " + where.value);
+                            return fn(cell);
+                        });
+                        if (success) {
+                            successIdx_1 = idx;
+                        }
+                    }
                 });
+                cellStyle = cellStyle[successIdx_1];
             }
+            else {
+                if (cellStyle.wheres &&
+                    Array.isArray(cellStyle.wheres)) {
+                    isSuccess = false;
+                    isSuccess = cellStyle.wheres.every(function (where) {
+                        var fn = new Function('attr', "return attr " + where.comparison + " " + where.value);
+                        return fn(cell);
+                    });
+                }
+            }
             var color = pen.color;
@@ -658,3 +675,3 @@ var textColor = pen.textColor || pen.color;
     if (Array.isArray(row)) {
-        return { value: row[colIndex], style: (style === null || style === void 0 ? void 0 : style.length) > 0 ? style[0] : {} };
+        return { value: row[colIndex], style: (style === null || style === void 0 ? void 0 : style.length) > 0 ? (style.length > 1 ? style : style[0]) : {} };
     }
@@ -661,0 +678,0 @@ else if (!row.data || !Array.isArray(row.data)) {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

373554

increased by0.36%

Lines of code

5108

increased by0.29%

Worsened metrics

Number of medium supply chain risk alerts

3

increased by50%

No dependency changes