hy-dispatch-ui-v3 0.2.46 → 0.2.48

package/es/components/hyBatchUploadDialog/batchUploadDialog.vue.mjs

@@ -86,7 +86,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     "reset",
     "validate",
     "submitting",
-    "submit"
+    "submit",
+    "onMinimized",
+    "onDialogMousedown"
   ], ["update:modelValue"]),
   setup(__props, { expose: __expose, emit: __emit }) {
     const emits = __emit;
@@ -96,6 +98,16 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     const isSubmitting = ref(false);
     const failedCount = ref(0);
     const failedStatus = ref(null);
+    const HyDialogRef = useTemplateRef("HyDialogRef");
+    function setDragLevelIndex(dragLevel) {
+      HyDialogRef.value.setDragLevelIndex(dragLevel);
+    }
+    function onMinimized(e) {
+      emits("onMinimized", e);
+    }
+    function onDialogMousedown(e) {
+      emits("onDialogMousedown", e);
+    }
     async function show() {
       visible.value = true;
       showSubmit.value = false;
@@ -144,6 +156,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     }
     __expose({
       show,
+      setDragLevelIndex,
       getTableDataSource: () => {
         return batchTableFormRef.value.getTableDataSource();
       },
@@ -156,6 +169,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     });
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(HyDialog), mergeProps({
+        ref_key: "HyDialogRef",
+        ref: HyDialogRef,
         modelValue: visible.value,
         "onUpdate:modelValue": ($event) => visible.value = $event,
         loading: isSubmitting.value,
@@ -168,7 +183,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         "show-cancel": !isSubmitting.value,
         ifShrink: __props.ifShrink,
         ifDraggable: __props.ifDraggable
-      }, _ctx.$attrs), createSlots({
+      }, _ctx.$attrs, {
+        onOnMinimized: onMinimized,
+        onOnDialogMousedown: onDialogMousedown
+      }), createSlots({
         "operate-left-box": withCtx(() => [
           failedCount.value ? (openBlock(), createElementBlock("div", {
             key: 0,

package/es/components/hyDialog/dialog.vue.mjs

@@ -24,6 +24,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       type: String,
       default: ""
     },
+    operateClass: {
+      type: String,
+      default: ""
+    },
     top: String,
     // 是否可缩小化
     ifShrink: { type: Boolean, default: false },
@@ -40,7 +44,16 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       default: "default"
     },
     cancelText: {
-      type: String
+      type: String,
+      default: () => {
+        return null;
+      }
+    },
+    submitText: {
+      type: String,
+      default: () => {
+        return null;
+      }
     },
     showSubmit: {
       type: Boolean,
@@ -56,9 +69,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         return "1000px";
       }
     },
-    submitText: {
-      type: String
-    },
     onClose: Function,
     onCancel: Function,
     onSubmit: Function
@@ -259,47 +269,55 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                   key: 0,
                   class: "flex items-center flex-row-reverse justify-between p-5 pr-[26px] mt-auto box-border"
                 }, [
-                  createElementVNode("div", { class: "flex items-center" }, [
-                    renderSlot(_ctx.$slots, "operate", {}, () => [
-                      __props.showCancel ? (openBlock(), createBlock(unref(HyButton), {
-                        key: 0,
-                        type: __props.cancelType,
-                        disabled: loading.value,
-                        class: "!min-w-[120px]",
-                        onMousedown: withModifiers(() => {
-                        }, ["stop"]),
-                        onClick: onCancelHandler
-                      }, {
-                        default: withCtx(() => [
-                          createTextVNode(
-                            toDisplayString(unref(t)("dialog.cancel")),
-                            1
-                            /* TEXT */
-                          )
-                        ]),
-                        _: 1
-                        /* STABLE */
-                      }, 8, ["type", "disabled", "onMousedown"])) : createCommentVNode("v-if", true),
-                      __props.showSubmit ? (openBlock(), createBlock(unref(HyButton), {
-                        key: 1,
-                        type: __props.submitType,
-                        disabled: loading.value,
-                        class: "!min-w-[120px]",
-                        onClick: onSubmitHandler
-                      }, {
-                        default: withCtx(() => [
-                          createTextVNode(
-                            toDisplayString(unref(t)("dialog.confirm")),
-                            1
-                            /* TEXT */
-                          )
-                        ]),
-                        _: 1
-                        /* STABLE */
-                      }, 8, ["type", "disabled"])) : createCommentVNode("v-if", true)
-                    ]),
-                    renderSlot(_ctx.$slots, "operate-right-box")
-                  ]),
+                  createElementVNode(
+                    "div",
+                    {
+                      class: normalizeClass([__props.operateClass, "flex items-center"])
+                    },
+                    [
+                      renderSlot(_ctx.$slots, "operate", {}, () => [
+                        __props.showCancel ? (openBlock(), createBlock(unref(HyButton), {
+                          key: 0,
+                          type: __props.cancelType,
+                          disabled: loading.value,
+                          class: "!min-w-[120px]",
+                          onMousedown: withModifiers(() => {
+                          }, ["stop"]),
+                          onClick: onCancelHandler
+                        }, {
+                          default: withCtx(() => [
+                            createTextVNode(
+                              toDisplayString(__props.cancelText || unref(t)("dialog.cancel")),
+                              1
+                              /* TEXT */
+                            )
+                          ]),
+                          _: 1
+                          /* STABLE */
+                        }, 8, ["type", "disabled", "onMousedown"])) : createCommentVNode("v-if", true),
+                        __props.showSubmit ? (openBlock(), createBlock(unref(HyButton), {
+                          key: 1,
+                          type: __props.submitType,
+                          disabled: loading.value,
+                          class: "!min-w-[120px]",
+                          onClick: onSubmitHandler
+                        }, {
+                          default: withCtx(() => [
+                            createTextVNode(
+                              toDisplayString(__props.submitText || unref(t)("dialog.confirm")),
+                              1
+                              /* TEXT */
+                            )
+                          ]),
+                          _: 1
+                          /* STABLE */
+                        }, 8, ["type", "disabled"])) : createCommentVNode("v-if", true)
+                      ]),
+                      renderSlot(_ctx.$slots, "operate-right-box")
+                    ],
+                    2
+                    /* CLASS */
+                  ),
                   renderSlot(_ctx.$slots, "operate-left-box")
                 ])) : createCommentVNode("v-if", true)
               ])

