cnhis-design-vue 3.1.22 → 3.1.23-beta.1

package/es/components/select-person/src/SelectPerson.vue_vue_type_script_setup_true_lang.js

@@ -1,5 +1,5 @@
 import { defineComponent, ref, reactive, computed, nextTick, watch, onMounted, openBlock, createElementBlock, createVNode, unref, withCtx, createElementVNode, createCommentVNode, withKeys, createTextVNode, toDisplayString, createBlock, withDirectives, vShow, mergeProps, renderSlot, Fragment, renderList, normalizeClass } from 'vue';
-import { useMessage, NSpin, NInputGroup, NInput, NButton, NCheckbox, NTree, NIcon, NTooltip } from 'naive-ui';
+import { useMessage, NSpin, NInputGroup, NInput, NButton, NCheckbox, NTree, NSpace, NIcon, NTooltip } from 'naive-ui';
 import { CloseCircleSharp } from '@vicons/ionicons5';
 import XEUtils from 'xe-utils';
 import 'moment';
@@ -18,7 +18,10 @@ const _hoisted_3 = {
 const _hoisted_4 = /* @__PURE__ */ createTextVNode(" \u5168\u9009 ");
 const _hoisted_5 = /* @__PURE__ */ createTextVNode(" \u5168\u9009 ");
 const _hoisted_6 = {
-  class: "people-tree-item tags-box"
+  class: "people-tree-item"
+};
+const _hoisted_7 = {
+  key: 0
 };
 var _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "SelectPerson",
@@ -67,6 +70,18 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     },
     queryTreeSearch: {
       type: Function
+    },
+    showCount: {
+      type: Boolean,
+      default: true
+    },
+    showClear: {
+      type: Boolean,
+      default: true
+    },
+    multiple: {
+      type: Boolean,
+      default: true
     }
   },
   emits: ["check", "pubCheckedTreeItem", "handleOk", "change", "submitData", "update:visible"],
@@ -724,6 +739,11 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       removedCheckedkeysOther(removedTag);
       refreshSearchTree();
     };
