mali-applet-ui 1.0.124 → 1.0.126

package/lib/components/ml-approval-select/ml-approval-select.vue

@@ -191,7 +191,6 @@ export default {
     },
     updateFlowHandlers () {
       const flowHandlers = this.flowItems.map(item => {
-        
         return {
           copierList: this.mergeMemberIdsByRoleId(item.copyUsers || []),
           flowItemSettingId: item.id,

package/lib/components/ml-tree/ml-tree.vue

@@ -1,8 +1,8 @@
 <template>
-  <view class="ml-tree" :class="[className || '']">
+  <view class="ml-tree" :class="[className || '', {'is-disabled': disabled}]">
     <view v-if="showCheckbox && (showAllCheckbox || showCheckboxBtn)" class="ml-tree-checkbox-btns">
       <view v-if="showAllCheckbox" class="ml-tree-checkbox-btns-left">
-        <ml-checkbox v-model="isAllCheckboxChecked" :indeterminate="isAllCheckboxIndeterminate" @change="toggleAllCheckboxEvent">全选</ml-checkbox>
+        <ml-checkbox v-model="isAllCheckboxChecked" :indeterminate="isAllCheckboxIndeterminate" :disabled="disabled" @change="toggleAllCheckboxEvent">全选</ml-checkbox>
       </view>
       <view v-if="showCheckboxBtn" class="ml-tree-checkbox-btns-right">
         <ml-button v-if="isExpandAll" size="mini" status="primary" @click="setAllTreeExpand(false)">一键收起</ml-button>
@@ -21,6 +21,7 @@ export default {
   props: {
     data: Array,
     height: String,
+    disabled: Boolean,
     // 是否显示顶部全选按钮
     showAllCheckbox: Boolean,
     // 是是否显示顶部操作按钮
@@ -34,6 +35,7 @@ export default {
       type: Boolean,
       default: false
     },
+    // (暂时没用)
     indeterminateToChecked: {
       type: Boolean,
       default: false

package/lib/components/ml-tree-node/ml-tree-node.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="ml-tree-node" :class="[className || '']">
+  <view class="ml-tree-node" :class="[className || '', {'is-disabled': isDisabled}]">
     <view class="ml-tree-node-warpper">
       <view v-if="showCheckbox" class="ml-tree-node-checkbox" :class="{'is-checked': checkCheckbox, 'is-indeterminate': indeterminate}">
         <view class="ml-tree-node-checkbox-icon" @click="changeCheckboxEvent">
@@ -53,6 +53,9 @@ export default {
     keyField () {
       return this.tree ? this.tree.keyField : 'key'
     },
+    isDisabled () {
+      return this.tree ? this.tree.disabled : false
+    },
     childrenField () {
       return this.tree ? this.tree.childrenField : 'children'
     },
@@ -86,6 +89,9 @@ export default {
   },
   methods: {
     changeCheckboxEvent () {
+      if (this.isDisabled) {
+        return
+      }
       if (this.tree) {
         this.tree.selectCheckboxNodeEvent({
           nodeData: this.nodeData,
@@ -118,6 +124,12 @@ export default {
   .ml-tree-node-expand-icon {
     font-size: 1.3em;
   }
+  &.is-disabled {
+    color: rgba(0,0,0,0.5);
+    .ml-tree-node-checkbox-icon {
+      color: rgba(0,0,0,0.25);
+    }
+  }
   .ml-tree-node-checkbox {
     width: 50rpx;
     text-align: center;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mali-applet-ui",
-  "version": "1.0.124",
+  "version": "1.0.126",
   "description": "码里云小程序组件库",
   "files": [
     "lib",