mooho-base-admin-plus 2.8.7 → 2.8.9

package/package.json

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

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

@@ -473,9 +473,9 @@
         this.disableLoader();
         let res;
         if (column.isSourceCustom) {
-          res = await customModelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
+          res = await customModelApi.query(column.source, param); //, [column.sourceDataCode, column.sourceDisplayCode]);
         } else {
-          res = await modelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
+          res = await modelApi.query(column.source, param); //, [column.sourceDataCode, column.sourceDisplayCode]);
         }
         this.enableLoader();
 

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

@@ -647,9 +647,9 @@
         this.disableLoader();
         let res;
         if (column.isSourceCustom) {
-          res = await customModelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
+          res = await customModelApi.query(column.source, param); //, [column.sourceDataCode, column.sourceDisplayCode]);
         } else {
-          res = await modelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
+          res = await modelApi.query(column.source, param); //, [column.sourceDataCode, column.sourceDisplayCode]);
         }
         this.enableLoader();
 
@@ -1054,102 +1054,6 @@
             item.needClear = true;
           });
         }
-      },
-      // 根据表达式取值(可筛选选择框)
-      parseComboData(model, column) {
-        let value = this.parseData(model, column.code);
-
-        setTimeout(() => {
-          this.loadComboDataLabel(model, column, value);
-        });
-
-        return value;
-      },
-      // 根据表达式取值(可筛选多选选择框)
-      parseMultiComboData(model, column) {
-        let data = [];
-        let value = this.parseData(model, column.code);
-
-        if (this.isJSON(value)) {
-          data = JSON.parse(value);
-        }
-
-        this.loadComboDataLabel(model, column, data);
-
-        return data;
-      },
-      // 加载可筛选选择框显示内容
-      async loadComboDataLabel(model, column, data) {
-        if (column.isStaticItem || (column.dataType && column.dataType.startsWith('Enum:'))) {
-          return;
-        }
-
-        if (this.$refs['control_' + column.code] && data) {
-          let values;
-          if (Array.isArray(this.$refs['control_' + column.code])) {
-            values = this.$refs['control_' + column.code][0].$data.values;
-          } else {
-            values = this.$refs['control_' + column.code].$data.values;
-          }
-
-          let pendings = [];
-          if (column.controlType == 'MultiComboSelect') {
-            data.forEach(value => {
-              if (!values.some(v => v.value == value)) {
-                // 不在选中项中
-                let newValue = { value, label: null, disabled: false };
-                values.push(newValue);
-                pendings.push(newValue);
-              }
-            });
-          } else {
-            if (!values.some(v => v.value == data)) {
-              // 不在选中项中
-              let newValue = { value: data, label: null, disabled: false };
-              values.push(newValue);
-              pendings.push(newValue);
-            }
-          }
-
-          // 读取显示内容
-          setTimeout(async () => {
-            if (pendings.length > 0) {
-              let param = this.getParam(model, column);
-              param[column.sourceDataCode] = pendings.map(item => item.value).join(',');
-              let res;
-
-              if (column.isSourceCustom) {
-                res = await customModelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
-              } else {
-                res = await modelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
-              }
-
-              res.data.forEach(item => {
-                let v = this.parseData(item, column.sourceDataCode);
-                let label = this.parseData(item, column.sourceDisplayCode);
-
-                if (column.controlType == 'ComboSelect') {
-                  // 添加筛选内容
-                  //this.$refs['control_' + column.code][0].$data.query = label;
-                }
-
-                let newValue = pendings.find(i => i.value == v);
-
-                if (newValue) {
-                  newValue.label = label;
-                }
-              });
-
-              this.$forceUpdate();
-            }
-          });
-        }
-      },
-      // 可筛选下拉框搜索条件变化
-      onComboQueryChange(column, query) {
-        if (!(query || '').trim()) {
-          this.loadOption(this.data, column, null);
-        }
       }
     }
   };

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

@@ -1166,9 +1166,9 @@
         this.disableLoader();
         let res;
         if (column.isSourceCustom) {
-          res = await customModelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
+          res = await customModelApi.query(column.source, param); //, [column.sourceDataCode, column.sourceDisplayCode]);
         } else {
-          res = await modelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
+          res = await modelApi.query(column.source, param); //, [column.sourceDataCode, column.sourceDisplayCode]);
         }
         this.enableLoader();
 

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

@@ -1962,9 +1962,9 @@
         this.disableLoader();
         let res;
         if (column.isSourceCustom) {
-          res = await customModelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
+          res = await customModelApi.query(column.source, param); //, [column.sourceDataCode, column.sourceDisplayCode]);
         } else {
-          res = await modelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
+          res = await modelApi.query(column.source, param); //, [column.sourceDataCode, column.sourceDisplayCode]);
         }
         this.enableLoader();
 
