cnhis-design-vue 3.1.5-beta.12 → 3.1.5-beta.13

package/es/packages/select-person/src/utils/index2.mjs

@@ -1,4 +1,14 @@
-const filterTree = ({ value = "", data = [], prop = "title", filter = false, filterXor = false, children = "children", visible = "visible", filterChildren = true, callback = null }) => {
+const filterTree = ({
+  value = "",
+  data = [],
+  prop = "title",
+  filter = false,
+  filterXor = false,
+  children = "children",
+  visible = "visible",
+  filterChildren = true,
+  callback
+}) => {
   visible = visible || "visible";
   children = children || "children";
   prop = prop || "text";
@@ -9,17 +19,30 @@ const filterTree = ({ value = "", data = [], prop = "title", filter = false, fil
     let flag = (data2[prop] || "").indexOf(value2) !== -1;
     return filterXor ? !flag : flag;
   };
+  const setVisible = (tree, isVisible) => {
+    if (!(tree == null ? void 0 : tree.length))
+      return;
+    tree.forEach((item) => {
+      var _a;
+      item[visible] = isVisible;
+      ((_a = item[children]) == null ? void 0 : _a.length) && setVisible(item[children], isVisible);
+    });
+  };
   const traverse = function(node) {
     const childNodes = node[children] || [];
     childNodes.forEach((child) => {
-      callback && callback(child);
-      child[visible] = !node.root && !filterChildren && node[visible] || filterNodeMethod.call(child, value, child, prop);
+      child[visible] = !node.root && !filterChildren && node[visible] || filterNodeMethod.call(child, value, child);
       traverse(child);
+      callback && callback(child);
     });
-    if (!node[visible] && childNodes.length) {
+    if (childNodes.length) {
       let allHidden = true;
       allHidden = !childNodes.some((child) => child[visible]);
-      node[visible] = allHidden === false;
+      if (!node[visible]) {
+        node[visible] = allHidden === false;
+      } else {
+        setVisible(childNodes, true);
+      }
     }
   };
   let totalData = {
@@ -31,10 +54,14 @@ const filterTree = ({ value = "", data = [], prop = "title", filter = false, fil
     let copyData = data.slice();
     let filterHandle = (filterData) => {
       return filterData.filter((item, index) => {
+        var _a;
         if (item[visible]) {
           if (item[children]) {
             item[children] = filterHandle(item[children]);
           }
+          if (!((_a = item[children]) == null ? void 0 : _a.length)) {
+            item[children] = void 0;
+          }
           return true;
         }
         return false;

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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.1.5-beta.12",
+  "version": "3.1.5-beta.13",
   "license": "ISC",
   "module": "es/packages/index.mjs",
   "main": "es/packages/index.mjs",
@@ -11,7 +11,7 @@
     "es/packages/*(.css,.less)"
   ],
   "scripts": {
-    "dev": "node --max-old-space-size=8192 node_modules/vite/bin/vite.js --host --port 3200",
+    "dev": "vite --host --port 3200",
     "start": "gulp --require @esbuild-kit/cjs-loader -f build/gulpfile.ts",
     "build": "npm run start",
     "build:doc": "cross-env CUI_DOCS=true vite build",
@@ -20,7 +20,9 @@
     "test:resnap": "vitest spec -u",
     "test:coverage": "vitest run --coverage",
     "preview": "vite preview",
-    "release": "standard-version"
+    "release": "standard-version",
+    "deploy": "sh sync.sh",
+    "deploy-w": "sh sync-w.sh"
   },
   "peerDependencies": {
     "naive-ui": "^2.29.0",
@@ -30,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",
@@ -39,6 +42,7 @@
     "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",
@@ -52,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",

package/sync-w.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+yarn build:doc
+
+passwd='Healthone2021@.'
+
+mv ./dist ./v3
+
+ssh root@120.25.59.85 "rm -rf /mnt/html/v3/"
+
+scp -r ./v3 root@120.25.59.85:/mnt/html/
+
+rm -rf v3
+