display count of placeholder items in multiple items setting in new t…

…ask page
mayswind · May 8, 2023 · c2ed7bd · c2ed7bd
1 parent 89ec302
commit c2ed7bd
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/src/scripts/directives/setting.js b/src/scripts/directives/setting.js
@@ -17,6 +17,7 @@
             link: function (scope, element, attrs, ngModel) {
                 var pendingSaveRequest = null;
                 var options = {
+                    showPlaceholderCount: false,
                     deleteKeyAlwaysChangeValue: false,
                     lazySaveTimeout: ariaNgConstants.lazySaveTimeout,
                     errorTooltipPlacement: 'top',
@@ -85,7 +86,7 @@
                 };
 
                 var getTotalCount = function (itemsText, separator, trim) {
-                    if (!itemsText || !angular.isString(itemsText)) {
+                    if (!itemsText || !separator || !angular.isString(itemsText)) {
                         return 0;
                     }
 
@@ -180,6 +181,10 @@
                     var fixedValueCount = getTotalCount(scope.fixedValue, scope.option.separator, scope.option.trimCount);
                     var inputValueCount = getTotalCount(scope.optionValue, scope.option.separator, scope.option.trimCount);
 
+                    if (!scope.optionValue && scope.showPlaceholderCount && scope.placeholderItemCount) {
+                        inputValueCount = scope.placeholderItemCount;
+                    }
+
                     return fixedValueCount + inputValueCount;
                 };
 
@@ -313,8 +318,15 @@
                     }
 
                     scope.placeholder = getHumanReadableValue(displayValue);
+
+                    if (scope.option) {
+                        scope.placeholderItemCount = getTotalCount(scope.placeholder, scope.option.separator, scope.option.trimCount);
+                    } else {
+                        scope.placeholderItemCount = 0;
+                    }
                 });
 
+                scope.showPlaceholderCount = options.showPlaceholderCount === true || options.showPlaceholderCount === 'true';
                 loadHistory();
             }
         };

diff --git a/src/views/new.html b/src/views/new.html
@@ -83,7 +83,8 @@
                             </div>
                         </div>
                         <ng-setting ng-repeat="option in context.availableOptions" ng-if="context.optionFilter[option.category]"
-                                    option="option" lazy-save-timeout="0" delete-key-always-change-value="true"
+                                    option="option" show-placeholder-count="true"
+                                    lazy-save-timeout="0" delete-key-always-change-value="true"
                                     default-value="(option.overrideMode !== 'append' && !context.options[option.key] && context.options[option.key] !== '') ? context.globalOptions[option.key] : ''"
                                     fixed-value="option.overrideMode === 'append' ? context.globalOptions[option.key] : ''"
                                     on-change-value="setOption(key, value, optionStatus)"></ng-setting>

diff --git a/src/views/setting.html b/src/views/setting.html
@@ -4,7 +4,7 @@
         <em ng-bind="'(' + option.key + ')'"></em>
         <i class="icon-primary fa fa-question-circle" ng-if="(option.descriptionKey | translate) !== ''"
            data-toggle="popover" data-trigger="hover" data-placement="auto top" data-container="body" data-content="{{option.descriptionKey | translate}}"></i>
-        <span class="description" ng-if="option.showCount && option.separator && (optionValue || fixedValue)"
+        <span class="description" ng-if="option.showCount && option.separator && (optionValue || fixedValue || (placeholder && showPlaceholderCount))"
               ng-bind="'format.settings.total-count' | translate: {count: getTotalCount()}"></span>
         <i class="icon-primary fa fa-info-circle" ng-if="(option.since && option.since !== '')" ng-tooltip="{{('format.requires.aria2-version' | translate: {version: option.since})}}" ng-tooltip-container="body" ng-tooltip-placement="right"></i>
     </div>