cnhis-design-vue 3.1.9-beta.2 → 3.1.9-beta.5

package/es/src/utils/vexutils.mjs

@@ -1,80 +1,3 @@
-import XEUtils from 'xe-utils';
+export { formatReleaseTime, handleLabelColor } from './vexutils2.mjs';
 export { default } from 'xe-utils';
 export { default as moment } from 'moment';
-
-function formatReleaseTime(type, time) {
-  if (time < 0) {
-    return "";
-  }
-  let format = "";
-  switch (type) {
-    case "DATE":
-      format = "yyyy-MM-dd";
-      break;
-    case "DATETIMENew":
-      format = "yyyy-MM-dd HH:mm";
-      break;
-    case "DATETIME":
-      format = "yyyy-MM-dd HH:mm:ss";
-      break;
-    case "TIME":
-      format = "HH:mm:ss";
-      break;
-  }
-  return XEUtils.toDateString(time, format);
-}
-function handleLabelColor(item, isSelect) {
-  var _a;
-  let tempColor = "#5585f5";
-  let oldColorMap = {
-    blue: "#0000ff",
-    sky: "#87ceeb",
-    azure: "#f0ffff",
-    palegreen: "#98fb98",
-    yellow: "#ffff00",
-    darkorange: "#ff8c00",
-    magenta: "#ff00ff",
-    purple: "#800080",
-    maroon: "#800000",
-    orange: "#ffa500",
-    green: "#008000",
-    red: "#ff0000",
-    grey: "#808080"
-  };
-  if ((_a = item == null ? void 0 : item.color) == null ? void 0 : _a.includes("-")) {
-    let str = item.color.split("-")[1];
-    tempColor = oldColorMap[str] || "#5585f5";
-  } else {
-    tempColor = item.color || "#5585f5";
-  }
-  const tempRgba = XEUtils.hexToRGBA(tempColor) || {
-    r: 85,
-    g: 133,
-    b: 245,
-    a: 1
-  };
-  if (isSelect) {
-    return {
-      color: "#fff",
-      background: `rgba(${tempRgba.r}, ${tempRgba.g}, ${tempRgba.b})`,
-      borderColor: `rgba(${tempRgba.r}, ${tempRgba.g}, ${tempRgba.b})`
-    };
-  }
-  if (item.isSelect) {
-    return {
-      color: "#fff",
-      background: `rgba(${tempRgba.r}, ${tempRgba.g}, ${tempRgba.b})`,
-      borderColor: `rgba(${tempRgba.r}, ${tempRgba.g}, ${tempRgba.b})`
-    };
-  } else {
-    let isSys = !(item.isPublic && item.isPublic == 1);
-    let color = isSys ? "rgba(28, 28, 28, 1)" : "rgba(33, 33, 33, 0.6)";
-    return {
-      color,
-      background: "rgba(250, 250, 250, 1)",
-      borderColor: "rgba(213, 213, 213, 0.8)"
-    };
-  }
-}
-
-export { formatReleaseTime, handleLabelColor };

package/es/src/utils/vexutils2.mjs

@@ -0,0 +1,80 @@
+import XEUtils from 'xe-utils';
+export { default } from 'xe-utils';
+export { default as moment } from 'moment';
+
+function formatReleaseTime(type, time) {
+  if (time < 0) {
+    return "";
+  }
+  let format = "";
+  switch (type) {
+    case "DATE":
+      format = "yyyy-MM-dd";
+      break;
+    case "DATETIMENew":
+      format = "yyyy-MM-dd HH:mm";
+      break;
+    case "DATETIME":
+      format = "yyyy-MM-dd HH:mm:ss";
+      break;
+    case "TIME":
+      format = "HH:mm:ss";
+      break;
+  }
+  return XEUtils.toDateString(time, format);
+}
+function handleLabelColor(item, isSelect) {
+  var _a;
+  let tempColor = "#5585f5";
+  let oldColorMap = {
+    blue: "#0000ff",
+    sky: "#87ceeb",
+    azure: "#f0ffff",
+    palegreen: "#98fb98",
+    yellow: "#ffff00",
+    darkorange: "#ff8c00",
+    magenta: "#ff00ff",
+    purple: "#800080",
+    maroon: "#800000",
+    orange: "#ffa500",
+    green: "#008000",
+    red: "#ff0000",
+    grey: "#808080"
+  };
+  if ((_a = item == null ? void 0 : item.color) == null ? void 0 : _a.includes("-")) {
+    let str = item.color.split("-")[1];
+    tempColor = oldColorMap[str] || "#5585f5";
+  } else {
+    tempColor = item.color || "#5585f5";
+  }
+  const tempRgba = XEUtils.hexToRGBA(tempColor) || {
+    r: 85,
+    g: 133,
+    b: 245,
+    a: 1
+  };
+  if (isSelect) {
+    return {
+      color: "#fff",
+      background: `rgba(${tempRgba.r}, ${tempRgba.g}, ${tempRgba.b})`,
+      borderColor: `rgba(${tempRgba.r}, ${tempRgba.g}, ${tempRgba.b})`
+    };
+  }
+  if (item.isSelect) {
+    return {
+      color: "#fff",
+      background: `rgba(${tempRgba.r}, ${tempRgba.g}, ${tempRgba.b})`,
+      borderColor: `rgba(${tempRgba.r}, ${tempRgba.g}, ${tempRgba.b})`
+    };
+  } else {
+    let isSys = !(item.isPublic && item.isPublic == 1);
+    let color = isSys ? "rgba(28, 28, 28, 1)" : "rgba(33, 33, 33, 0.6)";
+    return {
+      color,
+      background: "rgba(250, 250, 250, 1)",
+      borderColor: "rgba(213, 213, 213, 0.8)"
+    };
+  }
+}
+
+export { formatReleaseTime, handleLabelColor };

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,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.1.9-beta.2",
+  "version": "3.1.9-beta.5",
   "license": "ISC",
   "module": "es/packages/index.mjs",
   "main": "es/packages/index.mjs",
@@ -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",
@@ -41,12 +42,13 @@
     "babel-preset-typescript": "7.0.0-alpha.19",
     "bpmn-js": "^9.2.2",
     "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 +56,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",