ol-base-components 3.2.7 → 3.2.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol-base-components",
-  "version": "3.2.7",
+  "version": "3.2.9",
   "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

@@ -39,7 +39,9 @@ export default {
   },
 
   mounted() {
-    this.init();
+    this.$nextTick(() => {
+      this.init();
+    });
   },
   methods: {
     init() {
@@ -69,8 +71,10 @@ export default {
       }).then(res => {
         if (res.code !== 200) return;
         const configList = res.result.settingJson ? JSON.parse(res.result.settingJson) : [];
-        this.formSearchData.tableSearch = configList;
-        this.key++;
+        this.$set(this.formSearchData, "tableSearch", configList);
+        this.$nextTick(() => {
+          this.key++;
+        });
       });
     },
     //保存

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

@@ -156,11 +156,8 @@
           <el-select
             v-model="currentOptionConfig.dictKey"
             filterable
-            remote
-            reserve-keyword
+            :filter-method="filterDict"
             placeholder="请输入字典，如：orderTypeEnum"
-            :remote-method="remoteDictQuery"
-            :loading="dictLoading"
             style="width: 100%"
             @change="handleDictKeyChange"
             clearable
@@ -170,7 +167,10 @@
               :key="dict.key"
               :label="dict.label"
               :value="dict.key"
-            />
+            >
+              <span style="float: left">{{ dict.label }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ dict.key }}</span>
+            </el-option>
           </el-select>
         </el-form-item>
 
@@ -383,8 +383,7 @@ export default {
       },
       previewOptions: [],
       allDictList: [],
-      dictLoading: false,
-      dictQuery: "",
+      allDictListBackup: [],
       sortable: null,
       currentConfig: {}, // 配置选项
     };
@@ -395,13 +394,15 @@ export default {
       return this.customs.filter(custom => !selectedKeys.includes(custom.key));
     },
   },
+  created() {
+    this.loadAllDictList();
+  },
   watch: {
     visible: {
       handler(newVal) {
         this.dialogVisible = newVal;
         if (newVal) {
           this.configList = JSON.parse(JSON.stringify(this.tableSearch));
-          this.loadAllDictList();
           this.$nextTick(() => {
             this.initSortable();
           });
@@ -794,45 +795,28 @@ export default {
         });
 
         this.allDictList = dictList;
+        this.allDictListBackup = dictList;
       } catch (error) {
         console.error("加载字典列表失败:", error);
         this.allDictList = [];
+        this.allDictListBackup = [];
       }
     },
-    async remoteDictQuery(query) {
+    filterDict(query) {
       if (!query) {
-        this.allDictList = [];
+        this.allDictList = this.allDictListBackup || [];
         return;
       }
-
-      try {
-        this.dictLoading = true;
-        const wmsStr = localStorage.getItem("wms") || "{}";
-        const wmsData = JSON.parse(wmsStr);
-        const dictData = wmsData.SET_enumsSelect || {};
-
-        const dictList = [];
-        Object.keys(dictData).forEach(key => {
-          if (key && key.toLowerCase().includes(query.toLowerCase())) {
-            const dictItem = dictData[key];
-            if (dictItem) {
-              dictList.push({
-                key: String(key),
-                label: dictItem.desc || key,
-              });
-            }
-          }
-        });
-
-        this.allDictList = dictList;
-      } catch (error) {
-        console.error("搜索字典失败:", error);
-        this.$message.error("搜索字典失败");
-      } finally {
-        this.dictLoading = false;
-      }
+      const filteredList = this.allDictListBackup.filter(item => {
+        return (
+          item.key.toLowerCase().includes(query.toLowerCase()) ||
+          item.label.toLowerCase().includes(query.toLowerCase())
+        );
+      });
+      this.allDictList = filteredList;
     },
     handleDictKeyChange(dictKey) {
+      this.allDictList = this.allDictListBackup || [];
       if (dictKey) {
         this.loadPreviewOptions();
       }
@@ -869,6 +853,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);