ol-base-components 3.2.0 → 3.2.2

package/package.json

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

package/src/App.vue

@@ -1,6 +1,9 @@
 <template>
   <div id="app">
-    <ol-customSearch :form-search-data="formSearchData" @onSave="saveHandler"></ol-customSearch>
+    <ol-customSearch
+      :form-search-data="formSearchData"
+      @handleSearch="handleSearch"
+    ></ol-customSearch>
     =========
     <!-- <div>table组件案例</div> -->
     <!-- url="/api/app/stock-in/stock-in-pages" -->
@@ -136,7 +139,7 @@ export default {
           // timer: [],
           // range: [10, 200],
         },
-        tableSearch: [
+        tableSearch1: [
           // {
           //   label: "数字区间",
           //   value: "range",
@@ -274,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

@@ -1,7 +1,6 @@
 <template>
   <ol-search
     :form-search-data="formSearchData"
-    @handleSearch="handleSearch"
     @onSave="onSave"
     v-bind="$attrs"
     v-on="$listeners"

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>
 
@@ -447,6 +447,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;

package/src/package/formSearch/src/index.js

@@ -27,5 +27,3 @@ const translateWord = async word => {
     return word.charAt(0).toUpperCase() + word.slice(1);
   }
 };
-
-// 由于配置更新children

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

@@ -164,7 +164,7 @@
             {{ expend ? "收起" : "展开" }}</el-button
           >
           <el-button
-            v-if="formSearchData.enableConfig"
+            v-if="formSearchData.customs && formSearchData.customs.length"
             plain
             size="small"
             icon="el-icon-setting"
@@ -266,7 +266,7 @@ export default {
           // 表格框架各种样式
           options: {},
           reset: false, // 是否要重置
-          enableConfig: false, // 是否启用配置功能
+          customs: [], //根据customs确定是动态还是swagger配置
         };
       },
     },
@@ -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 });
@@ -643,11 +649,11 @@ export default {
 
         let response;
         if (method === "post") {
-          response = await this.$http.post(apiUrl);
+          response = await this.post({ url: apiUrl });
         } else {
-          response = await this.$http.get(apiUrl);
+          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 => ({

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();