lw-cdp-ui 1.3.52 → 1.3.54

package/dist/components/lwFormMini/FormComponent.vue

@@ -62,6 +62,7 @@ export default {
       componentMap: {
         input: 'el-input',
         checkbox: 'el-checkbox',
+        treeSelect: 'el-tree-select',
         checkboxGroup: 'el-checkbox-group',
         switch: 'el-switch',
         select: 'el-select',
@@ -89,54 +90,55 @@ export default {
     },
     // 获取组件属性
     getComponentProps(item) {
-      let props = {}
+      let propsItem = {}
+      const { type, startPlaceholder, endPlaceholder, controlsPosition, items, ...options } = item?.options
       if (item?.options) {
         // 通用属性
-        props.placeholder = item.options.placeholder || ''
-        props.clearable = item.options.clearable || true
-        if (item.options.type) props.type = item.options.type
+        propsItem.placeholder = item.options.placeholder || ''
+        propsItem.clearable = item.options.clearable || true
+        if (item.options.type) propsItem.type = item.options.type
         if (item.options?.maxlength) {
-          props.maxlength = item.options.maxlength
-          props.showWordLimit = true // 正确启用字数统计
+          propsItem.maxlength = item.options.maxlength
+          propsItem.showWordLimit = true // 正确启用字数统计
         }
         if (item.options?.activeText) {
-          props.maxlength = item.options.maxlength
-          props.inlinePrompt = true
+          propsItem.maxlength = item.options.maxlength
+          propsItem.inlinePrompt = true
         }
 
         // 组件特有属性
         switch (item.component) {
           case 'select':
-            props.filterable = true
+          propsItem.filterable = true
             break
           case 'date':
-            props.type = item.options.type || 'date'
-            props.startPlaceholder = item.options.startPlaceholder || '开始日期'
-            props.endPlaceholder = item.options.endPlaceholder || '结束日期'
+          propsItem.type = type || 'date'
+          propsItem.startPlaceholder = startPlaceholder || '开始日期'
+          propsItem.endPlaceholder = endPlaceholder || '结束日期'
             break
           case 'number':
-            props.controlsPosition = item.options.controlsPosition || 'right'
+          propsItem.controlsPosition = controlsPosition || 'right'
             break
           case 'treeSelect':
-            props.data = item?.options?.items || []
+          propsItem.data = items || []
             break
-          case 'treeSelect':
-            props.options = item?.options?.items || []
+          case 'cascader':
+          propsItem.options = items || []
             break
         }
       }
 
-      props = {
-        ...item.options,
-        ...props
+      propsItem = {
+        ...options,
+        ...propsItem
+      }
+      if ( item.component == 'cascader') {
+        console.log(propsItem)
       }
       // 清除
-      delete props.disabled
-      return props
+      delete propsItem.disabled
+      return propsItem
     }
   }
 }
-</script>
-
-<style>
-</style>
+</script>

package/dist/components/lwFormMini/FormItem.vue

@@ -36,9 +36,18 @@
         <el-icon><el-icon-question-filled /></el-icon>
       </el-tooltip>
     </template>
-
+    <!-- cascader 组个组件有问题  动态加载下拉文字不会显示 -->
+    <template v-if="item.component == 'cascader'">
+      <el-cascader v-model="objItem.value"
+                   style="width: 100%;"
+                   :props="item?.options?.props"
+                   :separator="item?.options?.separator"
+                   :disabled="item?.options?.disabled"
+                   :options="item?.options.items"
+                   clearable></el-cascader>
+    </template>
     <!-- 动态组件 -->
-    <template v-if="componentType.includes(item.component)">
+    <template v-else-if="componentType.includes(item.component)">
       <FormComponent v-model="objItem.value"
                      :item="item"
                      :disabled="item?.options?.disabled" />

package/dist/components/lwTableForm/index.vue

@@ -27,8 +27,18 @@
         </div>
       </template>
       <template #default="{ row, $index, column }">
+        <!-- cascader 组个组件有问题  动态加载下拉文字不会显示 -->
+        <template v-if="item.component == 'cascader'">
+          <el-cascader v-model="row[item.name]"
+                       style="width: 100%;"
+                       :props="item?.options?.props"
+                       :separator="item?.options?.separator"
+                       :disabled="item?.options?.disabled"
+                       :options="item?.options.items"
+                       clearable></el-cascader>
+        </template>
         <!-- 动态组件 -->
-        <template v-if="componentType.includes(item.component)">
+        <template v-else-if="componentType.includes(item.component)">
           <FormComponent v-model="row[item.name]"
                          :size="config.size || 'small'"
                          :item="item"