@@ -2836,93 +2836,6 @@
             item.needClear = true;
           });
         }
-      },
-      // 根据表达式取值(可筛选选择框)
-      parseComboData(model, column, index) {
-        let value = this.parseData(model, column.code);
-
-        setTimeout(() => {
-          this.loadComboDataLabel(model, column, value, index);
-        });
-
-        return value;
-      },
-      // 根据表达式取值(可筛选多选选择框)
-      parseMultiComboData(model, column, index) {
-        let data = [];
-        let value = this.parseData(model, column.code);
-
-        if (this.isJSON(value)) {
-          data = JSON.parse(value);
-        }
-
-        setTimeout(() => {
-          this.loadComboDataLabel(model, column, data, index);
-        });
-
-        return data;
-      },
-      // 加载可筛选选择框显示内容
-      async loadComboDataLabel(model, column, data, index) {
-        if (column.isStaticItem || (column.dataType && column.dataType.startsWith('Enum:'))) {
-          return;
-        }
-
-        // 取不到ref对象，无法给values赋值。所以可筛选选择框控件在table中暂时不可用
-        if (this.$refs['control_' + column.code + '_' + index] && data) {
-          let values = this.$refs['control_' + column.code + '_' + index].$data.values;
-
-          let pendings = [];
-          if (column.controlType == 'MultiComboSelect') {
-            data.forEach(value => {
-              if (!values.some(v => v.value == value)) {
-                // 不在选中项中
-                let newValue = { value, label: null, disabled: false };
-                values.push(newValue);
-                pendings.push(newValue);
-              }
-            });
-          } else {
-            if (!values.some(v => v.value == data)) {
-              // 不在选中项中
-              let newValue = { value: data, label: null, disabled: false };
-              values.push(newValue);
-              pendings.push(newValue);
-            }
-          }
-
-          // 读取显示内容
-          if (pendings.length > 0) {
-            let param = this.getParam(model, column);
-            param[column.sourceDataCode] = pendings.map(item => item.value).join(',');
-            let res;
-
-            if (column.isSourceCustom) {
-              res = await customModelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
-            } else {
-              res = await modelApi.query(column.source, param, [column.sourceDataCode, column.sourceDisplayCode]);
-            }
-
-            res.data.forEach(item => {
-              let v = this.parseData(item, column.sourceDataCode);
-              let label = this.parseData(item, column.sourceDisplayCode);
-
-              if (column.controlType == 'ComboSelect') {
-                // 添加筛选内容
-                //this.$refs['control_' + column.code + '_' + index].$data.query = label;
-                //this.$refs['control_' + column.code + '_' + index].setQuery(label);
-              }
-
-              let newValue = pendings.find(i => i.value == v);
-
-              if (newValue) {
-                newValue.label = label;
-              }
-
-              this.$forceUpdate();
-            });
-          }
-        }
       }
     }
   };

package/src/mixins/page.js

@@ -542,22 +542,6 @@ export default {
         }
       }
 
-      // if (!!(expression || '').trim()) {
-      //   if (!isNaN(expression) || expression.substr(0, 1) == "'" || expression.substr(0, 1) == '"' || expression == 'null') {
-      //     result += expression;
-      //   } else {
-      //     let data = this.parseData(model, expression);
-
-      //     if (data == null) {
-      //       result += 'null';
-      //     } else if (isNaN(data) || data > 1416732604056469504) {
-      //       result += "'" + String(data) + "'";
-      //     } else {
-      //       result += String(data);
-      //     }
-      //   }
-      // }
-
       let data = null;
       try {
         console.log('expression', text, result);

package/src/pages/template/processPage.vue

@@ -5,7 +5,10 @@
     </div>
     <Card :bordered="false" dis-hover class="ivu-mt">
       <view-table ref="table" v-if="page" :filter="filter" :create-enable="allow('create')" @create="create">
-        <template #command="{ row }">
+        <template #filter>
+          <slot name="filter"></slot>
+        </template>
+        <template #command="{ row, index }">
           <Button
             size="small"
             v-if="row.application.status != 'Draft' && row.application.status != 'Rejected'"
@@ -22,6 +25,7 @@
             custom-icon="fa fa-edit"
             @click="$refs.form.open(row)"
           ></Button>
+          <slot name="command" :row="row" :index="index"></slot>
         </template>
       </view-table>
     </Card>