cnhis-design-vue 3.1.8-beta.8 → 3.1.9-beta.1

package/es/packages/select-label/src/LabelFormContent.vue.d.ts

@@ -165,6 +165,9 @@ declare const _default: import("vue").DefineComponent<{
             tabTextColorHoverCard: string;
             tabTextColorActiveCard: string;
             tabTextColorDisabledCard: string;
+            /**
+              * 重置label选项
+              */
             barColor: string;
             closeIconColor: string;
             closeIconColorHover: string;

package/es/packages/select-label/style/index.less

@@ -1,151 +1,151 @@
-.c-select-label {
-  .label-disable-wrap {
-    width: 100%;
-    font-size: 14px;
-    line-height: 20px;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-
-    .label-disable-img {
-      width: 320px;
-      height: 248px;
-    }
-  }
-  .common-label {
-    padding: 4px 12px;
-    margin-top: 8px !important;
-    border-radius: 4px;
-    border: 1px solid rgba(0, 0, 0, 0.1);
-    > span {
-      margin-right: 16px;
-      color: rgba(0, 0, 0, 0.9);
-    }
-  }
-  .form-add-icon-label {
-    margin-bottom: 4px;
-    color: #2d7aff;
-    cursor: pointer;
-    display: inline-flex;
-    align-items: center;
-  }
-  .anticon + .anticon {
-    margin-left: 16px;
-  }
-  .label-disable-wrap {
-    text-align: center;
-  }
-  .n-tag {
-    max-width: 108px;
-    margin: 0 8px 0 0;
-    border: 1px solid rgb(224, 224, 230);
-    .n-base-icon {
-      color: #fff;
-    }
-    .n-tag__content {
-      display: inline-block;
-      align-items: center;
-      max-width: 80px;
-      height: 100%;
-      line-height: 20px;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-  }
-}
-
-.c-label-form-content {
-  width: 100%;
-  height: 100%;
-  border-top: 1px solid #e8e8e8;
-  border-bottom: 1px solid #e8e8e8;
-  .label-wrap {
-    display: flex;
-    width: 100%;
-    height: 100%;
-    .left-label-wrap {
-      width: 140px;
-      height: 404px;
-      max-height: 404px;
-      border-right: 1px solid #e8e8e8;
-      &.total-left-label-wrap {
-        height: calc(100vh - 109px);
-        max-height: calc(100vh - 109px);
-      }
-      &.explicit-label-wrap {
-        width: 100%;
-        height: auto;
-        overflow: hidden;
-        overflow-y: auto;
-      }
-      .n-anchor.n-anchor--block .n-anchor-link {
-        padding: 10px 8px;
-        font-size: 14px;
-        &.n-anchor-link--active {
-          background-color: #f2f2f2;
-        }
-      }
-    }
-    .right-label-wrap {
-      flex: 1;
-      height: 404px;
-      max-height: 404px;
-      overflow-y: auto;
-      &.total-right-label-wrap {
-        max-height: calc(100vh - 109px);
-      }
-      .label-add {
-        position: relative;
-        top: 2px;
-        height: 30px;
-        line-height: 30px;
-        width: 108px;
-        text-align: center;
-        display: inline-flex;
-        justify-content: center;
-      }
-      .add-input {
-        width: 108px;
-        .n-input__suffix {
-          cursor: pointer;
-        }
-      }
-    }
-    .explicit-continer {
-      width: 100%;
-      border: 1px solid #d5d5d5;
-    }
-  }
-  .edit-label-type {
-    font-size: 12px;
-    margin-left: 4px;
-  }
-  .edit-label-content {
-    padding: 0 14px;
-    .edit-content {
-      width: 100%;
-      margin-top: 8px;
-      margin-bottom: 10px;
-      .n-tag {
-        max-width: 108px;
-        margin: 0 8px 8px 0;
-        text-align: center;
-        border: 1px solid rgb(224, 224, 230);
-        .n-tag__content {
-          display: inline-flex;
-          align-items: center;
-          span {
-            display: inline-block;
-            width: 80px;
-            height: 100%;
-            line-height: 30px;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-          }
-        }
-      }
-    }
-  }
-}
+.c-select-label {
+  .label-disable-wrap {
+    width: 100%;
+    font-size: 14px;
+    line-height: 20px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+
+    .label-disable-img {
+      width: 320px;
+      height: 248px;
+    }
+  }
+  .common-label {
+    padding: 4px 12px;
+    margin-top: 8px !important;
+    border-radius: 4px;
+    border: 1px solid rgba(0, 0, 0, 0.1);
+    > span {
+      margin-right: 16px;
+      color: rgba(0, 0, 0, 0.9);
+    }
+  }
+  .form-add-icon-label {
+    margin-bottom: 4px;
+    color: #2d7aff;
+    cursor: pointer;
+    display: inline-flex;
+    align-items: center;
+  }
+  .anticon + .anticon {
+    margin-left: 16px;
+  }
+  .label-disable-wrap {
+    text-align: center;
+  }
+  .n-tag {
+    max-width: 108px;
+    margin: 0 8px 0 0;
+    border: 1px solid rgb(224, 224, 230);
+    .n-base-icon {
+      color: #fff;
+    }
+    .n-tag__content {
+      display: inline-block;
+      align-items: center;
+      max-width: 80px;
+      height: 100%;
+      line-height: 20px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+  }
+}
+
+.c-label-form-content {
+  width: 100%;
+  height: 100%;
+  border-top: 1px solid #e8e8e8;
+  border-bottom: 1px solid #e8e8e8;
+  .label-wrap {
+    display: flex;
+    width: 100%;
+    height: 100%;
+    .left-label-wrap {
+      width: 140px;
+      height: 404px;
+      max-height: 404px;
+      border-right: 1px solid #e8e8e8;
+      &.total-left-label-wrap {
+        height: calc(100vh - 109px);
+        max-height: calc(100vh - 109px);
+      }
+      &.explicit-label-wrap {
+        width: 100%;
+        height: auto;
+        overflow: hidden;
+        overflow-y: auto;
+      }
+      .n-anchor.n-anchor--block .n-anchor-link {
+        padding: 10px 8px;
+        font-size: 14px;
+        &.n-anchor-link--active {
+          background-color: #f2f2f2;
+        }
+      }
+    }
+    .right-label-wrap {
+      flex: 1;
+      height: 404px;
+      max-height: 404px;
+      overflow-y: auto;
+      &.total-right-label-wrap {
+        max-height: calc(100vh - 109px);
+      }
+      .label-add {
+        position: relative;
+        top: 2px;
+        height: 30px;
+        line-height: 30px;
+        width: 108px;
+        text-align: center;
+        display: inline-flex;
+        justify-content: center;
+      }
+      .add-input {
+        width: 108px;
+        .n-input__suffix {
+          cursor: pointer;
+        }
+      }
+    }
+    .explicit-continer {
+      width: 100%;
+      border: 1px solid #d5d5d5;
+    }
+  }
+  .edit-label-type {
+    font-size: 12px;
+    margin-left: 4px;
+  }
+  .edit-label-content {
+    padding: 0 14px;
+    .edit-content {
+      width: 100%;
+      margin-top: 8px;
+      margin-bottom: 10px;
+      .n-tag {
+        max-width: 108px;
+        margin: 0 8px 8px 0;
+        text-align: center;
+        border: 1px solid rgb(224, 224, 230);
+        .n-tag__content {
+          display: inline-flex;
+          align-items: center;
+          span {
+            display: inline-block;
+            width: 80px;
+            height: 100%;
+            line-height: 30px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+          }
+        }
+      }
+    }
+  }
+}

package/es/packages/select-person/src/SelectPerson.vue.d.ts

@@ -319,7 +319,7 @@ declare const _default: import("vue").DefineComponent<{
             textColorFocusPrimary: string;
             textColorDisabledPrimary: string;
             textColorTextPrimary: string;
-            textColorTextHoverPrimary: string;
+            textColorTextHoverPrimary: string; /** 提交映射 */
             textColorTextPressedPrimary: string;
             textColorTextFocusPrimary: string;
             textColorTextDisabledPrimary: string;
@@ -2146,9 +2146,7 @@ declare const _default: import("vue").DefineComponent<{
             '--n-clear-color-hover': string;
             '--n-clear-color-pressed': string;
             '--n-icon-color': string;
-            '--n-icon-color-hover': string; /**
-             * 拼接key
-             */
+            '--n-icon-color-hover': string;
             '--n-icon-color-pressed': string;
             '--n-icon-color-disabled': string;
             '--n-suffix-text-color': string;
@@ -2157,7 +2155,9 @@ declare const _default: import("vue").DefineComponent<{
         onRender: (() => void) | undefined;
         isCompositing: import("vue").Ref<boolean>;
         blur: () => void;
-        focus: () => void;
+        focus: () => void; /**
+         * 拼接key
+         */
         select: () => void;
         activate: () => void;
         deactivate: () => void;
@@ -2791,9 +2791,7 @@ declare const _default: import("vue").DefineComponent<{
                 hoverColor: string;
                 tableColorHover: string;
                 tableColorStriped: string;
-                pressedColor: string; /**
-                 * 过滤默认值的右边展示
-                 */
+                pressedColor: string;
                 opacityDisabled: string;
                 inputColorDisabled: string;
                 buttonColor2: string;

package/es/packages/select-person/src/SelectPerson.vue_vue_type_script_setup_true_lang.mjs

@@ -1,4 +1,4 @@
-import { defineComponent, ref, reactive, computed, nextTick, watch, onMounted, openBlock, createElementBlock, createVNode, unref, withCtx, createElementVNode, createCommentVNode, createTextVNode, toDisplayString, createBlock, withDirectives, vShow, mergeProps, renderSlot, Fragment, renderList, normalizeClass } from 'vue';
+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 { CloseCircleSharp } from '@vicons/ionicons5';
 import vexutils from 'cnhis-design-vue/es/src/utils/vexutils';
@@ -350,12 +350,13 @@ var script = /* @__PURE__ */ defineComponent({
     const generateDataList = (data, dataList) => {
       for (let i = 0; i < data.length; i++) {
         const node = data[i];
-        dataList.push({
-          parentId: getParentId(node),
-          ...node
-        });
         if (node.children) {
           generateDataList(node.children, dataList);
+        } else {
+          dataList.push({
+            parentId: getParentId(node),
+            ...node
+          });
         }
       }
     };
@@ -508,6 +509,7 @@ var script = /* @__PURE__ */ defineComponent({
         state.treeData.main = JSON.parse(JSON.stringify(props.data));
         return;
       }
+      state.expandedKeys = [];
       let copyData = JSON.parse(JSON.stringify(props.data));
       state.treeData.main = filterTree({
         value: state.title,
@@ -515,8 +517,12 @@ var script = /* @__PURE__ */ defineComponent({
         prop: "title",
         filter: true,
         callback: (child) => {
+          var _a;
+          child.visible && ((_a = child.children) == null ? void 0 : _a.length) && state.expandedKeys.push(child.key);
         }
       }) || [];
+      state.dataList.main = [];
+      generateDataList(state.treeData.main, state.dataList.main);
     };
     const onExpand = (expandedKeys) => {
       state.expandedKeys = expandedKeys;
@@ -537,10 +543,23 @@ var script = /* @__PURE__ */ defineComponent({
         state.indeterminate = false;
         state.singleChecked = false;
       } else {
-        let keyArr = state.treeData.main.map((item) => item.key);
-        let keyArrTemp = keyArr.filter((item) => checkedKeys.indexOf(item) !== -1);
-        state.indeterminate = !(keyArr.length == keyArrTemp.length);
-        state.singleChecked = keyArr.length == keyArrTemp.length;
+        const getAllKeys = (tree) => {
+          if (!(tree == null ? void 0 : tree.length))
+            return 0;
+          let n = 0;
+          tree.forEach((item) => {
+            var _a;
+            if (!((_a = item == null ? void 0 : item.children) == null ? void 0 : _a.length)) {
+              n++;
+            } else {
+              n += getAllKeys(item.children);
+            }
+          });
+          return n;
+        };
+        let keys = getAllKeys(state.treeData.main);
+        state.indeterminate = !(keys == state.checkedKeys.main.length);
+        state.singleChecked = keys == state.checkedKeys.main.length;
       }
     };
     const addCheckedkeysMain = (keys) => {
@@ -581,9 +600,9 @@ var script = /* @__PURE__ */ defineComponent({
     };
     const radioChange = (checked) => {
       if (searchTreeVisable.value) {
-        state.singleChecked = checked;
-      } else {
         state.searchChecked = checked;
+      } else {
+        state.singleChecked = checked;
       }
       checkAll(checked ? 1 : 2);
     };
@@ -592,6 +611,8 @@ var script = /* @__PURE__ */ defineComponent({
         return false;
       if (type == 1) {
         state.expandedKeys = [];
+        state.dataList.main = [];
+        generateDataList(state.treeData.main, state.dataList.main);
         state.checkedKeys.main = dataListMainKeys.value;
       } else if (type == 2) {
         state.checkedKeys.main = [];
@@ -766,8 +787,11 @@ var script = /* @__PURE__ */ defineComponent({
       immediate: true
     });
     watch(() => state.checkedKeys.main, (val) => {
-      isAllCheck(val);
-      isSearchAllCheck();
+      if (!searchTreeVisable.value) {
+        isAllCheck(val);
+      } else {
+        isSearchAllCheck();
+      }
       emit("check", val);
     }, {
       immediate: true,
@@ -797,8 +821,9 @@ var script = /* @__PURE__ */ defineComponent({
             clearable: "",
             value: state.title,
             "onUpdate:value": _cache[0] || (_cache[0] = ($event) => state.title = $event),
-            placeholder: __props.searchPlaceholder
-          }, null, 8, ["value", "placeholder"]), createVNode(unref(NButton), {
+            placeholder: __props.searchPlaceholder,
+            onKeyup: withKeys(searchClick, ["enter", "native"])
+          }, null, 8, ["value", "placeholder", "onKeyup"]), createVNode(unref(NButton), {
             type: "primary",
             onClick: searchClick
           }, {
@@ -817,15 +842,15 @@ var script = /* @__PURE__ */ defineComponent({
         }, 8, ["checked", "indeterminate"])) : (openBlock(), createBlock(unref(NCheckbox), {
           key: 1,
           checked: state.singleChecked,
-          "onUpdate:checked": [_cache[2] || (_cache[2] = ($event) => state.singleChecked = $event), radioChange],
-          indeterminate: state.searchIndeterminate
+          indeterminate: state.searchIndeterminate,
+          "onUpdate:checked": radioChange
         }, {
           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), {
           class: "main-tree-container",
           "checked-keys": state.checkedKeys.main,
-          "onUpdate:checked-keys": _cache[3] || (_cache[3] = ($event) => state.checkedKeys.main = $event),
+          "onUpdate:checked-keys": _cache[2] || (_cache[2] = ($event) => state.checkedKeys.main = $event),
           "expanded-keys": state.expandedKeys,
           checkable: "",
           cascade: "",

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

@@ -19,6 +19,15 @@ const filterTree = ({
     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) => {
@@ -26,10 +35,14 @@ const filterTree = ({
       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 = {