ol-base-components 3.2.1 → 3.2.5

package/package.json

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

package/src/App.vue

@@ -139,7 +139,7 @@ export default {
           // timer: [],
           // range: [10, 200],
         },
-        tableSearch: [
+        tableSearch1: [
           // {
           //   label: "数字区间",
           //   value: "range",
@@ -277,6 +277,81 @@ 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: [],
+            },
+          },
+        ],
         customs: [
           {
             name: "选项1",

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

@@ -4,6 +4,7 @@
     @onSave="onSave"
     v-bind="$attrs"
     v-on="$listeners"
+    :key="key"
   />
 </template>
 
@@ -33,12 +34,13 @@ export default {
   data() {
     return {
       currentPageItem: {},
+      key: 0,
     };
   },
-  created() {
+
+  mounted() {
     this.init();
   },
-  mounted() {},
   methods: {
     init() {
       const handleMenu = (arr, _this) => {
@@ -68,6 +70,7 @@ export default {
         if (res.code !== 200) return;
         const configList = res.result.settingJson ? JSON.parse(res.result.settingJson) : [];
         this.formSearchData.tableSearch = configList;
+        this.key++;
       });
     },
     //保存

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

@@ -59,12 +59,12 @@
               size="small"
               placeholder="请选择类型"
               @change="handleTypeChange(scope.row)"
-              disabled
+              :disabled="['number', 'picker'].includes(scope.row.inputType)"
             >
               <el-option label="文本输入" value="text" />
-              <el-option label="数字输入" value="number" />
+              <el-option label="数字输入" value="number" disabled />
               <el-option label="下拉选择" value="select" />
-              <el-option label="日期选择" value="picker" />
+              <el-option label="日期选择" value="picker" disabled />
             </el-select>
           </template>
         </el-table-column>
@@ -187,7 +187,7 @@
           </el-select>
         </el-form-item>
 
-   <el-form-item v-if="currentOptionConfig.sourceType === 'api'" label="文本字段">
+        <el-form-item v-if="currentOptionConfig.sourceType === 'api'" label="文本字段">
           <el-input v-model="currentOptionConfig.labelField" placeholder="如：name" />
         </el-form-item>
 
@@ -375,6 +375,7 @@ export default {
       dictLoading: false,
       dictQuery: "",
       sortable: null,
+      currentConfig: {}, // 配置选项
     };
   },
   computed: {
@@ -447,6 +448,7 @@ export default {
       }
       this.$emit("save", this.configList);
       this.dialogVisible = false;
+      console.log(`\x1b[36m\x1b[4mol插件-动态搜索框配置数据`, this.configList);
     },
     async loadItemOptionsForSave(item) {
       if (!item.optionSource) return;
@@ -594,6 +596,7 @@ export default {
     handleConfigOptions(index) {
       this.currentEditIndex = index;
       const currentConfig = this.configList[index];
+      this.currentConfig = JSON.parse(JSON.stringify(currentConfig));
 
       const optionSource = currentConfig.optionSource || {};
       this.currentOptionConfig = {
@@ -623,7 +626,55 @@ export default {
     handleDeleteOption(index) {
       this.currentOptionConfig.options.splice(index, 1);
     },
-    handleSaveOptions() {
+    async loadApiOptions(item) {
+      try {
+        const apiUrl = item.optionSource.apiUrl;
+        const method = item.optionSource.method || "get";
+        if (!apiUrl) return;
+
+        let response;
+        if (method === "post") {
+          response = await this.post({ url: apiUrl });
+        } else {
+          response = await this.get({ url: apiUrl });
+        }
+        if (response.code !== 200) return;
+        if (response.result && Array.isArray(response.result)) {
+          const { valueField, labelField } = item.optionSource;
+          const children = response.result.map(d => ({
+            key: d[valueField],
+            value: d[labelField],
+          }));
+          return children;
+        }
+      } catch (error) {
+        console.error("加载接口数据失败:", error);
+        return [];
+      }
+    },
+    needSetChildren(oldConfig, newConfig) {
+      const { inputType, optionSource } = oldConfig;
+      if (!optionSource) return false;
+      const { sourceType, apiUrl, method, valueField, labelField } = optionSource;
+      if (inputType !== "select" || sourceType !== "api") return false;
+      const {
+        sourceType: newSourceType,
+        apiUrl: newApiUrl,
+        method: newMethod,
+        valueField: newValueField,
+        labelField: newLabelField,
+      } = newConfig;
+      if (
+        sourceType === newSourceType &&
+        apiUrl === newApiUrl &&
+        method === newMethod &&
+        valueField === newValueField &&
+        labelField === newLabelField
+      )
+        return false;
+      return true;
+    },
+    async handleSaveOptions() {
       const config = this.configList[this.currentEditIndex];
       const configDefault = {
         sourceType: "",
@@ -653,7 +704,12 @@ export default {
           valueField: this.currentOptionConfig.valueField,
           labelField: this.currentOptionConfig.labelField,
         };
-        config.children = [];
+        // 接口请求
+        // 判断是否需要走 api接口获取
+        let children = [];
+        const bool = this.needSetChildren(this.currentConfig, config.optionSource);
+        if (bool) children = await this.loadApiOptions(config);
+        else config.children = children || [];
       }
       this.optionsDialogVisible = false;
     },

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

@@ -495,10 +495,15 @@ export default {
       const filterConditions = [];
       Object.keys(formSearch).forEach(key => {
         const tempItem = this.formSearchData.tableSearch.find(item => item.value === key);
-        if (formSearch[key] !== undefined && formSearch[key] !== null) {
+        if (
+          formSearch[key] !== undefined &&
+          formSearch[key] !== null &&
+          formSearch[key] !== "" &&
+          formSearch[key] != []
+        ) {
           filterConditions.push({
             key: key,
-            value: formSearch[key],
+            values: Array.isArray(formSearch[key]) ? formSearch[key] : [formSearch[key]], //必须包数组，后端会统一处理
             compare: tempItem && tempItem.compare ? tempItem.compare : "",
           });
         }
@@ -546,6 +551,7 @@ export default {
       } else {
         // 转成接口需要的结构filterConditions
         const filterConditions = this.setFilterConditionsByFormSearch(this.formSearch) || [];
+
         // 动态模式
         this.$emit("handleSearch", this.formSearch, { filterConditions });
         console.log(`\x1b[36m\x1b[4mol插件-动态搜索框查询`, this.formSearch, { filterConditions });

package/src/package/index.js

@@ -210,8 +210,6 @@ const components = [OlTable, OlSearch, OlCustomSearch, Dialog, OlForm, OlNumberR
 const install = async function (Vue) {
   // 设置全局数据
   components.map(item => {
-    console.log(777, item);
-
     Vue.component(`ol-${item.name}`, item);
   });
   consoleTooltip();