lw-cdp-ui 1.0.12 → 1.0.13

package/dist/components/lwLayout/components/topbar.vue

@@ -3,8 +3,7 @@
     <div class="left-panel">
       <el-breadcrumb separator-icon="el-icon-arrow-right"
                      class="hidden-sm-and-down">
-        <transition-group name="breadcrumb"
-                          mode="out-in">
+        <transition-group name="breadcrumb">
           <template v-for="item in breadList"
                     :key="item.title">
             <el-breadcrumb-item v-if="item.path!='/' &&  !item.meta.hiddenBreadcrumb"

package/dist/components/lwSearch/date/date.vue

@@ -5,7 +5,7 @@
       :disabled="item.disabled"
       :format="item.format || 'YYYY-MM-DD'"
       :value-format="item.valueFormat"
-      :placeholder="item.placeholder || '请选择'"
+      :placeholder="item.placeholder || $t('lwSearch.please_select')"
       clearable
       v-model="value"
       :disabled-date="disabledDate"
@@ -15,7 +15,7 @@
   </div>
 </template>
 
-<script lang="ts">
+<script>
 import { computed, reactive, toRefs, watch } from 'vue'
 
 export default {
@@ -52,8 +52,8 @@ export default {
       }
     },
   },
-  setup(props: any, context: any) {
-    const state = reactive({})
+  setup(props, context) {
+    const state = reactive({});
 
     // 最新的结果推送到父组件
     // watch(
@@ -62,27 +62,27 @@ export default {
     //     context.emit("update:modelValue",  newVal);
     //     context.emit("change", newVal);
     //   },
-    //   { deep: true, immediate:true, }
-    // )
+    //   { deep: true, immediate: true }
+    // );
 
     const valueFormat = computed(() => {
       if (props.propValueFormat) {
-        return props.propValueFormat
+        return props.propValueFormat;
       }
       if (props.item.valueFormat) {
-        return props.item.valueFormat
+        return props.item.valueFormat;
       }
       if (props.item.dateSection) {
-        return "YYYY-MM-DD 00:00:00"
+        return "YYYY-MM-DD 00:00:00";
       }
       if (props.item.withZero) {
-        return "YYYY-MM-DD 00:00:00"
+        return "YYYY-MM-DD 00:00:00";
       }
       if (props.item.withLast) {
-        return "YYYY-MM-DD 23:59:59"
+        return "YYYY-MM-DD 23:59:59";
       }
-      return "YYYY-MM-DD"
-    })
+      return "YYYY-MM-DD";
+    });
 
     const value = computed({
       get() {
@@ -95,15 +95,16 @@ export default {
     });
 
     // 禁止选择日期
-    const disabledDate = (date: any) => {
-      return date.getTime() < Date.now()
-    }
+    const disabledDate = (date) => {
+      return date.getTime() < Date.now();
+    };
 
     return {
       ...toRefs(state),
       valueFormat,
       value
-    }
+    };
   },
 };
 </script>
+

package/dist/components/lwSearch/dateRange/dateRange.vue

@@ -16,7 +16,7 @@
   </div>
 </template>
 
-<script lang="ts">
+<script>
 import { computed, reactive, toRefs, watch } from 'vue'
 
 export default {
@@ -53,8 +53,8 @@ export default {
       }
     },
   },
-  setup(props: any, context: any) {
-    const state = reactive({})
+  setup(props, context) {
+    const state = reactive({});
 
     // 最新的结果推送到父组件
     // watch(
@@ -63,27 +63,27 @@ export default {
     //     context.emit("update:modelValue",  newVal);
     //     context.emit("change", newVal);
     //   },
-    //   { deep: true, immediate:true, }
-    // )
+    //   { deep: true, immediate: true }
+    // );
 
     const valueFormat = computed(() => {
       if (props.propValueFormat) {
-        return props.propValueFormat
+        return props.propValueFormat;
       }
       if (props.item.valueFormat) {
-        return props.item.valueFormat
+        return props.item.valueFormat;
       }
       if (props.item.dateSection) {
-        return "YYYY-MM-DD 00:00:00"
+        return "YYYY-MM-DD 00:00:00";
       }
       if (props.item.withZero) {
-        return "YYYY-MM-DD 00:00:00"
+        return "YYYY-MM-DD 00:00:00";
       }
       if (props.item.withLast) {
-        return "YYYY-MM-DD 23:59:59"
+        return "YYYY-MM-DD 23:59:59";
       }
-      return "YYYY-MM-DD"
-    })
+      return "YYYY-MM-DD";
+    });
 
     const value = computed({
       get() {
@@ -96,15 +96,15 @@ export default {
     });
 
     // 禁止选择日期
-    const disabledDate = (date: any) => {
-      return date.getTime() < Date.now()
-    }
+    const disabledDate = (date) => {
+      return date.getTime() < Date.now();
+    };
 
     return {
       ...toRefs(state),
       valueFormat,
       value
-    }
+    };
   },
 };
 </script>

package/dist/components/lwSearch/dates/dates.vue

@@ -17,7 +17,7 @@
         <el-icon><el-icon-calendar /></el-icon>
       </template>
     </el-input>
-    
+
     <!-- 日期选择面板 -->
     <div v-show="isPanelShow" class="dates-panel">
       <el-tabs v-model="activeName" class="dates-panel-tabs" @tab-click="handleTabClick">
@@ -31,7 +31,7 @@
               :disabled="item.disabled"
               :format="item.format || 'yyyy-MM-dd'"
               :value-format="item.valueFormat || 'yyyy-MM-dd'"
