@leevan/jtui 2.0.38 → 2.0.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leevan/jtui",
-  "version": "2.0.38",
+  "version": "2.0.40",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
@@ -32,7 +32,7 @@
   "dependencies": {
     "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
     "@vue/babel-preset-jsx": "^1.1.2",
-    "axios": "^0.19.2",
+    "axios": "^1.7.9",
     "core-js": "^3.6.4",
     "echarts": "^4.2.1",
     "element-ui": "^2.15.14",

package/packages/Search-Type/index.vue

@@ -15,11 +15,11 @@
                     <el-radio-button label="or">或者</el-radio-button>
                 </el-radio-group>
 
-                <span :style="{ marginLeft: index === 0 && viewData.length > 1 ? '189px' : 0 }" @click="getData">查询类型</span>
-                <el-select @change="typeChange(arguments, im)" size="mini" popper-class="max-height-popper search-base-slt"
-                    v-model="im.search_type" placeholder="请选择">
-                    <el-option v-for="(item, index) in options_type"
-                    :key="index" :label="item.srname"
+                <span :style="{ marginLeft: index === 0 && viewData.length > 1 ? '189px' : 0 }"
+                    @click="getData">查询类型</span>
+                <el-select @change="typeChange(arguments, im)" size="mini"
+                    popper-class="max-height-popper search-base-slt" v-model="im.search_type" placeholder="请选择">
+                    <el-option v-for="(item, index) in options_type" :key="index" :label="item.srname"
                         :value="item.rootpath">
                     </el-option>
                 </el-select>
@@ -45,24 +45,29 @@
             </div>
 
             <div style="display:inline-block" v-if="im.status == 5">
-                <el-cascader-multi ref="type5Ref" style="margin-left:15px;width:300px" size="mini" collapse-tags
+                <!-- <el-cascader-multi ref="type5Ref" style="margin-left:15px;width:300px" size="mini" collapse-tags
                 show-leaf-label :is-two-dimension-value="false" v-model="im.model_5.cascader"
-                    :data="im.formConfig_5"> </el-cascader-multi>
+                    :data="im.formConfig_5"> </el-cascader-multi> -->
+                <el-cascader size="mini" v-if="im.active_type && im.active_type.cascade_uri" :props="props_load_5(im)" style="height: 30px;margin-left: 10px;"
+                 ref="type5Ref" collapse-tags placeholder="请选择" :show-all-levels="false"
+                    v-model="im.model_5.cascader" />
+                <el-cascader v-else size="mini" style="height: 30px;margin-left: 10px;" ref="type5Ref" collapse-tags
+                    placeholder="请选择" :show-all-levels="false" v-model="im.model_5.cascader" :props="{ multiple: true }"
+                    :options="im.formConfig_5">
+                </el-cascader>
             </div>
 
             <div style="display:inline-block;margin-left:12px;position:relative;"
                 v-if="im.status == 3 || im.status == 4 || im.status == 7">
                 <el-checkbox-group size="mini" v-model="im.stations">
-                    <el-checkbox-button v-for="(item, index) in im.checkboxData" :key="index"
-                        :label="item.value">{{ item.label }}</el-checkbox-button>
+                    <el-checkbox-button v-for="(item, index) in im.checkboxData" :key="index" :label="item.value">{{
+                        item.label }}</el-checkbox-button>
                 </el-checkbox-group>
             </div>
 
-            <div style="display:inline-block;margin-left:12px;position:relative;"
-            v-if="im.status == 9">
-                <tree-select v-model="im.stations" :activeType="im.active_type" 
-                :baseUrl="listuri"
-                :checked="im.checkboxData"/>
+            <div style="display:inline-block;margin-left:12px;position:relative;" v-if="im.status == 9">
+                <tree-select v-model="im.stations" :activeType="im.active_type" :baseUrl="listuri"
+                    :checked="im.checkboxData" />
             </div>
 
             <div class="st-btns" v-show="options_type.length > 1 && options_type[0].value !== 'All'">
@@ -75,12 +80,12 @@
 
 <script>
 import TreeSelect from './tree-select.vue'
-import ElCascaderMulti from './el-cascader-multi/src/multi-cascader/multi-cascader.vue'
+// import ElCascaderMulti from './el-cascader-multi/src/multi-cascader/multi-cascader.vue'
 export default {
-    name:'search-type',
-    components:{
+    name: 'search-type',
+    components: {
         TreeSelect,
-        ElCascaderMulti
+        // ElCascaderMulti
     },
     props: {
         options_type: {
@@ -280,8 +285,8 @@ export default {
                         im.stations = result.selected;
                         im.formConfig_4[0].remoteMethod = (query) => (this.remoteMethod(query, im, result))
                         im.checkboxData = result.enumlists;
-                    }else if(result.invlbz === '9') {
-                        if(result.selected){
+                    } else if (result.invlbz === '9') {
+                        if (result.selected) {
                             im.checkboxData = result.selected;
                             im.stations = result.selected;
                         }
@@ -408,7 +413,7 @@ export default {
                     })
                 }
                 case '9': {
-                    if(item.stations.length === 0){
+                    if (item.stations.length === 0) {
                         return false
                     }
                     let casParam;
@@ -435,6 +440,39 @@ export default {
                 invalue: data
             });
             im.formConfig_4[0].options = res1;
+        },
+        props_load_5(im) {
+            return {
+                lazy: true,
+                multiple: true,
+                lazyLoad: async (node, resolve) => {
+                    const { level, data: res } = node
+                    if (level === 0) {
+                        resolve(im.active_type.cascade_root.map((item) => ({
+                            label: item.name,
+                            leaf: item.path === "-" || !item.path,
+                            path: item.path,
+                            value: item.id,
+                            other: item,
+                        })))
+                    } else {
+                        if (res.path === "-" || !res.path) {
+                            resolve();
+                            return;
+                        }
+                        const { data } = await this.$axios.post(im.active_type.cascade_uri + res.path)
+                        resolve(
+                            data.map((item) => ({
+                                label: item.name,
+                                leaf: item.path === "-" || !item.path,
+                                path: item.path,
+                                value: item.id,
+                                other: item,
+                            }))
+                        );
+                    }
+                }
+            }
         }
     }
 }
@@ -443,8 +481,8 @@ export default {
 <style lang="scss" scoped>
 span {
     padding: 0 12px;
-    color:#666666;
-    font-size:14px;
+    color: #666666;
+    font-size: 14px;
 }
 
 .st-btns {
@@ -497,12 +535,13 @@ span {
 .search-tb .el-select__tags .el-tag .el-icon-close {
     top: -5px;
 }
-.search-base-slt{
-    z-index:99999 !important;
+
+.search-base-slt {
+    z-index: 99999 !important;
 }
 </style>
 <style lang="scss">
 .max-height-popper .el-select-dropdown__wrap {
-  max-height: 540px;
+    max-height: 540px;
 }
 </style>