ol-base-components 2.8.13 → 2.8.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol-base-components",
-  "version": "2.8.13",
+  "version": "2.8.15",
   "private": false,
   "main": "src/package/index.js",
   "bin": {

package/src/package/formSearch/src/index.vue

@@ -345,31 +345,6 @@ export default {
       const rangeTimeCloumns = await this.autoDetectRangeTimeFields(swaggersearchColumns);
       this.formSearchData.tableSearch = [...this.formSearchData.tableSearch, ...rangeTimeCloumns];
 
-      // const tableHasCreatedTime = this.formSearchData.tableSearch.some(
-      //   e => e.value === "createdTime"
-      // );
-      // if (!tableHasCreatedTime) {
-      //   //  单独处理创建时间 就是BeginTime，EndTime
-      //   const requiredNames = ["BeginTime", "EndTime"];
-      //   const hseCreatedTime = requiredNames.every(name =>
-      //     swaggersearchColumns.some(item => item.name === name)
-      //   );
-      //   if (hseCreatedTime) {
-      //     this.formSearchData.tableSearch.push({
-      //       label: "创建时间",
-      //       value: "createdTime",
-      //       inputType: "picker",
-      //       props: {
-      //         type: "datetimerange",
-      //         startPlaceholder: "开始时间",
-      //         endPlaceholder: "结束时间",
-      //         placeholder: "选择时间范围",
-      //         valueFormat: "yyyy-MM-dd HH:mm:ss",
-      //         format: "yyyy/MM/dd HH:mm:ss",
-      //       },
-      //     });
-      //   }
-      // }
       this.findTableSearch =
         this.formSearchData.tableSearch.length > this.tableSearchSlice
           ? this.formSearchData.tableSearch.slice(0, this.tableSearchSlice)
@@ -410,23 +385,21 @@ export default {
       }
 
       // 2. 自动识别 xxxxBegin 和 xxxxEnd 格式的范围时间字段
-      const beginFields = swaggersearchColumns
-        .filter(item => item.name.endsWith("Begin"))
-        .map(item => item.name);
+      const beginFields = swaggersearchColumns.filter(item => item.name.endsWith("Begin"));
 
-      const endFields = swaggersearchColumns
-        .filter(item => item.name.endsWith("End"))
-        .map(item => item.name);
+      const endFields = swaggersearchColumns.filter(item => item.name.endsWith("End"));
 
       // 找出匹配的 Begin 和 End 字段对
       const rangeTimePairs = [];
-      beginFields.forEach(beginField => {
-        const prefix = beginField.replace("Begin", "");
+      beginFields.forEach(item => {
+        const prefix = item.name.replace("Begin", "");
         const correspondingEndField = prefix + "End";
-
-        if (endFields.includes(correspondingEndField)) {
+        const endTemp = endFields.find(e => e.name === correspondingEndField);
+        if (endTemp) {
           rangeTimePairs.push({
-            beginField,
+            ...item,
+            description: item.description || endTemp.description || "", //先用Begin的中文，没有就用End的
+            beginField: item.name,
             endField: correspondingEndField,
             timeField: prefix + "Time",
             label: prefix,
@@ -436,7 +409,7 @@ export default {
 
       // 使用 for...of 循环等待所有异步操作完成
       for (const pair of rangeTimePairs) {
-        const { beginField, endField, timeField, label } = pair;
+        const { beginField, endField, timeField, description } = pair;
 
         // 检查是否已经存在该时间字段
         const timeFieldExists = this.formSearchData.tableSearch.some(
@@ -444,7 +417,8 @@ export default {
         );
 
         if (!timeFieldExists) {
-          const labelCHN = await camelCaseToChinese(label);
+          // const labelCHN = await camelCaseToChinese(label); //内网项目无法使用
+          const labelCHN = description;
 
           // 从 formSearchData.value 中移除原始字段
           this.removeOriginalFieldsFromValue([beginField, endField]);
@@ -492,6 +466,21 @@ export default {
         this.formSearch.BeginTime = null;
         this.formSearch.EndTime = null;
       }
+      // 以Time结尾，并在this.formSearch.tableSearch中通过prop获取后取type为datetimerange的
+      Object.keys(this.formSearch).forEach(key => {
+        const fieldConfig = this.formSearchData.tableSearch.find(item => item.value === key);
+        if (fieldConfig && fieldConfig.originalFields) {
+          const { begin, end } = fieldConfig.originalFields;
+          if (this.formSearch[key] && Array.isArray(this.formSearch[key])) {
+            this.formSearch[begin] = this.formSearch[key][0];
+            this.formSearch[end] = this.formSearch[key][1];
+          } else {
+            this.formSearch[begin] = null;
+            this.formSearch[end] = null;
+          }
+        }
+      });
+
       const tempFormSearch = Object.assign({}, this.formSearch);
       if (this.formSearchData.rules) {
         return this.$refs[formName].validate(valid => {