package/es/components/hyForm/cpns/formItem.vue.mjs

@@ -232,7 +232,7 @@ const _sfc_main = {
                     "onUpdate:end": ($event) => bindValue2.value = $event,
                     "is-range": true,
                     style: { "width": "100%" },
-                    teleported: false
+                    teleported: true
                   }, __props.column.attrs, {
                     disabled: unref(isDisabled)(props, __props.column),
                     onChange: onChangeHandler
@@ -242,7 +242,7 @@ const _sfc_main = {
                     "onUpdate:modelValue": ($event) => bindValue.value = $event,
                     "is-range": false,
                     style: { "width": "100%" },
-                    teleported: false
+                    teleported: true
                   }, __props.column.attrs, {
                     disabled: unref(isDisabled)(props, __props.column),
                     onChange: onChangeHandler
@@ -263,7 +263,7 @@ const _sfc_main = {
                     "onUpdate:end": ($event) => bindValue2.value = $event,
                     "is-range": true,
                     style: { "width": "100%" },
-                    teleported: false
+                    teleported: true
                   }, __props.column.attrs, {
                     disabled: unref(isDisabled)(props, __props.column),
                     onChange: onChangeHandler
@@ -273,7 +273,7 @@ const _sfc_main = {
                     "onUpdate:modelValue": ($event) => bindValue.value = $event,
                     "is-range": false,
                     style: { "width": "100%" },
-                    teleported: false
+                    teleported: true
                   }, __props.column.attrs, {
                     disabled: unref(isDisabled)(props, __props.column),
                     onChange: onChangeHandler

package/es/components/hyForm/form.vue.mjs

@@ -35,6 +35,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       type: Boolean,
       default: false
     },
+    loading: {
+      type: Boolean,
+      default: false
+    },
     disabled: {
       type: Boolean,
       default: false
@@ -168,7 +172,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                             column,
                             rules: __props.rules,
                             columnNum: __props.columnNum,
-                            loading: _ctx.loading,
+                            loading: __props.loading,
                             disabled: __props.disabled,
                             readonly: __props.readonly,
                             style: normalizeStyle(unref(columnItemStyle)(props, column))
@@ -199,7 +203,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                             column,
                             rules: __props.rules,
                             columnNum: __props.columnNum,
-                            loading: _ctx.loading,
+                            loading: __props.loading,
                             disabled: __props.disabled,
                             readonly: __props.readonly,
                             size: __props.size,
@@ -229,7 +233,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                             model: __props.model,
                             column,
                             rules: __props.rules,
-                            loading: _ctx.loading,
+                            loading: __props.loading,
                             disabled: __props.disabled,
                             readonly: __props.readonly
                           }, createSlots({

package/es/components/hyTree/js/index.mjs

@@ -105,7 +105,8 @@ const useAppTreeWrapper = (hy) => {
                 return false;
               }
               return false;
-            }
+            },
+            ...props.treeProps
           },
           rowSelection: {
             type: props.showCheckbox ? "checkbox" : "radio",
@@ -121,6 +122,7 @@ const useAppTreeWrapper = (hy) => {
             cancelable: true,
             // 选中回调
             onCheckChange: (data, info, checked) => {
+              console.log("onCheckChange", info);
               if (data.dataType === 3 && !checked) {
                 emits("on-click-delete", JSON.parse(JSON.stringify(data)));
               } else if (data.dataType === 3) {
@@ -128,7 +130,9 @@ const useAppTreeWrapper = (hy) => {
               }
               emits(
                 "on-check-tree",
-                JSON.parse(JSON.stringify(info.checkedBusinessNodes))
+                JSON.parse(
+                  JSON.stringify(info.checkedBusinessNodes || info.checkedNodes)
+                )
               );
             }
           },
@@ -136,7 +140,9 @@ const useAppTreeWrapper = (hy) => {
           filterMethod: ({ filterValue: filterValue2 }, data) => {
             let isFilter = true;
             if (filterValue2) {
-              isFilter = isFilter && !!filterNodeMethod(data, filterValue2);
+              isFilter = isFilter && !!filterNodeMethod(data, filterValue2, {
+                treeFilterParam: props.treeFilterParam
+              });
             }
             return isFilter;
           },
@@ -369,23 +375,29 @@ const useAppTreeWrapper = (hy) => {
     emits("on-addDevice");
   }
   function singleRemovalFn(row) {
-    if (props.treeType === "user") {
-      virtualTree.setChecked(row.id, false, true);
-    } else {
+    if (props.treeType === "device") {
       virtualTree.setChecked(row.deviceId, false, true);
+    } else if (props.treeType) {
+      virtualTree.setChecked(row.id, false, true);
+    } else if (!props.treeType && props.treeProps) {
+      virtualTree.setChecked(row[`${props.treeProps.value}`], false, true);
     }
   }
   function setCheckedKeys(dataList) {
-    if (props.treeType === "user") {
+    if (props.treeType === "device") {
       virtualTree?.setCheckedKeys(
-        dataList.map((v) => v.id),
+        dataList.map((v) => v.deviceId),
         true
       );
-    } else {
+    } else if (props.treeType) {
       virtualTree?.setCheckedKeys(
-        dataList.map((v) => v.deviceId),
+        dataList.map((v) => v.id),
         true
       );
+    } else if (!props.treeType && props.treeProps) {
+      virtualTree?.setCheckedKeys(
+        dataList.map((v) => v[`${props.treeProps.value}`])
+      );
     }
     if (props.isBackDefaultSelected) {
       setTimeout(() => {
@@ -395,10 +407,12 @@ const useAppTreeWrapper = (hy) => {
     }
   }
   function setChecked(data, type) {
-    if (props.treeType === "user") {
-      virtualTree?.setChecked(data.id, type, true);
-    } else {
+    if (props.treeType === "device") {
       virtualTree?.setChecked(data.deviceId, type, true);
+    } else if (props.treeType) {
+      virtualTree?.setChecked(data.id, type, true);
+    } else if (!props.treeType && props.treeProps) {
+      virtualTree?.setChecked(data[`${props.treeProps.value}`], type, true);
     }
   }
   function setSelectedOrg(deviceList) {
@@ -498,31 +512,46 @@ const useAppTreeWrapper = (hy) => {
     getSelectedDataList
   };
 };
-function filterNodeMethod(data, value, selectFilterType) {
+function filterNodeMethod(data, value, { selectFilterType, treeFilterParam = [] }) {
   let type = data.dataType;
+  if (selectFilterType) type = selectFilterType;
   const includesValue = (field) => {
     return field && field.toString().includes(value.toString());
   };
-  switch (type) {
-    case 7:
-      if (data.typeName === "workOrderList") {
-        return includesValue(data.workTimeName);
-      } else {
-        return includesValue(data.dailyCheckName);
+  if (!type) {
+    let filterType = false;
+    for (let i = 0; i < treeFilterParam.length; i++) {
+      const item = treeFilterParam[i];
+      if (!filterType) {
+        filterType = includesValue(data[`${item}`]);
+        if (filterType) {
+          break;
+        }
       }
-    case 6:
-      return includesValue(data.deviceUserName) || includesValue(data.item?.deviceId);
-    case 5:
-      return includesValue(data.jobNum) || includesValue(data.name) || includesValue(data.phone);
-    case 4:
-    case 11:
-      return includesValue(data.groupName);
-    case 8:
-      return includesValue(data.sname);
-    case 3:
-      return includesValue(data.deviceId) || includesValue(data.devName) || includesValue(data.name) || includesValue(data.deviceCode) || includesValue(data.imei);
-    default:
-      return includesValue(data.companyName) || includesValue(data.orgName);
+    }
+    return filterType;
+  } else {
+    switch (type) {
+      case 7:
+        if (data.typeName === "workOrderList") {
+          return includesValue(data.workTimeName);
+        } else {
+          return includesValue(data.dailyCheckName);
+        }
+      case 6:
+        return includesValue(data.deviceUserName) || includesValue(data.item?.deviceId);
+      case 5:
+        return includesValue(data.jobNum) || includesValue(data.name) || includesValue(data.phone);
+      case 4:
+      case 11:
+        return includesValue(data.groupName);
+      case 8:
+        return includesValue(data.sname);
+      case 3:
+        return includesValue(data.deviceId) || includesValue(data.devName) || includesValue(data.name) || includesValue(data.deviceCode) || includesValue(data.imei);
+      default:
+        return includesValue(data.companyName) || includesValue(data.orgName);
+    }
   }
 }
 

package/es/components/hyTree/tree.vue.mjs

@@ -77,6 +77,20 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         return treeTypeConfig.device;
       }
     },
+    // 树形 props 类型 （treeType null时生效）
+    treeProps: {
+      type: Object,
+      default: () => {
+        return {};
+      }
+    },
+    // 树形 过滤参数 类型 （treeType null时生效）
+    treeFilterParam: {
+      type: Array,
+      default: () => {
+        return [];
+      }
+    },
     // 是否显示通道节点的选择框
     isShowChannelSelect: {
       type: Boolean,

package/es/static/hy-svg-icons/hy-icon-layout-sidenav-parameter-settings.js

@@ -0,0 +1,8 @@
+export default {
+  id: 'hy-icon-layout-sidenav-parameter-settings',
+  symbol: `<symbol id="hy-icon-layout-sidenav-parameter-settings" viewBox="0 0 20 20">
+    <g id="hy-icon-layout-sidenav-parameter-settings-menu/ParameterSettings" stroke="none" stroke-width="1"  fill-rule="evenodd">
+        <path d="M15.8266599,2 L4.1733401,2 C2.97313737,2 2,2.97313735 2,4.17334008 L2,15.8266599 C2,17.0268626 2.97313735,18 4.1733401,18 L15.8266599,18 C17.0268627,18 18,17.0268627 18,15.8266599 L18,4.17334008 C17.9959453,2.97313735 17.0228079,2 15.8266599,2 Z M15.4941713,14.1033958 L13.6087177,14.1033958 C13.2924481,14.7602636 12.6234161,15.2184491 11.8449062,15.2184491 C11.0663964,15.2184491 10.3973644,14.7643183 10.0810948,14.1033958 L4.80993411,14.1033958 C4.34769387,14.1033958 3.97060315,13.7263051 3.97060315,13.2640649 C3.97060315,12.8018246 4.34769387,12.4247339 4.80993411,12.4247339 L10.0851495,12.4247339 C10.4014192,11.7678662 11.0704511,11.3096807 11.848961,11.3096807 C12.6274709,11.3096807 13.2965028,11.7638115 13.6127724,12.4247339 L15.4941713,12.4247339 C15.9564116,12.4247339 16.3335347,12.8018246 16.3335347,13.2640649 C16.337557,13.7303599 15.9604663,14.1033958 15.4941713,14.1033958 Z M15.4941713,7.57121135 L9.95945262,7.57121135 C9.64318298,8.22807907 8.97415105,8.68626458 8.19564115,8.68626458 C7.41713125,8.68626458 6.74809933,8.23213381 6.4318297,7.57121135 L4.80993411,7.57121135 C4.34769387,7.57121135 3.97060315,7.19412063 3.97060315,6.73188038 C3.97060315,6.26964014 4.34769387,5.89254941 4.80993411,5.89254941 L6.43588444,5.89254941 C6.75215408,5.2356817 7.42118601,4.77749619 8.1996959,4.77749619 C8.97820578,4.77749619 9.64723771,5.23162695 9.96350735,5.89254941 L15.4941713,5.89254941 C15.9564116,5.89254941 16.3335347,6.26964014 16.3335347,6.73188038 C16.337557,7.19412061 15.9604663,7.57121134 15.4941713,7.57121135 Z" id="hy-icon-layout-sidenav-parameter-settings-形状"  fill-rule="nonzero"></path>
+    </g>
+</symbol>`,
+};

package/es/version.mjs

@@ -1,3 +1,3 @@
-const version = "0.2.45";
+const version = "0.2.47";
 
 export { version };

package/lib/components/hyBatchUploadDialog/batchUploadDialog.vue.js

@@ -90,7 +90,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     "reset",
     "validate",
     "submitting",
-    "submit"
+    "submit",
+    "onMinimized",
+    "onDialogMousedown"
   ], ["update:modelValue"]),
   setup(__props, { expose: __expose, emit: __emit }) {
     const emits = __emit;
@@ -100,6 +102,16 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     const isSubmitting = vue.ref(false);
     const failedCount = vue.ref(0);
     const failedStatus = vue.ref(null);
+    const HyDialogRef = vue.useTemplateRef("HyDialogRef");
+    function setDragLevelIndex(dragLevel) {
+      HyDialogRef.value.setDragLevelIndex(dragLevel);
+    }
+    function onMinimized(e) {
+      emits("onMinimized", e);
+    }
+    function onDialogMousedown(e) {
+      emits("onDialogMousedown", e);
+    }
     async function show() {
       visible.value = true;
       showSubmit.value = false;
@@ -148,6 +160,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     }
     __expose({
       show,
+      setDragLevelIndex,
       getTableDataSource: () => {
         return batchTableFormRef.value.getTableDataSource();
       },
@@ -160,6 +173,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     });
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createBlock(vue.unref(index.HyDialog), vue.mergeProps({
+        ref_key: "HyDialogRef",
+        ref: HyDialogRef,
         modelValue: visible.value,
         "onUpdate:modelValue": ($event) => visible.value = $event,
         loading: isSubmitting.value,
@@ -172,7 +187,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         "show-cancel": !isSubmitting.value,
         ifShrink: __props.ifShrink,
         ifDraggable: __props.ifDraggable
-      }, _ctx.$attrs), vue.createSlots({
+      }, _ctx.$attrs, {
+        onOnMinimized: onMinimized,
+        onOnDialogMousedown: onDialogMousedown
+      }), vue.createSlots({
         "operate-left-box": vue.withCtx(() => [
           failedCount.value ? (vue.openBlock(), vue.createElementBlock("div", {
             key: 0,

package/lib/components/hyDialog/dialog.vue.js

@@ -28,6 +28,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       type: String,
       default: ""
     },
+    operateClass: {
+      type: String,
+      default: ""
+    },
     top: String,
     // 是否可缩小化
     ifShrink: { type: Boolean, default: false },
@@ -44,7 +48,16 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       default: "default"
     },
     cancelText: {
-      type: String
+      type: String,
+      default: () => {
+        return null;
+      }
+    },
+    submitText: {
+      type: String,
+      default: () => {
+        return null;
+      }
     },
     showSubmit: {
       type: Boolean,
@@ -60,9 +73,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         return "1000px";
       }
     },
-    submitText: {
-      type: String
-    },
     onClose: Function,
     onCancel: Function,
     onSubmit: Function
@@ -263,47 +273,55 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                   key: 0,
                   class: "flex items-center flex-row-reverse justify-between p-5 pr-[26px] mt-auto box-border"
                 }, [
-                  vue.createElementVNode("div", { class: "flex items-center" }, [
-                    vue.renderSlot(_ctx.$slots, "operate", {}, () => [
-                      __props.showCancel ? (vue.openBlock(), vue.createBlock(vue.unref(index.HyButton), {
-                        key: 0,
-                        type: __props.cancelType,
-                        disabled: loading.value,
-                        class: "!min-w-[120px]",
-                        onMousedown: vue.withModifiers(() => {
-                        }, ["stop"]),
-                        onClick: onCancelHandler
-                      }, {
-                        default: vue.withCtx(() => [
-                          vue.createTextVNode(
-                            vue.toDisplayString(vue.unref(t)("dialog.cancel")),
-                            1
-                            /* TEXT */
-                          )
-                        ]),
-                        _: 1
-                        /* STABLE */
-                      }, 8, ["type", "disabled", "onMousedown"])) : vue.createCommentVNode("v-if", true),
-                      __props.showSubmit ? (vue.openBlock(), vue.createBlock(vue.unref(index.HyButton), {
-                        key: 1,
-                        type: __props.submitType,
-                        disabled: loading.value,
-                        class: "!min-w-[120px]",
-                        onClick: onSubmitHandler
-                      }, {
-                        default: vue.withCtx(() => [
-                          vue.createTextVNode(
-                            vue.toDisplayString(vue.unref(t)("dialog.confirm")),
-                            1
-                            /* TEXT */
-                          )
-                        ]),
-                        _: 1
-                        /* STABLE */
-                      }, 8, ["type", "disabled"])) : vue.createCommentVNode("v-if", true)
-                    ]),
-                    vue.renderSlot(_ctx.$slots, "operate-right-box")
-                  ]),
+                  vue.createElementVNode(
+                    "div",
+                    {
+                      class: vue.normalizeClass([__props.operateClass, "flex items-center"])
+                    },
+                    [
+                      vue.renderSlot(_ctx.$slots, "operate", {}, () => [
+                        __props.showCancel ? (vue.openBlock(), vue.createBlock(vue.unref(index.HyButton), {
+                          key: 0,
+                          type: __props.cancelType,
+                          disabled: loading.value,
+                          class: "!min-w-[120px]",
+                          onMousedown: vue.withModifiers(() => {
+                          }, ["stop"]),
+                          onClick: onCancelHandler
+                        }, {
+                          default: vue.withCtx(() => [
+                            vue.createTextVNode(
+                              vue.toDisplayString(__props.cancelText || vue.unref(t)("dialog.cancel")),
+                              1
+                              /* TEXT */
+                            )
+                          ]),
+                          _: 1
+                          /* STABLE */
+                        }, 8, ["type", "disabled", "onMousedown"])) : vue.createCommentVNode("v-if", true),
+                        __props.showSubmit ? (vue.openBlock(), vue.createBlock(vue.unref(index.HyButton), {
+                          key: 1,
+                          type: __props.submitType,
+                          disabled: loading.value,
+                          class: "!min-w-[120px]",
+                          onClick: onSubmitHandler
+                        }, {
+                          default: vue.withCtx(() => [
+                            vue.createTextVNode(
+                              vue.toDisplayString(__props.submitText || vue.unref(t)("dialog.confirm")),
+                              1
+                              /* TEXT */
+                            )
+                          ]),
+                          _: 1
+                          /* STABLE */
+                        }, 8, ["type", "disabled"])) : vue.createCommentVNode("v-if", true)
+                      ]),
+                      vue.renderSlot(_ctx.$slots, "operate-right-box")
+                    ],
+                    2
+                    /* CLASS */
+                  ),
                   vue.renderSlot(_ctx.$slots, "operate-left-box")
                 ])) : vue.createCommentVNode("v-if", true)
               ])

package/lib/components/hyForm/cpns/formItem.vue.js

@@ -236,7 +236,7 @@ const _sfc_main = {
                     "onUpdate:end": ($event) => bindValue2.value = $event,
                     "is-range": true,
                     style: { "width": "100%" },
-                    teleported: false
+                    teleported: true
                   }, __props.column.attrs, {
                     disabled: vue.unref(index.isDisabled)(props, __props.column),
                     onChange: onChangeHandler
@@ -246,7 +246,7 @@ const _sfc_main = {
                     "onUpdate:modelValue": ($event) => bindValue.value = $event,
                     "is-range": false,
                     style: { "width": "100%" },
-                    teleported: false
+                    teleported: true
                   }, __props.column.attrs, {
                     disabled: vue.unref(index.isDisabled)(props, __props.column),
                     onChange: onChangeHandler
@@ -267,7 +267,7 @@ const _sfc_main = {
                     "onUpdate:end": ($event) => bindValue2.value = $event,
                     "is-range": true,
                     style: { "width": "100%" },
-                    teleported: false
+                    teleported: true
                   }, __props.column.attrs, {
                     disabled: vue.unref(index.isDisabled)(props, __props.column),
                     onChange: onChangeHandler
@@ -277,7 +277,7 @@ const _sfc_main = {
                     "onUpdate:modelValue": ($event) => bindValue.value = $event,
                     "is-range": false,
                     style: { "width": "100%" },
-                    teleported: false
+                    teleported: true
                   }, __props.column.attrs, {
                     disabled: vue.unref(index.isDisabled)(props, __props.column),
                     onChange: onChangeHandler

package/lib/components/hyForm/form.vue.js

@@ -39,6 +39,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       type: Boolean,
       default: false
     },
+    loading: {
+      type: Boolean,
+      default: false
+    },
     disabled: {
       type: Boolean,
       default: false
@@ -172,7 +176,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                             column,
                             rules: __props.rules,
                             columnNum: __props.columnNum,
-                            loading: _ctx.loading,
+                            loading: __props.loading,
                             disabled: __props.disabled,
                             readonly: __props.readonly,
                             style: vue.normalizeStyle(vue.unref(index.columnItemStyle)(props, column))
@@ -203,7 +207,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                             column,
                             rules: __props.rules,
                             columnNum: __props.columnNum,
-                            loading: _ctx.loading,
+                            loading: __props.loading,
                             disabled: __props.disabled,
                             readonly: __props.readonly,
                             size: __props.size,
@@ -233,7 +237,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                             model: __props.model,
                             column,
                             rules: __props.rules,
-                            loading: _ctx.loading,
+                            loading: __props.loading,
                             disabled: __props.disabled,
                             readonly: __props.readonly
                           }, vue.createSlots({

package/lib/components/hyTree/js/index.js

@@ -107,7 +107,8 @@ const useAppTreeWrapper = (hy) => {
                 return false;
               }
               return false;
-            }
+            },
+            ...props.treeProps
           },
           rowSelection: {
             type: props.showCheckbox ? "checkbox" : "radio",
@@ -123,6 +124,7 @@ const useAppTreeWrapper = (hy) => {
             cancelable: true,
             // 选中回调
             onCheckChange: (data, info, checked) => {
+              console.log("onCheckChange", info);
               if (data.dataType === 3 && !checked) {
                 emits("on-click-delete", JSON.parse(JSON.stringify(data)));
               } else if (data.dataType === 3) {
@@ -130,7 +132,9 @@ const useAppTreeWrapper = (hy) => {
               }
               emits(
                 "on-check-tree",
-                JSON.parse(JSON.stringify(info.checkedBusinessNodes))
+                JSON.parse(
+                  JSON.stringify(info.checkedBusinessNodes || info.checkedNodes)
+                )
               );
             }
           },
@@ -138,7 +142,9 @@ const useAppTreeWrapper = (hy) => {
           filterMethod: ({ filterValue: filterValue2 }, data) => {
             let isFilter = true;
             if (filterValue2) {
-              isFilter = isFilter && !!filterNodeMethod(data, filterValue2);
+              isFilter = isFilter && !!filterNodeMethod(data, filterValue2, {
+                treeFilterParam: props.treeFilterParam
+              });
             }
             return isFilter;
           },
@@ -371,23 +377,29 @@ const useAppTreeWrapper = (hy) => {
     emits("on-addDevice");
   }
   function singleRemovalFn(row) {
-    if (props.treeType === "user") {
-      virtualTree.setChecked(row.id, false, true);
-    } else {
+    if (props.treeType === "device") {
       virtualTree.setChecked(row.deviceId, false, true);
+    } else if (props.treeType) {
+      virtualTree.setChecked(row.id, false, true);
+    } else if (!props.treeType && props.treeProps) {
+      virtualTree.setChecked(row[`${props.treeProps.value}`], false, true);
     }
   }
   function setCheckedKeys(dataList) {
-    if (props.treeType === "user") {
+    if (props.treeType === "device") {
       virtualTree?.setCheckedKeys(
-        dataList.map((v) => v.id),
+        dataList.map((v) => v.deviceId),
         true
       );
-    } else {
+    } else if (props.treeType) {
       virtualTree?.setCheckedKeys(
-        dataList.map((v) => v.deviceId),
+        dataList.map((v) => v.id),
         true
       );
+    } else if (!props.treeType && props.treeProps) {
+      virtualTree?.setCheckedKeys(
+        dataList.map((v) => v[`${props.treeProps.value}`])
+      );
     }
     if (props.isBackDefaultSelected) {
       setTimeout(() => {
@@ -397,10 +409,12 @@ const useAppTreeWrapper = (hy) => {
     }
   }
   function setChecked(data, type) {
-    if (props.treeType === "user") {
-      virtualTree?.setChecked(data.id, type, true);
-    } else {
+    if (props.treeType === "device") {
       virtualTree?.setChecked(data.deviceId, type, true);
+    } else if (props.treeType) {
+      virtualTree?.setChecked(data.id, type, true);
+    } else if (!props.treeType && props.treeProps) {
+      virtualTree?.setChecked(data[`${props.treeProps.value}`], type, true);
     }
   }
   function setSelectedOrg(deviceList) {
@@ -500,31 +514,46 @@ const useAppTreeWrapper = (hy) => {
     getSelectedDataList
   };
 };
-function filterNodeMethod(data, value, selectFilterType) {
+function filterNodeMethod(data, value, { selectFilterType, treeFilterParam = [] }) {
   let type = data.dataType;
+  if (selectFilterType) type = selectFilterType;
   const includesValue = (field) => {
     return field && field.toString().includes(value.toString());
   };
-  switch (type) {
-    case 7:
-      if (data.typeName === "workOrderList") {
-        return includesValue(data.workTimeName);
-      } else {
-        return includesValue(data.dailyCheckName);
+  if (!type) {
+    let filterType = false;
+    for (let i = 0; i < treeFilterParam.length; i++) {
+      const item = treeFilterParam[i];
+      if (!filterType) {
+        filterType = includesValue(data[`${item}`]);
+        if (filterType) {
+          break;
+        }
       }
-    case 6:
-      return includesValue(data.deviceUserName) || includesValue(data.item?.deviceId);
-    case 5:
-      return includesValue(data.jobNum) || includesValue(data.name) || includesValue(data.phone);
-    case 4:
-    case 11:
-      return includesValue(data.groupName);
-    case 8:
-      return includesValue(data.sname);
-    case 3:
-      return includesValue(data.deviceId) || includesValue(data.devName) || includesValue(data.name) || includesValue(data.deviceCode) || includesValue(data.imei);
-    default:
-      return includesValue(data.companyName) || includesValue(data.orgName);
+    }
+    return filterType;
+  } else {
+    switch (type) {
+      case 7:
+        if (data.typeName === "workOrderList") {
+          return includesValue(data.workTimeName);
+        } else {
+          return includesValue(data.dailyCheckName);
+        }
+      case 6:
+        return includesValue(data.deviceUserName) || includesValue(data.item?.deviceId);
+      case 5:
+        return includesValue(data.jobNum) || includesValue(data.name) || includesValue(data.phone);
+      case 4:
+      case 11:
+        return includesValue(data.groupName);
+      case 8:
+        return includesValue(data.sname);
+      case 3:
+        return includesValue(data.deviceId) || includesValue(data.devName) || includesValue(data.name) || includesValue(data.deviceCode) || includesValue(data.imei);
+      default:
+        return includesValue(data.companyName) || includesValue(data.orgName);
+    }
   }
 }
 

package/lib/components/hyTree/tree.vue.js

@@ -81,6 +81,20 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         return treeConfig.treeTypeConfig.device;
       }
     },
+    // 树形 props 类型 （treeType null时生效）
+    treeProps: {
+      type: Object,
+      default: () => {
+        return {};
+      }
+    },
+    // 树形 过滤参数 类型 （treeType null时生效）
+    treeFilterParam: {
+      type: Array,
+      default: () => {
+        return [];
+      }
+    },
     // 是否显示通道节点的选择框
     isShowChannelSelect: {
       type: Boolean,

package/lib/static/hy-svg-icons/hy-icon-layout-sidenav-parameter-settings.js

@@ -0,0 +1,8 @@
+export default {
+  id: 'hy-icon-layout-sidenav-parameter-settings',
+  symbol: `<symbol id="hy-icon-layout-sidenav-parameter-settings" viewBox="0 0 20 20">
+    <g id="hy-icon-layout-sidenav-parameter-settings-menu/ParameterSettings" stroke="none" stroke-width="1"  fill-rule="evenodd">
+        <path d="M15.8266599,2 L4.1733401,2 C2.97313737,2 2,2.97313735 2,4.17334008 L2,15.8266599 C2,17.0268626 2.97313735,18 4.1733401,18 L15.8266599,18 C17.0268627,18 18,17.0268627 18,15.8266599 L18,4.17334008 C17.9959453,2.97313735 17.0228079,2 15.8266599,2 Z M15.4941713,14.1033958 L13.6087177,14.1033958 C13.2924481,14.7602636 12.6234161,15.2184491 11.8449062,15.2184491 C11.0663964,15.2184491 10.3973644,14.7643183 10.0810948,14.1033958 L4.80993411,14.1033958 C4.34769387,14.1033958 3.97060315,13.7263051 3.97060315,13.2640649 C3.97060315,12.8018246 4.34769387,12.4247339 4.80993411,12.4247339 L10.0851495,12.4247339 C10.4014192,11.7678662 11.0704511,11.3096807 11.848961,11.3096807 C12.6274709,11.3096807 13.2965028,11.7638115 13.6127724,12.4247339 L15.4941713,12.4247339 C15.9564116,12.4247339 16.3335347,12.8018246 16.3335347,13.2640649 C16.337557,13.7303599 15.9604663,14.1033958 15.4941713,14.1033958 Z M15.4941713,7.57121135 L9.95945262,7.57121135 C9.64318298,8.22807907 8.97415105,8.68626458 8.19564115,8.68626458 C7.41713125,8.68626458 6.74809933,8.23213381 6.4318297,7.57121135 L4.80993411,7.57121135 C4.34769387,7.57121135 3.97060315,7.19412063 3.97060315,6.73188038 C3.97060315,6.26964014 4.34769387,5.89254941 4.80993411,5.89254941 L6.43588444,5.89254941 C6.75215408,5.2356817 7.42118601,4.77749619 8.1996959,4.77749619 C8.97820578,4.77749619 9.64723771,5.23162695 9.96350735,5.89254941 L15.4941713,5.89254941 C15.9564116,5.89254941 16.3335347,6.26964014 16.3335347,6.73188038 C16.337557,7.19412061 15.9604663,7.57121134 15.4941713,7.57121135 Z" id="hy-icon-layout-sidenav-parameter-settings-形状"  fill-rule="nonzero"></path>
+    </g>
+</symbol>`,
+};

package/lib/version.js

@@ -1,5 +1,5 @@
 'use strict';
 
-const version = "0.2.45";
+const version = "0.2.47";
 
 exports.version = version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hy-dispatch-ui-v3",
-  "version": "0.2.46",
+  "version": "0.2.48",
   "main": "lib/index.js",
   "module": "es/index.mjs",
   "scripts": {