n20-common-lib 2.12.8 → 2.12.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.12.8",
+  "version": "2.12.10",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/AdvancedFilter/formItemRender.vue

@@ -602,7 +602,8 @@ export default {
             ruleField: true,
             'rule-form': 'ruleValidate',
             ruleErrorHide: item.ruleErrorHide,
-            rules: item.rules
+            rules: item.rules,
+            ...item.props
           },
           props: pickerProps,
           style: {

package/src/components/Tree/index.vue

@@ -21,14 +21,13 @@
         <img :src="node.level == 1 ? folder : desc" class="m-r-ss" alt="" />
         <div
           v-title="
-            (data[props.value] ? '(' + data[props.value] + ') ' : '') +
-            data[props.label] +
+            returnTitle(data) +
             (data && data.children && data.children.length > 0 ? '(' + data.children.length + ')' : '')
           "
           :show-overflow-tooltip="true"
           class="cl-tree-item-label text-ellipsis"
         >
-          {{ (data[props.value] ? '(' + data[props.value] + ') ' : '') + data[props.label] }}
+          {{ returnTitle(data) }}
           {{
             data && data[props.children] && data[props.children].length > 0
               ? '(' + data[props.children].length + ')'
@@ -67,6 +66,10 @@
 export default {
   name: 'Tree',
   props: {
+    labelHasValue: {
+      type: Boolean,
+      default: true
+    },
     data: {
       type: Array,
       default: () => []
@@ -111,6 +114,13 @@ export default {
     this.setRefData()
   },
   methods: {
+    returnTitle(data) {
+      if (!this.labelHasValue) {
+        return data[this.props.label]
+      } else {
+        return (data[this.props.value] ? '(' + data[this.props.value] + ') ' : '') + data[this.props.label]
+      }
+    },
     setRefData() {
       const {
         store,