el-plus-crud 0.1.37 → 0.1.39

package/lib/components/el-plus-form/ElPlusForm.vue

@@ -260,6 +260,7 @@ const computedRules = computed(() => {
             case 'link':
             case 'radio':
             case 'checkbox':
+            case 'tree':
               rules = 'select'
               break
             case 'daterange':
@@ -852,7 +853,7 @@ onMounted(async () => {
 })
 
 // 暴露对外方法
-defineExpose({ fid: props.fid, submit: handleSubmitForm, getData: getFormData, validate: validateForm, reset, clearValid, clear, changeValidImg, refresh, init })
+defineExpose({ fid: props.fid, formRef: refElPlusForm, submit: handleSubmitForm, getData: getFormData, validate: validateForm, reset, clearValid, clear, changeValidImg, refresh, init })
 </script>
 <style lang="scss">
 .el-plus-form-panel {

package/lib/components/el-plus-form/components/ElPlusFormSelect.vue

@@ -131,7 +131,7 @@ async function queryOptionsFn(query: string) {
  * 初始化默认项
  */
 function initDefault() {
-  if (props.desc.defaultKey) {
+  if (oldQuery.value === null && props.desc.defaultKey) {
     let defaultValue = props.formData[props.desc.defaultKey.value]
     if (!Array.isArray(defaultValue)) defaultValue = [defaultValue]
     let defaultLabel = props.formData[props.desc.defaultKey.label]
@@ -140,12 +140,15 @@ function initDefault() {
     if (defaultValue.length <= 0 || defaultValue.length !== defaultLabel.length) return
     // 遍历
     defaultValue.map((val: any, i: number) => {
-      // 这里需要判断下默认值是否已经出现在了options中，如果存在，则需要删除
-      const index = options.findIndex((item) => item.value === val)
-      if (index >= 0) options.splice(index, 1)
-      options.unshift({ value: val, label: defaultLabel[i], dataItem: cloneDeep(props.formData) })
+      if (val) {
+        // 这里需要判断下默认值是否已经出现在了options中，如果存在，则需要删除
+        const index = options.findIndex((item) => item.value === val)
+        if (index >= 0) {
+          options.splice(index, 1)
+        }
+        options.unshift({ value: val, label: defaultLabel[i], dataItem: cloneDeep(props.formData) })
+      }
     })
-    console.log('options: ', options)
   }
 }
 
@@ -164,7 +167,6 @@ onBeforeMount(async () => {
   attrs.value = await getAttrs(props, tempAttr)
   attrs.value.remote = !!props.desc.remote
   delete attrs.value.disabled
-  initDefault()
   isInit.value = true
 })
 
@@ -201,8 +203,10 @@ watch(
         currentValue.value = (val as Array<string>).filter((item) => typeof item !== 'string' || item.length <= (defaultConf.form?.leng?.input || 20))
       }
     }
+    // 处理一下默认值
+    initDefault()
   },
-  { immediate: true, deep: true }
+  { immediate: true }
 )
 
 defineExpose({ field: props.field, clear })

package/lib/components/el-plus-form/components/ElPlusFormTree.vue

@@ -1,5 +1,12 @@
 <template>
-  <el-tree ref="treeRef" v-if="isInit" :class="desc.class" :style="desc.style" v-bind="attrs" :disabled="disabled" :default-checked-keys="currentValue" :loading="loading" node-key="id" :data="options" v-on="onEvents" class="el-plus-form-tree" @check-change="handelCheckChange" />
+  <div class="el-plus-form-tree">
+    <template v-if="attrs.showCheckbox && !attrs.noSelectAll">
+      <div class="btns">
+        <el-checkbox v-model="selectAll" @change="handelSelectAll" label="全部勾选" border />
+      </div>
+    </template>
+    <el-tree ref="treeRef" v-if="isInit" :class="desc.class" :style="desc.style" v-bind="attrs" :disabled="disabled" :default-checked-keys="currentValue" :loading="loading" node-key="id" :data="options" v-on="onEvents" class="el-plus-form-tree" @check-change="handelCheckChange" />
+  </div>
 </template>
 <script lang="ts">
 export default {
@@ -11,13 +18,15 @@ export default {
 </script>
 <script lang="ts" setup>
 import { isEqual } from '../../../util'
-import { ref, reactive, useAttrs, onBeforeMount, watch, inject } from 'vue'
+import { ref, reactive, useAttrs, onBeforeMount, watch, inject, nextTick } from 'vue'
 import { getAttrs, getEvents } from '../mixins'
+import { useVModel } from '@vueuse/core'
+import { cloneDeep } from 'lodash'
 
 const globalData = inject('globalData') as any
 
 const props = defineProps<{
-  modelValue?: string
+  modelValue?: Array<string>
   field?: string
   loading?: boolean
   desc: { [key: string]: any }
@@ -25,8 +34,8 @@ const props = defineProps<{
   disabled?: boolean
 }>()
 
-const emits = defineEmits(['update:modelValue'])
-const currentValue = ref(props.modelValue?.split(',') || [])
+const emits = defineEmits(['update:modelValue', 'validateThis'])
+const currentValue = useVModel(props, 'modelValue', emits)
 
 const options = reactive([] as any[])
 const isInit = ref(false)
@@ -34,14 +43,54 @@ const attrs = ref({} as any)
 const onEvents = ref(getEvents(props))
 
 const treeRef = ref()
+const selectAll = ref(false)
+const allIds = ref([] as any[])
 
 onBeforeMount(async () => {
-  attrs.value = await getAttrs(props, { checkStrictly: true, showCheckbox: true, accordion: true, props: { label: 'label', children: 'children' }, ...useAttrs() })
+  attrs.value = await getAttrs(props, { checkStrictly: true, showCheckbox: true, accordion: true, noSelectAll: false, props: { label: 'label', children: 'children' }, ...useAttrs() })
+  if (attrs.value.showCheckbox && !attrs.value.noSelectAll && options.length) {
+    allIds.value = getLoopIds(options)
+  }
   isInit.value = true
 })
 
-function handelCheckChange() {
-  emits('update:modelValue', [...treeRef.value!.getCheckedKeys(!(props.desc.isPId ?? true))].join(','))
+/**
+ * 处理单个checkbox改变
+ */
+function handelCheckChange(item: any, isSelect: boolean) {
+  currentValue.value = treeRef.value!.getCheckedKeys(!(props.desc.isPId ?? true))
+  nextTick(() => {
+    // 这里判断一下全选状态
+    selectAll.value = isSelect && allIds.value.length === currentValue.value?.length
+    emits('validateThis')
+    console.log('validateThis******************')
+  })
+}
+
+/**
+ * 处理权限
+ */
+function handelSelectAll() {
+  let selectIds = [] as any[]
+  if (selectAll.value) selectIds = cloneDeep(allIds.value)
+  currentValue.value = selectIds
+  treeRef.value!.setCheckedKeys(currentValue.value)
+}
+
+/**
+ * 递归获取id
+ */
+function getLoopIds(list: Array<any>) {
+  const tempIds = [] as any[]
+  if (list?.length) {
+    list.map((item) => {
+      if (item[attrs.value.props.children]?.length) {
+        tempIds.push(...getLoopIds(item[attrs.value.props.children]))
+      }
+      tempIds.push(item.id)
+    })
+  }
+  return tempIds
 }
 
 watch(
@@ -59,6 +108,10 @@ watch(
     } else {
       options.splice(0, options.length)
     }
+    // 如果是复选,这里重新获取下所有IDs
+    if (attrs.value.showCheckbox && !attrs.value.noSelectAll) {
+      allIds.value = getLoopIds(options)
+    }
   },
   { immediate: true }
 )
@@ -66,14 +119,19 @@ watch(
 watch(
   () => props.modelValue,
   (val) => {
-    currentValue.value = val?.split(',') || []
-    treeRef.value!.setCheckedKeys(currentValue.value)
+    treeRef.value!.setCheckedKeys(val || [])
   }
 )
 </script>
 <style lang="scss" scoped>
 .el-plus-form-tree {
   width: 100%;
+  display: flex;
+  flex-direction: column;
+  .btns {
+    width: 100%;
+    padding-left: 12px;
+    margin-bottom: 8px;
+  }
 }
 </style>
-../util/aaaaa

package/lib/components/el-plus-table/ElPlusTable.vue

@@ -816,7 +816,7 @@ onMounted(() => {
   }
 })
 
-defineExpose({ reload, tableData, changeSelect, resetSelect, initCol })
+defineExpose({ tableRef: elPlusTableRef, reload, tableData, changeSelect, resetSelect, initCol })
 </script>
 <style lang="scss">
 .dark .el-plus-table-content {

package/package.json

@@ -2,7 +2,7 @@
   "name": "el-plus-crud",
   "description": "采用Vue3 + TS，封装的element-plus数据驱动表单、列表组件",
   "author": "K.D.Jack",
-  "version": "0.1.37",
+  "version": "0.1.39",
   "license": "MIT",
   "private": false,
   "main": "dist/el-plus-crud.mjs",