mooho-base-admin-plus 2.4.27 → 2.4.28

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "2.4.27",
+  "version": "2.4.28",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "license": "MIT",
   "private": false,

package/src/components/view/table-filter.vue

@@ -142,6 +142,26 @@
               <Option v-for="item in getDataSource(data, column)" :key="item.id" :value="item.id">{{ item.name }}</Option>
             </Select>
           </template>
+
+          <template v-else-if="column.controlType === 'ComboSelect'">
+            <Select
+              :ref="'control_' + column.code"
+              :model-value="parseComboData(data, column)"
+              @update:model-value="$event => setData(data, column.code, $event)"
+              :disabled="readonly || column.isReadonly"
+              :clearable="true"
+              filterable
+              remote
+              :remote-method="search => loadOption(data, column, search)"
+              :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
+              :placeholder="column.description"
+              :transfer="true"
+              @on-change="selected => onSelectDataChange(column, selected)"
+            >
+              <Option v-for="item in getDataSource(data, column)" :key="item.id" :value="item.id">{{ item.name }}</Option>
+            </Select>
+          </template>
+
           <template v-else-if="column.controlType === 'MultiComboSelect'">
             <Select
               :ref="'control_' + column.code"
@@ -907,7 +927,7 @@
 
               if (column.controlType == 'ComboSelect') {
                 // 添加筛选内容
-                this.$refs['control_' + column.code][0].$data.query = label;
+                //this.$refs['control_' + column.code][0].$data.query = label;
               }
 
               let newValue = pendings.find(i => i.value == v);

package/src/components/view/view-form-draggable.vue

@@ -1133,7 +1133,7 @@
 
               if (column.controlType == 'ComboSelect') {
                 // 添加筛选内容
-                this.$refs['control_' + column.code][0].$data.query = label;
+                //this.$refs['control_' + column.code][0].$data.query = label;
               }
 
               let newValue = pendings.find(i => i.value == v);

package/src/components/view/view-form.vue

@@ -1632,6 +1632,7 @@
       // 根据表达式取值(可筛选选择框)
       parseComboData(model, column) {
         let value = this.parseData(model, column.code);
+        console.log('parseComboData', column.code, value);
 
         this.loadComboDataLabel(model, column, value);
 
@@ -1656,9 +1657,13 @@
           return;
         }
 
+        console.log('loadComboDataLabel', column.code, data);
+
         if (this.$refs['control_' + column.code] && data) {
           let values = this.$refs['control_' + column.code][0].$data.values;
 
+          console.log('values', values);
+
           let pendings = [];
           if (column.controlType == 'MultiComboSelect') {
             data.forEach(value => {
@@ -1680,10 +1685,13 @@
 
           // 读取显示内容
           if (pendings.length > 0) {
+            console.log('pendings', pendings);
             let param = this.getParam(model, column);
             param[column.sourceDataCode] = pendings.map(item => item.value).join(',');
             let res;
 
+            console.log('param', param);
+
             if (column.isSourceCustom) {
               res = await customModelApi.query(column.source, param);
             } else {
@@ -1695,8 +1703,9 @@
               let label = this.parseData(item, column.sourceDisplayCode);
 
               if (column.controlType == 'ComboSelect') {
+                console.log('label', label);
                 // 添加筛选内容
-                this.$refs['control_' + column.code][0].$data.query = label;
+                //this.$refs['control_' + column.code][0].$data.query = label;
               }
 
               let newValue = pendings.find(i => i.value == v);

package/src/components/view/view-table.vue

@@ -2726,7 +2726,7 @@
 
               if (column.controlType == 'ComboSelect') {
                 // 添加筛选内容
-                this.$refs['control_' + column.code + '_' + index].$data.query = label;
+                //this.$refs['control_' + column.code + '_' + index].$data.query = label;
                 //this.$refs['control_' + column.code + '_' + index].setQuery(label);
               }
 

package/src/mixins/page.js

@@ -367,6 +367,8 @@ export default {
     },
     // 根据表达式赋值
     setData(model, expression, value) {
+      console.log('setData', expression, value);
+
       // if (expression == null) {
       //   return;
       // }