mooho-base-admin-plus 2.10.75 → 2.10.77

package/package.json

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

package/src/components/input/dialog-select.vue

@@ -14,7 +14,15 @@
         <Button :size="size" custom-icon="fa fa-search" @click="dialogSelectOpen()"></Button>
       </template>
     </Input>
-    <modal-table ref="dialogTable" :view-code="source" :autoLoad="false" :select-enable="multi" :check-cross-page="true" :footer-enable="multi">
+    <modal-table
+      ref="dialogTable"
+      :view-code="source"
+      :autoLoad="false"
+      :select-enable="multi"
+      :check-cross-page="true"
+      :footer-enable="multi"
+      @on-row-dblclick="dialogTableRowDblclick"
+    >
       <template #command="{ row }">
         <Button size="small" v-if="!multi" type="primary" custom-icon="fa fa-check" @click="dialogCheck(row)">{{ $t('Front_Btn_Select') }}</Button>
       </template>
@@ -311,13 +319,20 @@
          * 选中项变化事件
          * @property {object} row 选中行 }
          */
-        this.$emit('on-change', data);
+        this.$emit('on-change', data, displayData);
 
         this.$refs.dialogTable.close();
       },
       // 关闭
       close() {
         this.$refs.dialogTable.close();
+      },
+      // 双击行选中
+
+      dialogTableRowDblclick(row) {
+        if (!this.multi) {
+          this.dialogCheck(row);
+        }
       }
     }
   };

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

@@ -322,7 +322,7 @@
             </Col>
             <Col v-bind="grid8" v-if="paramData.keyType == '变量'">
               <FormItem label="值" key="val2" prop="val">
-                <Input type="text" v-model="paramData.val" @on-focus="openValueSelect">
+                <Input type="text" v-model="paramData.val">
                   <template #prepend>
                     <Button custom-icon="fa fa-search" @click="openValueSelect"></Button>
                   </template>

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

@@ -163,7 +163,7 @@
                     :source="column.source"
                     :source-data-code="column.sourceDataCode"
                     :source-display-code="column.sourceDisplayCode"
-                    :param="getParam(data, column)"
+                    :param="getParam(data, column, parentData)"
                     :controlWidth="column.controlWidth"
                     @on-change="selected => onSelectDataChange(column, selected)"
                   ></dialog-select>
@@ -177,7 +177,7 @@
                     :source="column.source"
                     :source-data-code="column.sourceDataCode"
                     :source-display-code="column.sourceDisplayCode"
-                    :param="getParam(data, column)"
+                    :param="getParam(data, column, parentData)"
                     :controlWidth="column.controlWidth"
                     @on-change="selected => onSelectDataChange(column, selected)"
                   ></dialog-select>
@@ -310,6 +310,15 @@
       // 字段
       columns: {
         type: Array
+      },
+      /**
+       * 内嵌表格的父对象
+       */
+      parentData: {
+        type: Object,
+        default() {
+          return {};
+        }
       }
     },
     watch: {
@@ -625,7 +634,7 @@
             break;
           }
 
-          let param = this.getParam(this.data, column);
+          let param = this.getParam(this.data, column, this.parentData);
 
           if (
             column.controlType === 'Select' ||
@@ -801,7 +810,7 @@
           return;
         }
 
