danoniplus 35.2.1 → 35.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/js/danoni_main.js +7 -7
- package/package.json +1 -1
package/js/danoni_main.js
CHANGED
|
@@ -4,12 +4,12 @@
|
|
|
4
4
|
*
|
|
5
5
|
* Source by tickle
|
|
6
6
|
* Created : 2018/10/08
|
|
7
|
-
* Revised : 2024/02/
|
|
7
|
+
* Revised : 2024/02/16
|
|
8
8
|
*
|
|
9
9
|
* https://github.com/cwtickle/danoniplus
|
|
10
10
|
*/
|
|
11
|
-
const g_version = `Ver 35.
|
|
12
|
-
const g_revisedDate = `2024/02/
|
|
11
|
+
const g_version = `Ver 35.3.0`;
|
|
12
|
+
const g_revisedDate = `2024/02/16`;
|
|
13
13
|
|
|
14
14
|
// カスタム用バージョン (danoni_custom.js 等で指定可)
|
|
15
15
|
let g_localVersion = ``;
|
|
@@ -3729,9 +3729,9 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList?.split(`,`)
|
|
|
3729
3729
|
*/
|
|
3730
3730
|
const toSameValStr = _str => {
|
|
3731
3731
|
const nums = _str?.split(`@:`);
|
|
3732
|
-
const groupStr = nums[0].split(`!`).join(`,`);
|
|
3732
|
+
const groupStr = toFloatStr(nums[0]).split(`!`).join(`,`);
|
|
3733
3733
|
return nums.length === 2 && !isNaN(parseInt(nums[1])) ?
|
|
3734
|
-
[...Array(Math.floor(parseInt(nums[1])))].fill(groupStr).join(`,`) :
|
|
3734
|
+
[...Array(Math.floor(parseInt(nums[1])))].fill(groupStr).join(`,`) : groupStr;
|
|
3735
3735
|
};
|
|
3736
3736
|
|
|
3737
3737
|
/**
|
|
@@ -3788,7 +3788,7 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList?.split(`,`)
|
|
|
3788
3788
|
// |keyCtrl9j=Tab,7_0,Enter| -> |keyCtrl9j=Tab,S,D,F,Space,J,K,L,Enter| のように補完
|
|
3789
3789
|
// |pos9j=0..4,6..9| -> |pos9j=0,1,2,3,4,6,7,8,9|
|
|
3790
3790
|
g_keyObj[`${keyheader}_${k + dfPtn}`] =
|
|
3791
|
-
toOriginalArray(tmpArray[k],
|
|
3791
|
+
toOriginalArray(tmpArray[k], toSameValStr).map(n =>
|
|
3792
3792
|
structuredClone(g_keyObj[`${_name}${getKeyPtnName(n)}`]) ?? [_convFunc(n)]
|
|
3793
3793
|
).flat();
|
|
3794
3794
|
if (baseCopyFlg) {
|
|
@@ -3915,7 +3915,7 @@ const keysConvert = (_dosObj, { keyExtraList = _dosObj.keyExtraList?.split(`,`)
|
|
|
3915
3915
|
// 部分的にキーパターン指定があった場合は既存パターンを展開 (例: |scroll9j=Cross::1,7_0,1|)
|
|
3916
3916
|
const tmpParamPair = pairs.split(`::`);
|
|
3917
3917
|
g_keyObj[pairName][tmpParamPair[0]] =
|
|
3918
|
-
makeBaseArray(tmpParamPair[1]?.
|
|
3918
|
+
makeBaseArray(toOriginalArray(tmpParamPair[1], toSameValStr)?.map(n =>
|
|
3919
3919
|
structuredClone(g_keyObj[`${_pairName}${getKeyPtnName(n)}`]?.[tmpParamPair[0]]) ??
|
|
3920
3920
|
[n === `-` ? -1 : parseInt(n, 10)]
|
|
3921
3921
|
).flat(), g_keyObj[`${g_keyObj.defaultProp}${_key}_${k + dfPtn}`].length, _defaultVal);
|