ol-base-components 3.2.8 → 3.2.10

package/package.json

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

package/src/App.vue

@@ -278,101 +278,42 @@ export default {
           //   inputType: "text"
           // }
         ],
-        tableSearch: [
-          {
-            label: "选项1",
-            value: "code1",
-            inputType: "text",
-            compare: "contains",
-            children: [],
-            props: {},
-          },
-          {
-            label: "选项2",
-            value: "code2",
-            inputType: "number",
-            compare: "eq",
-            children: [],
-            props: {},
-          },
-          {
-            label: "选项3",
-            value: "code3",
-            inputType: "select",
-            compare: "eq",
-            children: [
-              {
-                key: 0,
-                value: "货位点",
-              },
-              {
-                key: 1,
-                value: "环线载货通道点",
-              },
-              {
-                key: 2,
-                value: "其它载货通道点",
-              },
-              {
-                key: 3,
-                value: "提升机点",
-              },
-              {
-                key: 4,
-                value: "充电点",
-              },
-              {
-                key: 5,
-                value: "暂停位点",
-              },
-              {
-                key: 6,
-                value: "提升机等待位",
-              },
-              {
-                key: 7,
-                value: "入库口",
-              },
-              {
-                key: 8,
-                value: "出库口",
-              },
-              {
-                key: 9,
-                value: "地图外",
-              },
-            ],
-            props: {},
-            optionSource: {
-              sourceType: "dict",
-              dictKey: "pointType",
-              apiUrl: "",
-              valueField: "id",
-              labelField: "name",
-              options: [],
-            },
-          },
-        ],
+        tableSearch: [],
         customs: [
           {
-            name: "选项1",
-            key: "code1",
+            name: "库位编码",
             keyType: 1,
+            key: "WarehouseLocationCode",
+            enumName: null,
+            custom: false,
           },
           {
-            name: "选项2",
-            key: "code2",
-            keyType: 2,
+            name: "使用状态",
+            keyType: 3,
+            key: "UsageStatus",
+            enumName: "usageStatusEnum",
+            custom: false,
           },
           {
-            name: "选项3",
-            key: "code3",
-            keyType: 3,
+            name: "是否启用",
+            keyType: 1,
+            key: "Enabled",
+            enumName: null,
+            custom: false,
           },
           {
-            name: "选项4",
-            key: "code4",
+            name: "创建时间",
             keyType: 4,
+            key: "CreationTime",
+            enumName: null,
+            custom: false,
+          },
+          {
+            name: "备注",
+            keyType: 1,
+            key: "Remark",
+            enumName: null,
+            custom: false,
           },
         ],
       },

package/src/package/customSearch/src/index.vue

@@ -12,6 +12,10 @@
 export default {
   name: "customSearch",
   props: {
+    menuId: {
+      type: String,
+      default: "",
+    },
     formSearchData: {
       type: Object,
       default: () => {
@@ -63,10 +67,12 @@ export default {
       const menus = SET_MENUS;
       this.currentPageItem = handleMenu(menus, this);
 
+      const targetMenuId = this.menuId || (this.currentPageItem && this.currentPageItem.id);
+
       this.get({
         url: `/api/app/menu-search-setting/by-menu`,
         data: {
-          sysMenuId: this.currentPageItem && this.currentPageItem.id,
+          sysMenuId: targetMenuId,
         },
       }).then(res => {
         if (res.code !== 200) return;
@@ -79,10 +85,12 @@ export default {
     },
     //保存
     onSave(configList) {
+      const targetMenuId = this.menuId || (this.currentPageItem && this.currentPageItem.id);
+
       this.post({
         url: `/api/app/menu-search-setting`,
         data: {
-          sysMenuId: this.currentPageItem && this.currentPageItem.id,
+          sysMenuId: targetMenuId,
           settingJson: JSON.stringify(configList),
         },
       }).then(res => {

package/src/package/formSearch/src/components/SearchConfigDialog.vue

@@ -541,6 +541,13 @@ export default {
         row.props = {};
       }
       this.updateDatePickerProps(row);
+
+      const rangeTypes = ["daterange", "datetimerange", "monthrange"];
+      if (rangeTypes.includes(row.dateType)) {
+        row.compare = "range";
+      } else {
+        row.compare = "eq";
+      }
     },
     updateDatePickerProps(row) {
       const dateType = row.dateType || "date";
@@ -853,6 +860,11 @@ export default {
           valueFormat: "yyyy-MM-dd",
           format: "yyyy/MM/dd",
         };
+      } else if (custom.keyType === 3) {
+        newItem.optionSource = {
+          sourceType: "dict",
+          dictKey: custom.enumName,
+        };
       }
 
       this.configList.push(newItem);