-        let param = this.getParam(data, column);
+        let param = this.getParam(data, column, this.parentData);
 
         if (param != null) {
           param[column.sourceDisplayCode + '_c'] = keyword;

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

@@ -629,41 +629,7 @@
         if (this.data && Object.keys(this.data).length > 0) {
           this.columns.forEach(async column => {
             if ((column.controlType == 'Table' || column.controlType == 'ExcelTable') && this.$refs['table_' + column.code]) {
-              setTimeout(async () => {
-                if (column.tableStoreType == 'Inner') {
-                  // 表内存储
-                  let json = this.parseData(this.data, column.code);
-
-                  if (json) {
-                    this.$refs['table_' + column.code][0].loadData(JSON.parse(json));
-                  }
-                } else {
-                  // 关联表
-                  if (this.data.id) {
-                    // 参数完整，查询数据
-                    let res;
-                    let param = {};
-
-                    let tableView = this.$refs['table_' + column.code][0].tableView;
-
-                    let filtering = tableView.filtering;
-
-                    if (!!(filtering || '').trim()) {
-                      param = JSON.parse(filtering);
-                    }
-
-                    param[column.sourceDataCode] = this.data.id;
-
-                    if (column.isSourceCustom) {
-                      res = await customModelApi.query(column.sourceModel, param, null, tableView.isReturnSimple ? tableView : null);
-                    } else {
-                      res = await modelApi.query(column.sourceModel, param, null, tableView.isReturnSimple ? tableView : null, tableView.functionName, tableView.functionType);
-                    }
-
-                    this.$refs['table_' + column.code][0].loadData(res.data);
-                  }
-                }
-              });
+              this.reloadTable(column.code);
             } else if (column.controlType == 'Attachment' && this.$refs['attachment_' + column.code] && this.$refs['attachment_' + column.code].length > 0) {
               this.$refs['attachment_' + column.code][0].setData(this.parseData(this.data, column.code));
             }
@@ -1755,6 +1721,46 @@
         }
 
         control.open(data);
+      },
+      // 重新加载内嵌表格数据
+      reloadTable(tableCode) {
+        let column = this.column.find(item => item.code == tableCode);
+
+        setTimeout(async () => {
+          if (column.tableStoreType == 'Inner') {
+            // 表内存储
+            let json = this.parseData(this.data, column.code);
+
+            if (json) {
+              this.$refs['table_' + column.code][0].loadData(JSON.parse(json));
+            }
+          } else {
+            // 关联表
+            if (this.data.id) {
+              // 参数完整，查询数据
+              let res;
+              let param = {};
+
+              let tableView = this.$refs['table_' + column.code][0].tableView;
+
+              let filtering = tableView.filtering;
+
+              if (!!(filtering || '').trim()) {
+                param = JSON.parse(filtering);
+              }
+
+              param[column.sourceDataCode] = this.data.id;
+
+              if (column.isSourceCustom) {
+                res = await customModelApi.query(column.sourceModel, param, null, tableView.isReturnSimple ? tableView : null);
+              } else {
+                res = await modelApi.query(column.sourceModel, param, null, tableView.isReturnSimple ? tableView : null, tableView.functionName, tableView.functionType);
+              }
+
+              this.$refs['table_' + column.code][0].loadData(res.data);
+            }
+          }
+        });
       }
       // // 打印
       // print() {

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

@@ -28,7 +28,7 @@
               @slot 自定义筛选栏
           -->
             <slot name="customFilter"></slot>
-            <table-filter ref="tableFilter" :columns="filterColumns" :table-view="tableView" @on-keyup="onKeyup">
+            <table-filter ref="tableFilter" :columns="filterColumns" :table-view="tableView" :parent-data="parentData" @on-keyup="onKeyup">
               <template #column="{ column }">
                 <!--
                   @slot 筛选栏自定义列
@@ -2882,7 +2882,7 @@
           return;
         }
 
-        let param = this.getParam(data, column);
+        let param = this.getParam(data, column, this.parentData);
 
         if (param != null) {
           param[column.sourceDisplayCode + '_c'] = keyword;

package/src/pages/system/role.vue

@@ -39,13 +39,32 @@
         <view-table ref="userRoleDataTable" view-code="UserRoleDataEdit" :static="true">
           <template #column="{ row, code }">
             <template v-if="row.controlType === 'TextInput'">
-              <Input type="text" size="small" v-model="row.propertyValue" />
+              <Input
+                type="text"
+                size="small"
+                v-model="row.propertyValue"
+                @on-change="
+                  () => {
+                    row.propertyDisplayValue = row.propertyValue;
+                  }
+                "
+              />
             </template>
             <template v-else-if="row.controlType === 'NumberInput'">
-              <Input type="number" size="small" number v-model="row.propertyValue" />
+              <Input
+                type="number"
+                size="small"
+                number
+                v-model="row.propertyValue"
+                @on-change="
+                  () => {
+                    row.propertyDisplayValue = row.propertyValue;
+                  }
+                "
+              />
             </template>
             <template v-else-if="row.controlType === 'Select'">
-              <Select size="small" v-model="row.propertyValue" :clearable="true" :transfer="true">
+              <Select size="small" v-model="row.propertyValue" :clearable="true" :transfer="true" @on-change="selected => selectChange(selected, row)">
                 <Option v-for="item in row._dataSource" :key="item.id" :value="item.id">{{ item.name }}</Option>
               </Select>
             </template>
@@ -61,6 +80,7 @@
                 :multiple="true"
                 clearable
                 :transfer="true"
+                @on-change="selected => multiSelectChange(selected, row)"
               >
                 <Option v-for="item in row._dataSource" :key="item.id" :value="item.id">{{ item.name }}</Option>
               </Select>
@@ -73,6 +93,7 @@
                 :source-data-code="row.sourceDataCode"
                 :source-display-code="row.sourceDisplayCode"
                 :param="getParam(row)"
+                @on-change="selected => dialogSelectChange(selected, row)"
               ></dialog-select>
             </template>
             <template v-else-if="row.controlType === 'MultiDialogSelect'">
@@ -84,6 +105,7 @@
                 :source-data-code="row.sourceDataCode"
                 :source-display-code="row.sourceDisplayCode"
                 :param="getParam(row)"
+                @on-change="(selected, displaySelected) => multiDialogSelectChange(selected, displaySelected, row)"
               ></dialog-select>
             </template>
             <template v-else-if="row.controlType === 'Check'">
@@ -394,6 +416,34 @@
             });
           });
         }
