mooho-base-admin-plus 2.4.27 → 2.4.29

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.29",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "license": "MIT",
   "private": false,

package/src/api/customPage.js

@@ -1,4 +1,6 @@
 import request from '../libs/request';
+import dateFormat from 'date-fns/format';
+import saveAs from 'file-saver';
 
 const res = 'CustomPage';
 
@@ -11,5 +13,20 @@ export default {
         id
       }
     });
+  },
+  async exportFile(ids) {
+    const result = await request({
+      url: `api/${res}/exportFile`,
+      method: 'post',
+      responseType: 'blob',
+      data: {
+        ids
+      }
+    });
+
+    const blob = new Blob([result], {
+      type: 'application/octet-stream'
+    });
+    saveAs(blob, 'CustomPage-' + dateFormat(new Date(), 'yyyyMMddHHmmss') + '.cp');
   }
 };

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,7 +1632,6 @@
       // 根据表达式取值(可筛选选择框)
       parseComboData(model, column) {
         let value = this.parseData(model, column.code);
-
         this.loadComboDataLabel(model, column, value);
 
         return value;
@@ -1696,7 +1695,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-table.vue

@@ -2367,7 +2367,7 @@
               return item[batchSelectDataCode] == selected[i].id;
             })
           ) {
-            let item = {};
+            let item = this.getDefaultData();
             item[batchSelectDataCode] = selected[i].id;
             item[key] = selected[i];
 
@@ -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/pages/system/customPage.vue

@@ -4,7 +4,15 @@
       <PageHeader :title="$route.meta.title" :content="$route.meta.description" hidden-breadcrumb />
     </div>
     <Card :bordered="false" dis-hover class="ivu-mt">
-      <view-table ref="table" view-code="CustomPage" @create="$refs.form.open()" @edit="({ row, index }) => $refs.form.open(row)">
+      <view-table ref="table" view-code="CustomPage" :selectEnable="true" @create="$refs.form.open()" @edit="({ row, index }) => $refs.form.open(row)">
+        <template #filterCommand>
+          <Button size="small" type="info" custom-icon="fa fa-cloud-download-alt" @click="exportFile()">{{ $t('Front_Btn_Export') }}</Button>
+          <file-upload url="api/CustomPage/importFile" accept=".cp" @on-success="importFileSuccess">
+            <template #>
+              <Button type="primary" custom-icon="fa fa-cloud-upload-alt" size="small">{{ $t('Front_Btn_Import') }}</Button>
+            </template>
+          </file-upload>
+        </template>
         <template #command="{}">
           <!-- <Button size="small"
                   title="页面组件"
@@ -47,6 +55,7 @@
 </template>
 <script>
   import mixinPage from '../../mixins/page';
+  import customPageApi from '../../api/customPage';
 
   export default {
     name: 'system-page',
@@ -57,6 +66,28 @@
     },
     computed: {},
     created() {},
-    methods: {}
+    methods: {
+      // 导出文件
+      exportFile() {
+        let ids = this.$refs.table.getSelected().map(x => {
+          return x.id;
+        });
+        if (ids.length > 0) {
+          customPageApi.exportFile(ids);
+        } else {
+          this.error('Front_Msg_Please_Select_Export_Item');
+        }
+      },
+      // 导入成功
+      importFileSuccess(res) {
+        if (res.code == 0) {
+          this.success('Front_Msg_Success', () => {
+            this.$refs.table.loadData();
+          });
+        } else {
+          this.error(res.message);
+        }
+      }
+    }
   };
 </script>

package/src/pages/system/openUser.vue

@@ -4,13 +4,26 @@
       <PageHeader :title="$route.meta.title" :content="$route.meta.description" hidden-breadcrumb />
     </div>
     <Card :bordered="false" dis-hover class="ivu-mt">
-      <view-table ref="table" view-code="OpenUser" @create="$refs.form.open()" @edit="({ row, index }) => $refs.form.open(row)">
+      <view-table ref="table" view-code="OpenUser" @create="$refs.form.open()" @edit="edit">
         <template #command="{ row }">
           <Button size="small" :title="$t('Front_Btn_API_Permission')" type="primary" custom-icon="fa fa-atom" @click="openApiTableOpen(row)"></Button>
         </template>
       </view-table>
     </Card>
-    <modal-form ref="form" view-code="OpenUserEdit" @on-after-save="$refs.table.loadData()" />
+    <modal-form ref="form" view-code="OpenUserEdit" @on-after-save="$refs.table.loadData()">
+      <template #column="{ data, column, code }">
+        <template v-if="code == 'password'">
+          <Input
+            type="password"
+            :model-value="parseData(data, column.code)"
+            @update:model-value="$event => setData(data, column.code, $event)"
+            :readonly="readonly || column.isReadonly"
+            :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
+            :maxlength="column.maxLength"
+          />
+        </template>
+      </template>
+    </modal-form>
     <modal-table ref="openApiTable" view-code="OpenApiCheck" :select-enable="true" :static="true" :footerEnable="true">
       <template #footer>
         <Button type="primary" custom-icon="fa fa-save" @click="saveOpenApiPermission()">{{ $t('Front_Btn_Save') }}</Button>
@@ -35,6 +48,10 @@
     computed: {},
     created() {},
     methods: {
+      edit({ row, index }) {
+        row.password = '$$$$$$$$';
+        this.$refs.form.open(row);
+      },
       // 打开接口列表界面
       async openApiTableOpen(row) {
         this.openUserID = row.id;