cnhis-design-vue 3.1.9-beta.1 → 3.1.9-beta.12

package/es/src/types/index.d.ts

@@ -6,3 +6,4 @@ export declare type AnyObject = Record<string, any>;
 export declare type Func<T extends Array<any> = any[], P = any> = (...args: T) => P;
 export declare type WithNull<T> = T | null;
 export declare type WithUndefined<T> = T | undefined;
+export declare type ArrayAble<T> = T | T[];

package/es/src/utils/{loadViewer.mjs → loadViewer.js}

@@ -1,4 +1,4 @@
-import { safeComponentRegister } from 'cnhis-design-vue/es/src/utils/index';
+import { safeComponentRegister } from '../../src/utils/index';
 import VueViewer from 'v-viewer';
 
 function loadViewer(app) {

package/es/src/utils/{loadVxe.mjs → loadVxe.js}

@@ -1,4 +1,4 @@
-import { safeComponentRegister } from 'cnhis-design-vue/es/src/utils/index';
+import { safeComponentRegister } from '../../src/utils/index';
 import VXETable from 'vxe-table';
 
 function loadVxeTable(app) {

package/es/src/utils/{utilExpand.mjs → utilExpand.js}

@@ -34,25 +34,25 @@ const expandXEUtils = (() => {
     getConnection: function(cObj, fVal, field) {
       let con = cObj.con;
       let value = cObj.value;
-      if (con == "NULL") {
+      if ("NULL" == con) {
         if (fVal) {
           return false;
         }
-      } else if (con == "NOT_NULL") {
+      } else if ("NOT_NULL" == con) {
         if (!fVal) {
           return false;
         }
       }
-      if (field.fieldType == "TEXT") {
-        if (con == "CL") {
+      if ("TEXT" == field.fieldType) {
+        if ("CL" == con) {
           if (fVal.indexOf(value) == -1) {
             return false;
           }
-        } else if (con == "NC") {
+        } else if ("NC" == con) {
           if (fVal.indexOf(value) != -1) {
             return false;
           }
-        } else if (con == "EQ" || con == "QUOTE") {
+        } else if ("EQ" == con || "QUOTE" == con) {
           if (value.indexOf("|#|") != -1) {
             for (let kw in value.split("|#|")) {
               if (fVal.indexOf(kw) == -1) {
@@ -64,17 +64,17 @@ const expandXEUtils = (() => {
               return false;
             }
           }
-        } else if (con == "NEQ") {
+        } else if ("NEQ" == con) {
           if (fVal == value) {
             return false;
           }
         }
       } else {
-        if (field.fieldType == "NUMBER") {
+        if ("NUMBER" == field.fieldType) {
           if (!XEUtils.isNumber(fVal)) {
             return false;
           }
-          if (con == "EQ" || con == "QUOTE") {
+          if ("EQ" == con || "QUOTE" == con) {
             if (XEUtils.isNumber(value)) {
               if (fVal * 1 != value * 1) {
                 return false;
@@ -84,19 +84,19 @@ const expandXEUtils = (() => {
                 return false;
               }
             }
-          } else if (con == "NEQ") {
+          } else if ("NEQ" == con) {
             if (XEUtils.isNumber(value)) {
               if (fVal * 1 == value * 1) {
                 return false;
               }
             }
-          } else if (con == "BIG") {
+          } else if ("BIG" == con) {
             if (XEUtils.isNumber(value)) {
               if (fVal * 1 <= value * 1) {
                 return false;
               }
             }
-          } else if (con == "LESS") {
+          } else if ("LESS" == con) {
             if (XEUtils.isNumber(value)) {
               if (fVal * 1 >= value * 1) {
                 return false;
@@ -104,7 +104,7 @@ const expandXEUtils = (() => {
             }
           }
         } else {
-          if (con == "TODAY" || con == "TOMORROW" || con == "YESTERDAY" || con == "THIS_WEEK" || con == "NEXT_WEEK" || con == "UP_WEEK" || con == "THIS_MONTH" || con == "NEXT_MONTH" || con == "UP_MONTH" || con == "THIS_SEASON" || con == "NEXT_SEASON" || con == "UP_SEASON" || con == "THIS_YEAR" || con == "NEXT_YEAR" || con == "UP_YEAR") {
+          if ("TODAY" == con || "TOMORROW" == con || "YESTERDAY" == con || "THIS_WEEK" == con || "NEXT_WEEK" == con || "UP_WEEK" == con || "THIS_MONTH" == con || "NEXT_MONTH" == con || "UP_MONTH" == con || "THIS_SEASON" == con || "NEXT_SEASON" == con || "UP_SEASON" == con || "THIS_YEAR" == con || "NEXT_YEAR" == con || "UP_YEAR" == con) {
             if (XEUtils.isDate(fVal)) {
               let curDate = new Date();
               let startDate;
@@ -112,72 +112,72 @@ const expandXEUtils = (() => {
               let oneDayTime = 24 * 60 * 60 * 1e3;
               let fDate = XEUtils.convertDate(fVal);
               let curDateStr = XEUtils.toDateString(curDate, "yyyy-MM-dd");
-              if (con == "TODAY") {
+              if ("TODAY" == con) {
                 startDate = XEUtils.convertDate(curDateStr + " 00:00:00");
                 endDate = XEUtils.convertDate(curDateStr + " 23:59:59");
-              } else if (con == "TOMORROW") {
+              } else if ("TOMORROW" == con) {
                 let tomorrowDate = XEUtils.addDate(curDate, 1, "D");
                 let dateStr = tomorrowDate.format("yyyy-MM-dd");
                 startDate = XEUtils.convertDate(dateStr + " 00:00:00");
                 endDate = XEUtils.convertDate(dateStr + " 23:59:59");
-              } else if (con == "YESTERDAY") {
+              } else if ("YESTERDAY" == con) {
                 let tomorrowDate = XEUtils.addDate(curDate, -1, "D");
                 let dateStr = tomorrowDate.format("yyyy-MM-dd");
                 startDate = XEUtils.convertDate(dateStr + " 00:00:00");
                 endDate = XEUtils.convertDate(dateStr + " 23:59:59");
-              } else if (con == "THIS_WEEK") {
+              } else if ("THIS_WEEK" == con) {
                 let day = curDate.getDay() || 7;
                 let mondayTime = curDate.getTime() - (day - 1) * oneDayTime;
                 let mundayTime = curDate.getTime() + (7 - day) * oneDayTime;
                 startDate = new Date(mondayTime);
                 endDate = new Date(mundayTime);
-              } else if (con == "NEXT_WEEK") {
+              } else if ("NEXT_WEEK" == con) {
                 let sevenDays = XEUtils.addDate(curDate, 1, "W");
                 let day = sevenDays.getDay() || 7;
                 let mondayTime = sevenDays.getTime() - (day - 1) * oneDayTime;
                 let mundayTime = sevenDays.getTime() + (7 - day) * oneDayTime;
                 startDate = new Date(mondayTime);
                 endDate = new Date(mundayTime);
-              } else if (con == "UP_WEEK") {
+              } else if ("UP_WEEK" == con) {
                 let sevenDays = XEUtils.addDate(curDate, -1, "W");
                 let day = sevenDays.getDay() || 7;
                 let mondayTime = sevenDays.getTime() - (day - 1) * oneDayTime;
                 let mundayTime = sevenDays.getTime() + (7 - day) * oneDayTime;
                 startDate = new Date(mondayTime);
                 endDate = new Date(mundayTime);
-              } else if (con == "THIS_MONTH") {
+              } else if ("THIS_MONTH" == con) {
                 let date = new Date();
                 date.setDate(1);
                 startDate = date;
                 endDate = XEUtils.addDate(date, 1, "M");
-              } else if (con == "NEXT_MONTH") {
+              } else if ("NEXT_MONTH" == con) {
                 let date = new Date();
                 date.setDate(1);
                 startDate = XEUtils.addDate(date, 1, "M");
                 endDate = XEUtils.addDate(date, 2, "M");
-              } else if (con == "UP_MONTH") {
+              } else if ("UP_MONTH" == con) {
                 let date = new Date();
                 date.setDate(1);
                 startDate = XEUtils.addDate(date, -1, "M");
                 endDate = date;
-              } else if (con == "THIS_SEASON") {
+              } else if ("THIS_SEASON" == con) {
                 startDate = XEUtils.getCurSeasonFirstDay();
                 endDate = XEUtils.addDate(startDate, 3, "M");
-              } else if (con == "NEXT_SEASON") {
+              } else if ("NEXT_SEASON" == con) {
                 startDate = XEUtils.addDate(XEUtils.getCurSeasonFirstDay(), 3, "M");
                 endDate = XEUtils.addDate(startDate, 3, "M");
-              } else if (con == "UP_SEASON") {
+              } else if ("UP_SEASON" == con) {
                 endDate = XEUtils.getCurSeasonFirstDay();
                 startDate = XEUtils.addDate(endDate, -3, "M");
-              } else if (con == "THIS_YEAR") {
+              } else if ("THIS_YEAR" == con) {
                 let date = new Date();
                 startDate = new Date(date.getFullYear() + "/01/01");
                 endDate = XEUtils.addDate(startDate, 1, "Y");
-              } else if (con == "NEXT_YEAR") {
+              } else if ("NEXT_YEAR" == con) {
                 let date = new Date();
                 startDate = XEUtils.addDate(new Date(date.getFullYear() + "/01/01"), 1, "Y");
                 endDate = XEUtils.addDate(startDate, 1, "Y");
-              } else if (con == "UP_YEAR") {
+              } else if ("UP_YEAR" == con) {
                 let date = new Date();
                 endDate = new Date(date.getFullYear() + "/01/01");
                 startDate = XEUtils.addDate(endDate, -1, "Y");
@@ -190,51 +190,51 @@ const expandXEUtils = (() => {
             } else {
               return false;
             }
-          } else if (con == "L_" || con == "N_" || con == "IN_THE_PAST" || con == "IN_THE_FUTURE" || con == "IN_THE_PAST_DI" || con == "IN_THE_FUTURE_DI") {
+          } else if ("L_" == con || "N_" == con || "IN_THE_PAST" == con || "IN_THE_FUTURE" == con || "IN_THE_PAST_DI" == con || "IN_THE_FUTURE_DI" == con) {
             if (cObj["unit"] && XEUtils.isNumber(value)) {
               if (XEUtils.isDate(fVal)) {
                 let fDate = XEUtils.convertDate(fVal);
                 let curDate = new Date();
                 let unit = cObj["unit"];
-                if (unit == "DAY" || unit == "WEEK" || unit == "MONTH" || unit == "QUARTER" || unit == "YEAR" || unit == "HOUR") {
+                if ("DAY" == unit || "WEEK" == unit || "MONTH" == unit || "QUARTER" == unit || "YEAR" == unit || "HOUR" == unit) {
                   let type = "D";
-                  if (unit == "WEEK") {
+                  if ("WEEK" == unit) {
                     type = "W";
-                  } else if (unit == "MONTH") {
+                  } else if ("MONTH" == unit) {
                     type = "M";
-                  } else if (unit == "QUARTER") {
+                  } else if ("QUARTER" == unit) {
                     type = "Q";
-                  } else if (unit == "YEAR") {
+                  } else if ("YEAR" == unit) {
                     type = "Y";
-                  } else if (unit == "HOUR") {
+                  } else if ("HOUR" == unit) {
                     type = "H";
                   }
                   let count = value * 1;
-                  if (con == "L_") {
+                  if ("L_" == con) {
                     let targetDate = XEUtils.addDate(new Date(), count * -1, type);
                     if (fDate.getTime() < targetDate.getTime()) {
                       return false;
                     }
-                  } else if (con == "N_") {
+                  } else if ("N_" == con) {
                     let targetDate = XEUtils.addDate(new Date(), count, type);
                     if (fDate.getTime() > targetDate.getTime()) {
                       return false;
                     }
-                  } else if (con == "IN_THE_PAST") {
+                  } else if ("IN_THE_PAST" == con) {
                     let curTime = fDate.getTime();
                     let endTime = curDate.getTime();
                     let startTime = XEUtils.addDate(curDate, count * -1, type).getTime();
                     if (curTime < startTime || curTime > endTime) {
                       return false;
                     }
-                  } else if (con == "IN_THE_FUTURE") {
+                  } else if ("IN_THE_FUTURE" == con) {
                     let curTime = fDate.getTime();
                     let startTime = curDate.getTime();
                     let endTime = XEUtils.addDate(curDate, count, type).getTime();
                     if (curTime < startTime || curTime > endTime) {
                       return false;
                     }
-                  } else if (con == "IN_THE_PAST_DI" || con == "IN_THE_FUTURE_DI") {
+                  } else if ("IN_THE_PAST_DI" == con || "IN_THE_FUTURE_DI" == con) {
                     let curTime = fDate.getTime();
                     let useType = con == "IN_THE_FUTURE_DI" ? "add" : "subtract";
                     let { startTime, endTime } = XEUtils.addDiDate(curDate, count, unit, useType);
@@ -247,7 +247,7 @@ const expandXEUtils = (() => {
                 return false;
               }
             }
-          } else if (con == "IN") {
+          } else if ("IN" == con) {
             if (XEUtils.isDate(fVal)) {
               let fDate = XEUtils.convertDate(fVal);
               if (!value) {
@@ -289,8 +289,8 @@ const expandXEUtils = (() => {
           }
         }
       }
-      if (con == "compare") {
-        if (field.fieldType == "TEXT") {
+      if ("compare" == con) {
+        if ("TEXT" == field.fieldType) {
           if (value.indexOf("|#|") != -1) {
             for (let kw in value.split("|#|")) {
               if (fVal.indexOf(kw) == -1) {
@@ -298,7 +298,7 @@ const expandXEUtils = (() => {
               }
             }
           } else {
-            if (cObj["mk"] && cObj["mk"] == "like") {
+            if (cObj["mk"] && "like" == cObj["mk"]) {
               if (fVal.indexOf(value) == -1) {
                 return false;
               }
@@ -308,7 +308,7 @@ const expandXEUtils = (() => {
               }
             }
           }
-        } else if (field.fieldType() == "NUMBER") {
+        } else if ("NUMBER" == field.fieldType()) {
           if (XEUtils.isNumber(value) && XEUtils.isNumber(fVal)) {
             if (fVal * 1 != value * 1) {
               return false;
@@ -328,7 +328,7 @@ const expandXEUtils = (() => {
       if (value && value.indexOf("~") != -1 && value.split("~").length == 2) {
         let start = value.split("~")[0];
         let end = value.split("~")[1];
-        if (type == "number") {
+        if ("number" == type) {
           if (XEUtils.isNumber(start) && XEUtils.isNumber(end)) {
             return start * 1 <= comVal * 1 && comVal * 1 < end * 1;
           }

package/global.d.ts

@@ -1,8 +1,8 @@
-import * as NaiveUI from 'naive-ui';
-
-declare module 'naive-ui' {
-  // @ts-ignore
-  export const NTree: any;
-}
-
-export {};
+import * as NaiveUI from 'naive-ui';
+
+declare module 'naive-ui' {
+  // @ts-ignore
+  export const NTree: any;
+}
+
+export {};

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.1.9-beta.1",
+  "version": "3.1.9-beta.12",
   "license": "ISC",
-  "module": "es/packages/index.mjs",
-  "main": "es/packages/index.mjs",
+  "module": "es/packages/index.js",
+  "main": "es/packages/index.js",
   "types": "es/packages/index.d.ts",
   "sideEffects": [
     "es/packages/**/style/*",
@@ -32,6 +32,7 @@
     "@formily/core": "^2.1.9",
     "@formily/vue": "^2.1.9",
     "@highlightjs/vue-plugin": "^2.1.0",
+    "@types/fabric": "^4.5.9",
     "@vicons/ionicons5": "^0.12.0",
     "@vueuse/core": "^8.6.0",
     "@vueuse/shared": "^8.6.0",
@@ -40,13 +41,15 @@
     "axios": "^0.27.2",
     "babel-preset-typescript": "7.0.0-alpha.19",
     "bpmn-js": "^9.2.2",
+    "canvas": "^2.9.3",
     "crypto-js": "^4.1.1",
+    "fabric": "^5.2.1",
     "highlight.js": "^11.5.1",
     "lodash": "^4.17.21",
     "lodash-es": "^4.17.21",
     "lodash-unified": "^1.0.2",
     "moment": "^2.29.1",
-    "naive-ui": "2.30.8",
+    "naive-ui": "^2.29.0",
     "rimraf": "^3.0.2",
     "spark-md5": "^3.0.2",
     "type-fest": "^2.13.0",
@@ -54,7 +57,7 @@
     "video.js": "^7.19.2",
     "videojs-contrib-hls": "^5.15.0",
     "viewerjs": "^1.10.5",
-    "vue": "^3.2.36",
+    "vue": ">=3.2.0",
     "vue-simple-uploader": "^1.0.0-beta.5",
     "vuedraggable": "4.1.0",
     "vxe-table": "4.2.1",
@@ -88,6 +91,7 @@
     "axios": "^0.27.2",
     "bpmn-js": "^9.2.2",
     "chalk": "^5.0.1",
+    "codesandbox": "^2.2.3",
     "consola": "^2.15.3",
     "cross-env": "^7.0.3",
     "cssnano": "^5.1.7",