+      },
+      selectChange(selected, row) {
+        console.log('selectChange', selected, row);
+
+        if (selected) {
+          row.propertyDisplayValue = row._dataSource.find(item => item.id == selected).name;
+        } else {
+          row.propertyDisplayValue = null;
+        }
+      },
+      multiSelectChange(selected, row) {
+        let displayValue = [];
+
+        selected.forEach(item => {
+          displayValue.push(row._dataSource.find(i => i.id == item).name);
+        });
+
+        row.propertyDisplayValue = displayValue.join(',');
+      },
+      dialogSelectChange(selected, row) {
+        if (selected) {
+          row.propertyDisplayValue = selected.name;
+        } else {
+          row.propertyDisplayValue = null;
+        }
+      },
+      multiDialogSelectChange(selected, displaySelected, row) {
+        row.propertyDisplayValue = displaySelected;
       }
     }
   };

package/src/pages/system/user.vue

@@ -50,13 +50,49 @@
         <view-table ref="userRoleDataTable" view-code="UserRoleDataEdit" :static="true">
           <template #column="{ row, code }">
             <template v-if="row.controlType === 'TextInput'">
-              <Input type="text" size="small" v-model="row.propertyValue" />
+              <Input
+                type="text"
+                size="small"
+                v-model="row.propertyValue"
+                @on-change="
+                  () => {
+                    row.propertyDisplayValue = row.propertyValue;
+                  }
+                "
+              />
             </template>
             <template v-else-if="row.controlType === 'NumberInput'">
-              <Input type="number" size="small" number v-model="row.propertyValue" />
+              <Input
+                type="number"
+                size="small"
+                number
+                v-model="row.propertyValue"
+                @on-change="
+                  () => {
+                    row.propertyDisplayValue = row.propertyValue;
+                  }
+                "
+              />
             </template>
             <template v-else-if="row.controlType === 'Select'">
-              <Select size="small" v-model="row.propertyValue" :clearable="true" :transfer="true">
+              <Select size="small" v-model="row.propertyValue" :clearable="true" :transfer="true" @on-change="selected => selectChange(selected, row)">
+                <Option v-for="item in row._dataSource" :key="item.id" :value="item.id">{{ item.name }}</Option>
+              </Select>
+            </template>
+            <template v-else-if="row.controlType === 'MultiSelect'">
+              <Select
+                size="small"
+                :model-value="row.propertyValue == null ? null : JSON.parse(row.propertyValue)"
+                @update:model-value="
+                  $event => {
+                    row.propertyValue = $event.length == 0 ? null : JSON.stringify($event);
+                  }
+                "
+                :multiple="true"
+                clearable
+                :transfer="true"
+                @on-change="selected => multiSelectChange(selected, row)"
+              >
                 <Option v-for="item in row._dataSource" :key="item.id" :value="item.id">{{ item.name }}</Option>
               </Select>
             </template>
@@ -68,6 +104,7 @@
                 :source-data-code="row.sourceDataCode"
                 :source-display-code="row.sourceDisplayCode"
                 :param="getParam(row)"
+                @on-change="selected => dialogSelectChange(selected, row)"
               ></dialog-select>
             </template>
             <template v-else-if="row.controlType === 'MultiDialogSelect'">
@@ -79,6 +116,7 @@
                 :source-data-code="row.sourceDataCode"
                 :source-display-code="row.sourceDisplayCode"
                 :param="getParam(row)"
+                @on-change="(selected, displaySelected) => multiDialogSelectChange(selected, displaySelected, row)"
               ></dialog-select>
             </template>
             <template v-else-if="row.controlType === 'Check'">
@@ -299,6 +337,34 @@
           this.success('Front_Msg_Success');
           this.$refs.dataPermissionForm.close();
         });
+      },
+      selectChange(selected, row) {
+        console.log('selectChange', selected, row);
+
+        if (selected) {
+          row.propertyDisplayValue = row._dataSource.find(item => item.id == selected).name;
+        } else {
+          row.propertyDisplayValue = null;
+        }
+      },
+      multiSelectChange(selected, row) {
+        let displayValue = [];
+
+        selected.forEach(item => {
+          displayValue.push(row._dataSource.find(i => i.id == item).name);
+        });
+
+        row.propertyDisplayValue = displayValue.join(',');
+      },
+      dialogSelectChange(selected, row) {
+        if (selected) {
+          row.propertyDisplayValue = selected.name;
+        } else {
+          row.propertyDisplayValue = null;
+        }
+      },
+      multiDialogSelectChange(selected, displaySelected, row) {
+        row.propertyDisplayValue = displaySelected;
       }
     }
   };

package/token.txt

@@ -0,0 +1,2 @@
+echo "//registry.npmjs.org/:_authToken=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" >> .npmrc
+npm config set //registry.npmjs.org/:_authToken=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