Skip to content

Commit eae9f89

Browse files
modstartmodstart
committed
feat: release 5.4.0
1 parent c17009f commit eae9f89

File tree

101 files changed

+1407
-471
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+1407
-471
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ Homestead.yaml
33
Homestead.json
44
.env
55
/.idea/
6-
/composer.lock
76
.project
87
/public/temp/
98
/public/ueditor-plus/

‎app/Constant/AppConstant.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ class AppConstant
66
{
77
const APP = 'cms';
88
const APP_NAME = 'ModStartCMS';
9-
const VERSION = '5.3.0';
9+
const VERSION = '5.4.0';
1010
}

‎module/Member/Util/MemberUtil.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,9 @@ public static function getViewName($id)
148148

149149
public static function viewName($memberUser)
150150
{
151+
if ($memberUser && is_numeric($memberUser)) {
152+
return self::getViewName($memberUser);
153+
}
151154
if (empty($memberUser)) {
152155
return '-';
153156
}

‎module/Vendor/QuickRun/Export/ExportHandle.php‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
<?php
2+
3+
4+
namespace Module\Vendor\QuickRun\Export;
5+
6+
7+
use ModStart\Core\Exception\BizException;
8+
use ModStart\Core\Input\InputPackage;
9+
use ModStart\Core\Input\Request;
10+
use ModStart\Core\Input\Response;
11+
12+
class ExportHandle
13+
{
14+
private $data = [
15+
'pageTitle' => '导出数据',
16+
'defaultExportName' => 'Export',
17+
'headTitles' => [],
18+
];
19+
20+
private $fetchCallback;
21+
22+
public function withPageTitle($pageTitle)
23+
{
24+
$this->data['pageTitle'] = $pageTitle;
25+
return $this;
26+
}
27+
28+
public function withDefaultExportName($defaultExportName)
29+
{
30+
$this->data['defaultExportName'] = $defaultExportName;
31+
return $this;
32+
}
33+
34+
public function withHeadTitles($headTitles)
35+
{
36+
$this->data['headTitles'] = $headTitles;
37+
return $this;
38+
}
39+
40+
public function handleFetch($callback)
41+
{
42+
$this->fetchCallback = $callback;
43+
return $this;
44+
}
45+
46+
public function performExcel()
47+
{
48+
return $this->perform('xlsx', 'excel');
49+
}
50+
51+
private function perform($ext, $view)
52+
{
53+
$pageTitle = $this->data['pageTitle'];
54+
$defaultExportName = $this->data['defaultExportName'];
55+
$input = InputPackage::buildFromInput();
56+
$page = $input->getPage();
57+
$pageSize = $input->getPageSize(null, null, null, 100);
58+
$search = $input->getJsonAsInput('_param')->getArray('search');
59+
$exportName = $input->getTrimString('exportName', $defaultExportName);
60+
61+
if (Request::isPost()) {
62+
BizException::throwsIfEmpty('导出文件名为空', $exportName);
63+
$paginateData = call_user_func_array($this->fetchCallback, [$page, $pageSize, $search, []]);
64+
$data = [];
65+
$data['code'] = 0;
66+
$data['list'] = $paginateData['list'];
67+
$data['total'] = $paginateData['total'];
68+
$data['finished'] = count($paginateData['list']) != $pageSize;
69+
$data['exportName'] = $exportName . '.' . $ext;
70+
$data['exportHeadTitles'] = $this->data['headTitles'];
71+
return Response::generateSuccessData($data);
72+
}
73+
74+
$paginateData = call_user_func_array($this->fetchCallback, [1, 1, $search, []]);
75+
return view('module::Vendor.View.quickRun.export.' . $view, [
76+
'pageTitle' => $pageTitle,
77+
'exportName' => $exportName,
78+
'total' => $paginateData['total'],
79+
]);
80+
}
81+
}

‎module/Vendor/QuickRun/Export/ImportHandle.php‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
<?php
2+
3+
4+
namespace Module\Vendor\QuickRun\Export;
5+
6+
7+
use ModStart\Admin\Auth\AdminPermission;
8+
use ModStart\Core\Input\InputPackage;
9+
use ModStart\Core\Input\Request;
10+
use ModStart\Core\Util\HtmlUtil;
11+
12+
class ImportHandle
13+
{
14+
private $data = [
15+
'frameView' => 'modstart::admin.dialogFrame',
16+
'pageTitle' => '导入数据',
17+
'pageDescription' => '',
18+
'templateName' => 'Template',
19+
'templateData' => [],
20+
'headTitles' => [],
21+
];
22+
23+
private $importCallback;
24+
25+
public function withDialog($enable = true)
26+
{
27+
if ($enable) {
28+
$this->data['frameView'] = 'modstart::admin.dialogFrame';
29+
} else {
30+
$this->data['frameView'] = 'modstart::admin.frame';
31+
}
32+
return $this;
33+
}
34+
35+
public function withPageTitle($pageTitle)
36+
{
37+
$this->data['pageTitle'] = $pageTitle;
38+
return $this;
39+
}
40+
41+
public function withPageDescription($pageDescription, $isHtml = false)
42+
{
43+
if (!$isHtml) {
44+
$pageDescription = HtmlUtil::text2html($pageDescription);
45+
}
46+
$this->data['pageDescription'] = $pageDescription;
47+
return $this;
48+
}
49+
50+
public function withTemplateName($templateName)
51+
{
52+
$this->data['templateName'] = $templateName;
53+
return $this;
54+
}
55+
56+
public function withTemplateData($templateData)
57+
{
58+
$this->data['templateData'] = $templateData;
59+
return $this;
60+
}
61+
62+
public function withHeadTitles($headTitles)
63+
{
64+
$this->data['headTitles'] = $headTitles;
65+
return $this;
66+
}
67+
68+
public function handleImport($callback)
69+
{
70+
$this->importCallback = $callback;
71+
return $this;
72+
}
73+
74+
public function performExcel()
75+
{
76+
return $this->perform('xlsx', 'excel');
77+
}
78+
79+
private function perform($ext, $view)
80+
{
81+
$input = InputPackage::buildFromInput();
82+
if (Request::isPost()) {
83+
$data = $input->getJson('data');
84+
AdminPermission::demoCheck();
85+
return call_user_func_array($this->importCallback, [$data, []]);
86+
}
87+
return view('module::Vendor.View.quickRun.import.' . $view, array_merge($this->data, [
88+
89+
]));
90+
}
91+
}

‎module/Vendor/View/quickRun/export/excel.blade.php‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
@extends('modstart::admin.dialogFrame')
2+
3+
@section('pageTitle'){{$pageTitle}}@endsection
4+
5+
@section('bodyAppend')
6+
@parent
7+
<script src="@asset('asset/vendor/vue.js')"></script>
8+
<script src="@asset('asset/vendor/element-ui/index.js')"></script>
9+
<script src="@asset('asset/entry/gridExcelWork.js')"></script>
10+
<script>
11+
$(function () {
12+
new Vue({
13+
el: '#app',
14+
data() {
15+
return {
16+
exportName: '{{$exportName}}',
17+
}
18+
},
19+
methods: {
20+
doExport() {
21+
MS.gridExcelWork.doExportProcessExecute((page, cb) => {
22+
MS.api.postSuccess(
23+
window.location.href,
24+
{
25+
page: page,
26+
exportName: this.exportName
27+
},
28+
(res) => {
29+
cb(res.data);
30+
}
31+
);
32+
});
33+
}
34+
}
35+
});
36+
});
37+
</script>
38+
@endsection
39+
40+
@section('body')
41+
<div id="app" v-cloak class="tw-p-2 tw-rounded-lg tw-my-4 tw-max-w-screen-md tw-mx-auto tw-shadow-lg tw-bg-white">
42+
<div class="ub-panel">
43+
<div class="head">
44+
<div class="title">
45+
<i class="iconfont icon-download"></i>
46+
{{$pageTitle}}
47+
</div>
48+
</div>
49+
<div class="body">
50+
<div class="ub-form">
51+
<div class="line">
52+
<div class="label">&nbsp;</div>
53+
<div class="field">
54+
即将导出 <span class="tw-font-bold">{{$total}}</span> 条记录
55+
</div>
56+
</div>
57+
<div class="line">
58+
<div class="label">文件名</div>
59+
<div class="field">
60+
<el-input v-model="exportName" placeholder="输入导出文件名">
61+
<template slot="append">.xlsx</template>
62+
</el-input>
63+
</div>
64+
</div>
65+
<div class="line">
66+
<div class="field">
67+
<a class="btn btn-primary" href="javascript:;" @click="doExport()">
68+
开始导出Excel
69+
</a>
70+
</div>
71+
</div>
72+
</div>
73+
</div>
74+
</div>
75+
</div>
76+
@endsection

0 commit comments

Comments
 (0)