Skip to content

Commit ff43dd7

Browse files
committed
feat: dynamic fields and custom fields optimized
1 parent c456419 commit ff43dd7

File tree

100 files changed

+5728
-4702
lines changed

Some content is hidden

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

100 files changed

+5728
-4702
lines changed

module/CaptchaTecmz/Docs/release.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 1.4.0
2+
3+
- 新增:智能验证码日志记录功能
4+
5+
---
6+
17
## 1.3.0 增加验证通过回调功能
28

39
- 新增:增加验证通过回调功能

module/CaptchaTecmz/Provider/TecmzCaptchaProvider.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
namespace Module\CaptchaTecmz\Provider;
55

66

7+
use Illuminate\Support\Facades\Log;
78
use Illuminate\Support\Facades\View;
89
use ModStart\Core\Input\InputPackage;
910
use ModStart\Core\Input\Response;
@@ -38,6 +39,7 @@ public function validate()
3839
return Response::generate(-1, '请进行安全验证');
3940
}
4041
$ret = TecmzUtil::instance('CaptchaTecmz_')->captchaValidate($captchaKey);
42+
Log::info("TecmzCaptcha.Validate - " . json_encode($ret, JSON_UNESCAPED_UNICODE));
4143
if ($ret['code']) {
4244
return Response::generate(ResponseCodes::CAPTCHA_ERROR, '请重新进行安全验证');
4345
}

module/CaptchaTecmz/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"验证码",
1919
"魔众API"
2020
],
21-
"version": "1.3.0",
21+
"version": "1.4.0",
2222
"author": "ModStart",
2323
"description": "提供魔众智能验证码验证服务",
2424
"providers": [

module/Vendor/Asset/entry-chunk-0-bfa6c5e3.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

module/Vendor/Asset/entry-chunk-0-c2682fd6.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

module/Vendor/Asset/entry/all.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

module/Vendor/Asset/entry/quickRunCustomFieldEdit.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

module/Vendor/Tecmz/Tecmz.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ private function request($gate, $param = [])
8585
}
8686
return CurlUtil::postJSONBody($url, $param, [
8787
'timeout' => 60 * 10,
88+
'userAgent' => 'TecmzApi ModStart/' . modstart_version() . ' PHP/' . PHP_VERSION . ' OS/' . PHP_OS,
8889
]);
8990
}
9091

module/Vendor/resources/asset/src/components/all.js

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,41 @@
11
import ImagesSelector from "@ModStartAsset/svue/components/ImagesSelector.vue"
22
import ImageSelector from "@ModStartAsset/svue/components/ImageSelector.vue"
33
import VideoSelector from "@ModStartAsset/svue/components/VideoSelector.vue"
4+
import AudioSelector from "@ModStartAsset/svue/components/AudioSelector.vue"
45
import FileSelector from "@ModStartAsset/svue/components/FileSelector.vue"
56
import FilesSelector from "@ModStartAsset/svue/components/FilesSelector.vue"
67

7-
const AudioSelector = Object.assign({}, FileSelector)
8-
AudioSelector.props = Object.assign({}, FileSelector.props)
9-
AudioSelector.props.doSelectCustom = Object.assign({}, FileSelector.props.doSelectCustom)
10-
AudioSelector.props.selectText = Object.assign({}, FileSelector.props.selectText)
8+
const setProp = (com, key, value) => {
9+
if (com.props && (key in com.props)) {
10+
com.props[key].default = value
11+
} else {
12+
for (const c of com.mixins) {
13+
setProp(c, key, value)
14+
}
15+
}
16+
}
1117

12-
const buildSelectorDialog = (type) => {
18+
const buildFileSelectorDialog = (type) => {
1319
return (cb) => {
1420
if (!('__selectorDialogServer' in window)) {
1521
alert('请先配置 window.__selectorDialogServer')
1622
}
1723
window.__selectorDialog = new window.api.selectorDialog({
1824
server: window.__selectorDialogServer + '/' + type,
1925
callback: (items) => {
20-
if (items.length > 0) cb(items[0].path)
26+
if (items.length > 0) {
27+
cb(items[0].path)
28+
}
2129
}
2230
}).show()
2331
};
2432
}
2533

2634
const buildFilesSelectorDialog = (type) => {
2735
return (cb) => {
36+
if (!('__selectorDialogServer' in window)) {
37+
alert('请先配置 window.__selectorDialogServer')
38+
}
2839
window.__selectorDialog = new window.api.selectorDialog({
2940
server: window.__selectorDialogServer + '/' + type,
3041
callback: (items) => {
@@ -34,13 +45,12 @@ const buildFilesSelectorDialog = (type) => {
3445
};
3546
}
3647

37-
ImageSelector.props.doSelectCustom.default = buildSelectorDialog('image')
38-
FileSelector.props.doSelectCustom.default = buildSelectorDialog('file')
39-
VideoSelector.props.doSelectCustom.default = buildSelectorDialog('video')
40-
AudioSelector.props.doSelectCustom.default = buildSelectorDialog('audio')
41-
AudioSelector.props.selectText.default = '选择音频'
48+
ImageSelector.props.doSelectCustom.default = buildFileSelectorDialog('image')
4249
ImagesSelector.props.doSelectCustom.default = buildFilesSelectorDialog('image')
50+
FileSelector.props.doSelectCustom.default = buildFileSelectorDialog('file')
4351
FilesSelector.props.doSelectCustom.default = buildFilesSelectorDialog('file')
52+
setProp(VideoSelector, 'doSelectCustom', buildFileSelectorDialog('video'))
53+
setProp(AudioSelector, 'doSelectCustom', buildFileSelectorDialog('audio'))
4454

4555
if (window.__selectorDialogServer) {
4656
ImageSelector.props.imageDialogUrl.default = window.__selectorDialogServer
@@ -60,7 +70,6 @@ export default (Vue) => {
6070
Vue.component("smart-verify", () => import('@ModStartAsset/svue/components/SmartVerify'))
6171
}
6272

63-
6473
// VueManager.Vue.component('icon-selector', require('./../components/IconSelector').default)
6574
// VueManager.Vue.component('image-link-editor', require('./../components/ImageLinkEditor').default)
6675
// VueManager.Vue.component('text-link-editor', require('./../components/TextLinkEditor').default)

public/asset/common/uploadButton.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)