+    function clearAll() {
+      state.defaultShowList = [];
+      state.indeterminate = state.singleChecked = false;
+      checkedTreeItem.value.forEach((tag) => closeTag(tag));
+    }
     const removeCheckedkeysIncludeChildren = (parentKey) => {
       let needRemoveChildKeys = state.dataList.main.filter((i) => {
         let parentId = getParentId(i);
@@ -848,7 +868,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
             value: state.title,
             "onUpdate:value": _cache[0] || (_cache[0] = ($event) => state.title = $event),
             placeholder: __props.searchPlaceholder,
-            onKeyup: withKeys(searchClick, ["enter", "native"])
+            onKeyup: withKeys(searchClick, ["enter"])
           }, null, 8, ["value", "placeholder", "onKeyup"]), createVNode(unref(NButton), {
             type: "primary",
             onClick: searchClick
@@ -865,7 +885,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         }, {
           default: withCtx(() => [_hoisted_4]),
           _: 1
-        }, 8, ["checked", "indeterminate"])) : (openBlock(), createBlock(unref(NCheckbox), {
+        }, 8, ["checked", "indeterminate"])) : createCommentVNode("v-if", true), !unref(searchTreeVisable) && __props.multiple ? (openBlock(), createBlock(unref(NCheckbox), {
           key: 1,
           checked: state.singleChecked,
           indeterminate: state.searchIndeterminate,
@@ -873,21 +893,23 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         }, {
           default: withCtx(() => [_hoisted_5]),
           _: 1
-        }, 8, ["checked", "indeterminate"])), createCommentVNode(' <div v-show="state.search.status == 3 || (state.search.status == 0 && state.treeData.main && state.treeData.main.length == 0)" class="no-data-tips">\n            \u67E5\u65E0\u7ED3\u679C\n          </div> '), createCommentVNode(" main tree "), withDirectives(createVNode(unref(NTree), {
+        }, 8, ["checked", "indeterminate"])) : createCommentVNode("v-if", true), createCommentVNode(' <div v-show="state.search.status == 3 || (state.search.status == 0 && state.treeData.main && state.treeData.main.length == 0)" class="no-data-tips">\n            \u67E5\u65E0\u7ED3\u679C\n          </div> '), createCommentVNode(" main tree "), withDirectives(createVNode(unref(NTree), {
           class: "main-tree-container",
           "checked-keys": state.checkedKeys.main,
           "onUpdate:checked-keys": _cache[2] || (_cache[2] = ($event) => state.checkedKeys.main = $event),
           "expanded-keys": state.expandedKeys,
-          checkable: "",
+          checkable: __props.multiple,
           cascade: "",
           "allow-checking-not-loaded": "",
-          selectable: false,
+          selectable: !__props.multiple,
+          "selected-keys": state.checkedKeys.main,
+          "onUpdate:selected-keys": _cache[3] || (_cache[3] = ($event) => state.checkedKeys.main = $event),
           data: state.treeData.main,
           "check-strategy": __props.queryMainTreeData ? "all" : "child",
           "onUpdate:expandedKeys": onExpand,
           "on-load": onLoadData,
           "render-label": renderLabel
-        }, null, 8, ["checked-keys", "expanded-keys", "data", "check-strategy"]), [[vShow, state.search.status == 0]]), createCommentVNode(" search tree "), createVNode(SearchTree, mergeProps(_ctx.$attrs, {
+        }, null, 8, ["checked-keys", "expanded-keys", "checkable", "selectable", "selected-keys", "data", "check-strategy"]), [[vShow, state.search.status == 0]]), createCommentVNode(" search tree "), createVNode(SearchTree, mergeProps(_ctx.$attrs, {
           ref_key: "searchTree",
           ref: searchTree,
           visible: unref(searchTreeVisable),
@@ -903,8 +925,21 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           onAddCheckedkeysOther: addCheckedkeysOther,
           onRemoveCheckedkeysOther: removeCheckedkeysOther,
           onSearchOnloadMore: searchOnloadMore
-        }), null, 16, ["visible", "formatTreeData", "searchValue", "allCheckedKeys", "defaultExpandedKeys", "dataListKeys", "searchNoMore", "loadMorenLoadinng"])]), createCommentVNode(" \u6811\u5DF2\u9009\u7684\u6570\u636E "), createElementVNode("div", _hoisted_6, [state.defaultShowList && state.defaultShowList.length ? renderSlot(_ctx.$slots, "default", {
-          key: 0
+        }), null, 16, ["visible", "formatTreeData", "searchValue", "allCheckedKeys", "defaultExpandedKeys", "dataListKeys", "searchNoMore", "loadMorenLoadinng"])]), createCommentVNode(" \u6811\u5DF2\u9009\u7684\u6570\u636E "), createElementVNode("div", _hoisted_6, [state.defaultShowList.length || unref(checkedTreeItem).length ? (openBlock(), createBlock(unref(NSpace), {
+          key: 0,
+          justify: "space-between",
+          style: {
+            "margin-bottom": "20px"
+          }
+        }, {
+          default: withCtx(() => [__props.showCount ? (openBlock(), createElementBlock("div", _hoisted_7, "\u5DF2\u9009\u62E9\uFF1A" + toDisplayString(state.defaultShowList.length + unref(checkedTreeItem).length), 1)) : createCommentVNode("v-if", true), __props.showClear ? (openBlock(), createElementBlock("div", {
+            key: 1,
+            class: "clear-btn",
+            onClick: clearAll
+          }, "\u6E05\u7A7A")) : createCommentVNode("v-if", true)]),
+          _: 1
+        })) : createCommentVNode("v-if", true), state.defaultShowList && state.defaultShowList.length ? renderSlot(_ctx.$slots, "default", {
+          key: 1
         }, () => [(openBlock(true), createElementBlock(Fragment, null, renderList(state.defaultShowList, (tag, i) => {
           return openBlock(), createElementBlock("div", {
             class: "tag-item def-item",

package/es/components/select-person/style/index.css

@@ -1 +1 @@
-.people-tree{display:flex}.people-tree .people-tree-item{height:376px;max-height:376px;overflow-y:auto;padding:22px 12px 0;width:50%}.people-tree .people-tree-item.people-tree-left{display:flex;flex-direction:column}.people-tree .people-tree-item:first-child{border-right:1px solid #e8e8e8}.people-tree .people-tree-item .tag-item{align-items:center;background:hsla(0,0%,84%,.2);border:1px solid rgba(0,0,0,.14);border-radius:4px;box-sizing:border-box;color:#212121;display:inline-flex;font-size:14px;height:24px;line-height:24px;list-style:none;margin-bottom:4px;margin-right:8px;padding:0 6px;transition:all .3s cubic-bezier(.215,.61,.355,1);white-space:nowrap}.people-tree .people-tree-item .tag-item.isRoot{background:rgba(85,133,245,.08);border:1px solid rgba(85,133,245,.5);color:#5585f5}.people-tree .people-tree-item .tag-item.isRoot .tag-close{color:#5585f5}.people-tree .people-tree-item .tag-item.isRoot .tag-close:hover{color:rgba(85,133,245,.6)}.people-tree .people-tree-item .tag-item .tag-close{color:#969696;cursor:pointer;display:inline-block;font-size:14px;font-weight:700;margin-left:3px;transition:all .3s}.people-tree .people-tree-item .tag-item .tag-close:hover{color:rgba(85,133,245,.6)}.people-tree .people-tree-item .tag-item .tag-close:active{color:#fff}.people-tree .people-tree-item .no-data-tips{align-items:center;display:flex;font-size:16px;font-weight:700;height:200px;justify-content:center;width:100%}.people-tree .people-tree-item .c-title{color:#212121;font-family:PingFangSC-Regular,PingFang SC;font-size:14px;font-weight:400}.people-tree .people-tree-item .c-sub-title{color:#4e4e4e;font-family:PingFangSC-Regular,PingFang SC;font-size:12px}.people-tree .people-tree-item .p-title{color:#212121;font-family:PingFangSC-Medium,PingFang SC;font-size:14px;font-weight:500}.people-tree .people-tree-item.tags-box{align-content:flex-start;align-items:flex-start;display:flex;flex-wrap:wrap;justify-content:flex-start}.search-input-icon{color:rgba(0,0,0,.4);margin-bottom:-2px}.main-tree-container{overflow-y:auto}.df{display:flex}.search-tree-wrap .name-wrap,.search-tree-wrap .search-tree-item{align-items:center;display:flex}.search-tree-wrap .name-wrap{background:#7d88b5;border-radius:50%;height:48px;justify-content:center;margin-right:13px;width:48px}.search-tree-wrap .name-wrap .name{color:#fff;font-size:16px;line-height:16px;margin-bottom:0}.search-tree-wrap .info-wrap{display:flex;flex-direction:column;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.search-tree-wrap .info-wrap-top{align-items:flex-end;margin:0 0 1px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.search-tree-wrap .info-wrap-title{color:#4e4e4e;font-family:PingFangSC-Regular,PingFang SC;font-size:16px;font-weight:400;line-height:16px;margin-bottom:0}.search-tree-wrap .info-wrap-title .c-title{color:#212121;font-family:PingFangSC-Regular,PingFang SC;font-size:14px;font-weight:400}.search-tree-wrap .info-wrap-title .c-sub-title{color:#4e4e4e;font-family:PingFangSC-Regular,PingFang SC;font-size:12px}.search-tree-wrap .info-wrap-desc{color:#aeaeae;font-size:12px;line-height:17px;margin-bottom:0;margin-left:10px}.search-tree-wrap .info-wrap-position{color:#7d88b5;font-size:12px;line-height:17px;margin-bottom:0}.load-more-btn-wrap{box-sizing:border-box;cursor:pointer;display:flex;height:35px;justify-content:center;line-height:35px;padding-top:10px}.load-more-btn-wrap .search-input-icon{color:rgba(0,0,0,.4);font-size:16px;margin-right:14px}.load-more-btn-wrap .load-more-btn{color:#747c8e;font-size:12px;line-height:12px}
+.people-tree{display:flex}.people-tree .people-tree-item{height:376px;max-height:376px;overflow-y:auto;padding:22px 12px 0;width:50%}.people-tree .people-tree-item.people-tree-left{display:flex;flex-direction:column}.people-tree .people-tree-item:first-child{border-right:1px solid #e8e8e8}.people-tree .people-tree-item .tag-item{align-items:center;background:hsla(0,0%,84%,.2);border:1px solid rgba(0,0,0,.14);border-radius:4px;box-sizing:border-box;color:#212121;display:inline-flex;font-size:14px;height:24px;line-height:24px;list-style:none;margin-bottom:4px;margin-right:8px;padding:0 6px;transition:all .3s cubic-bezier(.215,.61,.355,1);white-space:nowrap}.people-tree .people-tree-item .tag-item.isRoot{background:rgba(85,133,245,.08);border:1px solid rgba(85,133,245,.5);color:#5585f5}.people-tree .people-tree-item .tag-item.isRoot .tag-close{color:#5585f5}.people-tree .people-tree-item .tag-item.isRoot .tag-close:hover{color:rgba(85,133,245,.6)}.people-tree .people-tree-item .tag-item .tag-close{color:#969696;cursor:pointer;display:inline-block;font-size:14px;font-weight:700;margin-left:3px;transition:all .3s}.people-tree .people-tree-item .tag-item .tag-close:hover{color:rgba(85,133,245,.6)}.people-tree .people-tree-item .tag-item .tag-close:active{color:#fff}.people-tree .people-tree-item .no-data-tips{align-items:center;display:flex;font-size:16px;font-weight:700;height:200px;justify-content:center;width:100%}.people-tree .people-tree-item .c-title{color:#212121;font-family:PingFangSC-Regular,PingFang SC;font-size:14px;font-weight:400}.people-tree .people-tree-item .c-sub-title{color:#4e4e4e;font-family:PingFangSC-Regular,PingFang SC;font-size:12px}.people-tree .people-tree-item .p-title{color:#212121;font-family:PingFangSC-Medium,PingFang SC;font-size:14px;font-weight:500}.people-tree .people-tree-item .clear-btn{color:#5585f5;cursor:pointer}.search-input-icon{color:rgba(0,0,0,.4);margin-bottom:-2px}.main-tree-container{overflow-y:auto}.df{display:flex}.search-tree-wrap .name-wrap,.search-tree-wrap .search-tree-item{align-items:center;display:flex}.search-tree-wrap .name-wrap{background:#7d88b5;border-radius:50%;height:48px;justify-content:center;margin-right:13px;width:48px}.search-tree-wrap .name-wrap .name{color:#fff;font-size:16px;line-height:16px;margin-bottom:0}.search-tree-wrap .info-wrap{display:flex;flex-direction:column;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.search-tree-wrap .info-wrap-top{align-items:flex-end;margin:0 0 1px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.search-tree-wrap .info-wrap-title{color:#4e4e4e;font-family:PingFangSC-Regular,PingFang SC;font-size:16px;font-weight:400;line-height:16px;margin-bottom:0}.search-tree-wrap .info-wrap-title .c-title{color:#212121;font-family:PingFangSC-Regular,PingFang SC;font-size:14px;font-weight:400}.search-tree-wrap .info-wrap-title .c-sub-title{color:#4e4e4e;font-family:PingFangSC-Regular,PingFang SC;font-size:12px}.search-tree-wrap .info-wrap-desc{color:#aeaeae;font-size:12px;line-height:17px;margin-bottom:0;margin-left:10px}.search-tree-wrap .info-wrap-position{color:#7d88b5;font-size:12px;line-height:17px;margin-bottom:0}.load-more-btn-wrap{box-sizing:border-box;cursor:pointer;display:flex;height:35px;justify-content:center;line-height:35px;padding-top:10px}.load-more-btn-wrap .search-input-icon{color:rgba(0,0,0,.4);font-size:16px;margin-right:14px}.load-more-btn-wrap .load-more-btn{color:#747c8e;font-size:12px;line-height:12px}

package/es/shared/utils/index.d.ts

@@ -1,4 +1,8 @@
+import { AnyObject, ArrayAble } from '../../../es/shared/types';
 import { App, Component } from 'vue';
+export declare function traverse<T extends ArrayAble<AnyObject>>(target: T, handler: (item: T extends Array<infer P> ? P : T) => void, keys?: ArrayAble<string>): void;
 export declare function safeComponentRegister(app: App, component: Component, cName?: string | undefined, scheduler?: () => void): void;
 export declare function generateTimeFormat(format: string): string | undefined;
 export declare function arrayed<T>(maybeArray: T): T extends Array<any> ? T : [T];
+export declare function uuidGenerator(): string;
+export declare const getStringWidth: import("@vueuse/core").UseMemoizedFn<number, [str: string]>;

package/es/shared/utils/index.js

@@ -1 +1 @@
-export { arrayed, generateTimeFormat, safeComponentRegister } from './index2.js';
+export { arrayed, generateTimeFormat, getStringWidth, safeComponentRegister, traverse, uuidGenerator } from './index2.js';

package/es/shared/utils/index2.js

@@ -1,5 +1,14 @@
-import { isString } from 'lodash-es';
+import { useMemoize } from '@vueuse/core';
+import { isArray, isString } from 'lodash-es';
 
+function traverse(target, handler, keys = "children") {
+  arrayed(target).forEach((item) => {
+    handler(item);
+    arrayed(keys).forEach((key) => {
+      isArray(item[key]) && traverse(item[key], handler);
+    });
+  });
+}
 function safeComponentRegister(app, component, cName = component.name, scheduler) {
   if (!cName)
     throw new Error(`[CUI]: invalid component name for ${component}`);
@@ -26,5 +35,54 @@ function arrayed(maybeArray) {
     return maybeArray;
   return [maybeArray];
 }
+function uuidGenerator() {
+  if (window.isSecureContext && window.crypto)
+    return `key${window.crypto.randomUUID()}`;
+  const uuid = "xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
+    const r = Math.random() * 16 | 0, v = c == "x" ? r : r & 3 | 8;
+    return v.toString(16);
+  });
+  return `key${uuid}`;
+}
+const getStringWidth = /* @__PURE__ */ useMemoize(function(str) {
+  if (!str)
+    return 0;
+  return [...str].reduce((width, char) => {
+    if (/[a-z]/.test(char)) {
+      return width + 8;
+    }
+    if (/[A-Z]/.test(char)) {
+      return width + 12;
+    }
+    if (/\d/.test(char)) {
+      return width + 9;
+    }
+    if (/\./.test(char)) {
+      return width + 4;
+    }
+    if (/[\u4e00-\u9fa5]/.test(char)) {
+      return width + 15;
+    }
+    if (/-/.test(char)) {
+      return width + 4;
+    }
+    if (/[（）]/.test(char)) {
+      return width + 14;
+    }
+    if (/[)(]/.test(char)) {
+      return width + 5;
+    }
+    if (/-/.test(char)) {
+      return width + 10;
+    }
+    if (/%/.test(char)) {
+      return width + 14;
+    }
+    if (/‰/.test(char)) {
+      return width + 16;
+    }
+    return width + 6;
+  }, 0);
+});
 
-export { arrayed, generateTimeFormat, safeComponentRegister };
+export { arrayed, generateTimeFormat, getStringWidth, safeComponentRegister, traverse, uuidGenerator };

package/es/shared/utils/tapable/AsyncSeriesHook.js

@@ -1,4 +1,4 @@
-import './Hook.js';
+import Hook from './Hook.js';
 import HookCodeFactory from './HookCodeFactory.js';
 
 class AsyncSeriesHookCodeFactory extends HookCodeFactory {
@@ -9,4 +9,19 @@ class AsyncSeriesHookCodeFactory extends HookCodeFactory {
     });
   }
 }
-new AsyncSeriesHookCodeFactory();
+const factory = new AsyncSeriesHookCodeFactory();
+const COMPILE = function(options) {
+  factory.setup(this, options);
+  return factory.create(options);
+};
+function AsyncSeriesHook(args = [], name = void 0) {
+  const hook = new Hook(args, name);
+  hook.constructor = AsyncSeriesHook;
+  hook.compile = COMPILE;
+  hook._call = void 0;
+  hook.call = void 0;
+  return hook;
+}
+AsyncSeriesHook.prototype = null;
+
+export { AsyncSeriesHook as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "3.1.22",
+  "version": "3.1.23-beta.1",
   "license": "ISC",
   "module": "./es/components/index.js",
   "main": "./es/components/index.js",
@@ -66,5 +66,5 @@
     "iOS 7",
     "last 3 iOS versions"
   ],
-  "gitHead": "8e4ed1f54e0fddab1fe79a907d1bb37982ac1552"
+  "gitHead": "fe4dfdbb4c163d58aea824cf82e24a7d3df115c2"
 }

package/es/components/big-table/src/components/edit-form/useCommon.d.ts

@@ -1,4 +0,0 @@
-export declare const useCommon: (props: any, attrs: any) => {
-    formRef: import("vue").Ref<HTMLElement | null>;
-    isShow: import("vue").Ref<boolean>;
-};

package/es/components/bpmn-workflow/types/BpmnViewer.d.ts

@@ -1 +0,0 @@
-declare module 'bpmn-js/lib/Viewer';

package/es/components/bpmn-workflow/types/ModelingModule.d.ts

@@ -1 +0,0 @@
-declare module 'bpmn-js/lib/features/modeling';

package/es/components/bpmn-workflow/types/MoveCanvasModule.d.ts

@@ -1 +0,0 @@
-declare module 'diagram-js/lib/navigation/movecanvas';