-              :placeholder="item.placeholder || '请选择'"
+              :placeholder="item.placeholder || $t('lwSearch.please_select')"
               :shortcuts="shortcuts"
               v-model="value"
               :clearable="false"
@@ -55,7 +55,7 @@
             </teleport>
           </div>
         </el-tab-pane>
-        
+
         <!-- 日期范围选择 -->
         <el-tab-pane label="日期范围" name="range">
           <div class="panel-label">
@@ -66,7 +66,7 @@
               :disabled="item.disabled"
               :format="item.format || 'yyyy-MM-dd'"
               :value-format="item.valueFormat || 'yyyy-MM-dd'"
-              :placeholder="item.placeholder || '请选择'"
+              :placeholder="item.placeholder || $t('lwSearch.please_select')"
               :unlink-panels="item.unlinkPanels ?? false"
               :shortcuts="shortcuts"
               v-model="value"
@@ -95,7 +95,7 @@
   </div>
 </template>
 
-<script lang="ts">
+<script>
 import { computed, nextTick, reactive, ref, toRefs, watch } from 'vue'
 
 export default {

package/dist/components/lwSearch/index.vue

@@ -43,10 +43,10 @@
                   </el-row>
                 </template>
                 <template v-else>
-                  <component :is="setComponent(item.renderType)"
+                  <component v-model="form[item.prop]"
+                             :is="setComponent(item.renderType)"
                              :disabled="item.disabled"
                              :item="item"
-                             v-model="form[item.prop]"
                              style="width: 100%" />
                 </template>
               </el-form-item>
@@ -214,8 +214,8 @@ export default {
     },
     // 重置条件
     resetForm(formEl) {
-      if (!formEl) return;
-      formEl.resetFields();
+      if (!this.$refs[formEl]) return;
+      this.$refs[formEl].resetFields();
       this.form = JSON.parse(JSON.stringify(this.defaultForm));
       // 保留页面table分页数据
       this.form.size = this.modelValue.size;
@@ -382,8 +382,6 @@ export default {
     margin-top: 0;
     padding: 0 0 0px 0;
 
- 
-
     &.close {
       width: 0;
       height: 0;

package/dist/components/lwSearch/input/input.vue

@@ -3,7 +3,7 @@
     <el-input
       :type="item.type || 'text'"
       :disabled="item.disabled"
-      :placeholder="item.label || '请输入'"
+      :placeholder="item.label || $t('lwSearch.please_input')"
       :maxlength="item.maxlength"
       :minlength="item.minlength"
       :show-word-limit="item.showWordLimit"

package/dist/components/lwSearch/locale/en-us.js

@@ -1,5 +1,7 @@
 export default {
 	lwSearch: {
+		please_select: 'Please select',
+		please_input: 'Please input',
 		dateRange: {
 			startPlaceholder: 'Start Time',
 			endPlaceholder: 'End Time'

package/dist/components/lwSearch/locale/zh-cn.js

@@ -1,5 +1,7 @@
 export default {
 	lwSearch: {
+		please_select: '请选择',
+		please_input: '请输入',
 		dateRange: {
 			startPlaceholder: '开始时间',
 			endPlaceholder: '结束时间'

package/dist/components/lwTable/index.js

@@ -1,9 +1,9 @@
 import { useFullscreen } from './useFullscreen'
-import { onBeforeMount, reactive, ref, watch, toRefs } from 'vue'
+import { onBeforeMount, reactive, ref, watch, toRefs, getCurrentInstance } from 'vue'
 import dayjs from 'dayjs'
 
 export default {
-	name: 'baseTablePage',
+	name: 'lwTable',
 	props: {
 		refName: { type: String, default: 'multipleTableRef' },
 		tableName: { type: String, default: '' },
@@ -30,7 +30,7 @@ export default {
 		rowSelection: { type: Object },
 		selectedKeys: { type: Array },
 		selectDatas: { type: Array },
-		hideTool: { type: Boolean, default: true },
+		hideTool: { type: Boolean, default: false },
 		virtualListProps: { type: Object, default: undefined },
 		draggable: { type: Object },
 		maxHeight: { type: String }
@@ -55,7 +55,6 @@ export default {
 			endFixed: false,
 			filterHeader: [],
 			tableSize: props.tableSize,
-			bordered: props.bordered,
 
 			checkedKeys: [],
 			treeData: [],
@@ -285,10 +284,6 @@ export default {
 			state.tableSize = v
 		}
 
-		const borderClick = () => {
-			state.bordered = !state.bordered
-		}
-
 		const onDrop = (info) => {
 			let dropPosition = info.dropPosition
 			let dragNode = info.dragNode
@@ -336,9 +331,9 @@ export default {
 			})
 		}
 
-		const treeCheck = (checkedKeys, data) => {
-			data.node.checked = data.checked
-			let list = state.treeData.filter((t) => t.checked === true)
+		const treeCheck = () => {
+			let list = state.treeData.filter((t) => state.checkedKeys.includes(t.key))
+			console.log(list)
 			state.tableHeaders = list
 		}
 
@@ -354,13 +349,13 @@ export default {
 					if (index < num) {
 						item.fixed = 'left'
 						item.width = item.width ?? '120'
-					} else {
-						delete item.fixed
 					}
 				})
 			} else {
 				state.tableHeaders.forEach((item) => {
-					delete item.fixed
+					if (item.fixed === 'left') {
+						delete item.fixed
+					}
 				})
 			}
 		}
@@ -408,7 +403,6 @@ export default {
 			sortChange,
 			getHeader,
 			handleSelect,
-			borderClick,
 			onDrop,
 			checkAll,
 			tableToggleFullScreen,