mali-applet-ui 1.0.62 → 1.0.64

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

@@ -138,6 +138,10 @@ export default {
               errRule = rule
               break
             }
+            if (rule.pattern && !new RegExp(rule.pattern).test(itemValue)) {
+              errRule = rule
+              break
+            }
           }
         }
       }

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

@@ -67,9 +67,8 @@ export default {
 
 <style lang="scss">
 .ml-text {
-  display: inline-block;
+  display: inline-flex;
   padding: 0 4rpx;
-  vertical-align: middle;
   &.is-underline {
     text-decoration: underline;
     // #ifdef H5

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

@@ -0,0 +1,155 @@
+<template>
+  <view class="ml-tree" :class="[className || '']">
+    <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="toggleCheckboxRow()">全选</ml-checkbox>
+      </view>
+      <view v-if="showCheckboxBtn" class="ml-tree-checkbox-btns-right">
+        <ml-button size="mini" status="primary" @click="setAllTreeExpand(true)">一键展开</ml-button>
+        <ml-button size="mini" status="primary" @click="setAllTreeExpand(false)">一键收起</ml-button>
+      </view>
+    </view>
+    <ml-tree-node v-for="(item, index) in data" :key="index" :node-data="item"></ml-tree-node>
+  </view>
+</template>
+
+<script>
+import XEUtils from 'xe-utils'
+
+export default {
+  name: 'MlTree',
+  props: {
+    data: Array,
+    height: String,
+    checkStrictly: Boolean,
+    showRadio: Boolean,
+    showCheckbox: Boolean,
+    showAllCheckbox: {
+      type: Boolean,
+      default: true
+    },
+    indeterminateToChecked: Boolean,
+    showCheckboxBtn: Boolean,
+    checkRowKeys: Array,
+    nodeProps: Object
+  },
+  provide () {
+    return {
+      mlTree: this
+    }
+  },
+  data () {
+    return {
+      isAllCheckboxChecked: false,
+      isAllCheckboxIndeterminate: false,
+      indeterminateRowKeys: [],
+      selectCheckboxRowKeys: [],
+      expandRowKeys: []
+    }
+  },
+  computed: {
+    styles () {
+      return this.height ? `height: ${this.height};` : ''
+    },
+    nodeOpts () {
+      const nodeProps = this.nodeProps || {}
+      return {
+        title: nodeProps.name || 'name',
+        key: nodeProps.key || 'key',
+        children: nodeProps.children || 'children'
+      }
+    },
+    titleField () {
+      return this.nodeOpts.title
+    },
+    keyField () {
+      return this.nodeOpts.key
+    },
+    childrenField () {
+      return this.nodeOpts.children
+    }
+  },
+  watch: {
+    checkRowKeys () {
+
+    }
+  },
+  methods: {
+    selectCheckboxNodeEvent ({ nodeData, nodeKey }) {
+      const nodeIndex = this.selectCheckboxRowKeys.indexOf(nodeKey)
+      const checked = nodeIndex === -1
+      if (checked) {
+        this.selectCheckboxRowKeys.push(nodeKey)
+      } else {
+        this.selectCheckboxRowKeys.splice(nodeIndex, 1)
+      }
+      this.$emit('checkbox-change', { row: nodeData, checked, checkedKeys: this.selectCheckboxRowKeys })
+      this.$emit('update:checkRowKeys', [...this.selectCheckboxRowKeys])
+    },
+    expandNodeEvent ({ nodeData, nodeKey }) {
+      const nodeIndex = this.expandRowKeys.indexOf(nodeKey)
+      const expanded = nodeIndex === -1
+      if (expanded) {
+        this.expandRowKeys.push(nodeKey)
+      } else {
+        this.expandRowKeys.splice(nodeIndex, 1)
+      }
+      this.$emit('expand-change', { row: nodeData, expanded, expandedKeys: this.expandRowKeys })
+    },
+    setCheckboxRow (row) {
+      // let rows = row
+      // if (!XEUtils.isArray(row)) {
+      //   rows = [row]
+      // }
+    },
+    toggleCheckboxRow () {
+      const { keyField, childrenField } = this
+      const rowKeys = []
+      if (this.isAllCheckboxChecked) {
+        XEUtils.eachTree(this.data, (item) => {
+          rowKeys.push(item[keyField])
+        }, { children: childrenField })
+      }
+      this.selectCheckboxRowKeys = rowKeys
+    },
+    setAllTreeExpand (expanded) {
+      const { keyField, childrenField } = this
+      const rowKeys = []
+      if (expanded) {
+        XEUtils.eachTree(this.data, (item) => {
+          if (item[childrenField] && item[childrenField].length > 0) {
+            rowKeys.push(item[keyField])
+          }
+        }, { children: childrenField })
+      }
+      this.expandRowKeys = rowKeys
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.ml-tree {
+  padding-left: 16rpx;
+  overflow: auto;
+  .ml-tree-checkbox-btns {
+    position: sticky;
+    left: 0;
+    top: 0;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    height: 80rpx;
+    border-bottom: 1px solid #e5e5e5;
+    background: #ffffff;
+  }
+  .ml-tree-checkbox-btns-left {
+    flex-grow: 1;
+  }
+  .ml-tree-checkbox-btns-right {
+    display: flex;
+    flex-direction: row;
+    flex-shrink: 0;
+  }
+}
+</style>

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

@@ -0,0 +1,149 @@
+<template>
+  <view class="ml-tree-node" :class="[className || '']">
+    <view class="ml-tree-node-warpper">
+      <view v-if="showCheckbox" class="ml-tree-node-checkbox" :class="{'is-checked': checkCheckbox}">
+        <view class="ml-tree-node-checkbox-icon" @click="changeCheckboxEvent">
+          <ml-icon :name="checkCheckbox ? 'checkbox-checked' : (indeterminate ? 'checkbox-indeterminate' : 'checkbox-unchecked')"></ml-icon>
+        </view>
+      </view>
+      <view class="ml-tree-node-expand" :class="{'is-expand': hasExpand}">
+        <view v-if="hasChild" class="ml-tree-node-expand-icon" @click="expandEvent">
+          <ml-icon name="arrow-right-filling"></ml-icon>
+        </view>
+      </view>
+      <view class="ml-tree-node-name">{{ nodeContent }}</view>
+    </view>
+    <view v-if="hasChild && hasExpand" class="ml-tree-node-childs">
+      <ml-tree-node v-for="(item, index) in nodeChilds" :key="index" :node-data="item"></ml-tree-node>
+    </view>
+  </view>
+</template>
+
+<script>
+import XEUtils from 'xe-utils'
+
+export default {
+  props: {
+    nodeData: Object,
+    nodeProps: Object
+  },
+  inject: {
+    tree: {
+      from: 'mlTree',
+      default: null
+    }
+  },
+  data () {
+    return {
+      treeData: []
+    }
+  },
+  computed: {
+    nodeKey () {
+      return this.nodeData ? this.nodeData[this.keyField] : null
+    },
+    nodeContent () {
+      return this.nodeData ? XEUtils.toValueString(this.nodeData[this.titleField]) : ''
+    },
+    nodeChilds () {
+      return this.nodeData ? (this.nodeData[this.childrenField] || []) : []
+    },
+    titleField () {
+      return this.tree ? this.tree.titleField : 'name'
+    },
+    keyField () {
+      return this.tree ? this.tree.keyField : 'key'
+    },
+    childrenField () {
+      return this.tree ? this.tree.childrenField : 'children'
+    },
+    indeterminateRowKeys () {
+      return this.tree ? (this.tree.indeterminateRowKeys || []) : []
+    },
+    selectCheckboxRowKeys () {
+      return this.tree ? (this.tree.selectCheckboxRowKeys || []) : []
+    },
+    expandRowKeys () {
+      return this.tree ? (this.tree.expandRowKeys || []) : []
+    },
+    showRadio () {
+      return this.tree ? this.tree.showRadio : false
+    },
+    showCheckbox () {
+      return this.tree ? this.tree.showCheckbox : false
+    },
+    hasChild () {
+      return this.nodeChilds.length > 0
+    },
+    hasExpand () {
+      return this.expandRowKeys.includes(this.nodeKey)
+    },
+    indeterminate () {
+      return this.showCheckbox ? this.indeterminateRowKeys.includes(this.nodeKey) : false
+    },
+    checkCheckbox () {
+      return this.showCheckbox ? this.selectCheckboxRowKeys.includes(this.nodeKey) : false
+    }
+  },
+  methods: {
+    changeCheckboxEvent () {
+      if (this.tree) {
+        this.tree.selectCheckboxNodeEvent({
+          nodeData: this.nodeData,
+          nodeKey: this.nodeKey
+        })
+      }
+    },
+    expandEvent () {
+      if (this.tree) {
+        this.tree.expandNodeEvent({
+          nodeData: this.nodeData,
+          nodeKey: this.nodeKey
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.ml-tree-node {
+  .ml-tree-node-warpper {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    height: 80rpx;
+    border-bottom: 1px solid #e5e5e5;
+  }
+  .ml-tree-node-checkbox-icon,
+  .ml-tree-node-expand-icon {
+    font-size: 1.3em;
+  }
+  .ml-tree-node-checkbox {
+    width: 50rpx;
+    text-align: center;
+    &.is-checked {
+      color: $uni-color-primary;
+    }
+  }
+  .ml-tree-node-expand {
+    width: 50rpx;
+    text-align: center;
+    &.is-expand {
+      .ml-tree-node-expand-icon {
+        transform: rotate(90deg);
+      }
+    }
+  }
+  .ml-tree-node-expand-icon {
+    display: inline-block;
+    width: 40rpx;
+    height: 40rpx;
+    line-height: 40rpx;
+    transition: transform .1s ease-in-out;
+  }
+  .ml-tree-node-childs {
+    padding-left: 24rpx;
+  }
+}
+</style>

package/package.json

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