diff --git a/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java b/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java
index 45f170a..bc7bd60 100644
--- a/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java
+++ b/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java
@@ -52,6 +52,8 @@ public class CycleCountDetailController extends BaseController {
private CycleCountDetailService cycleCountDetailService;
@Resource
private CycleCountHeaderService cycleCountHeaderService;
+ @Resource
+ private InventoryDetailService inventoryDetailService;
@@ -178,11 +180,15 @@ public class CycleCountDetailController extends BaseController {
for (Integer id : detailsIds)
{
//只允许删除新建状态下的盘点明细。
- CycleCountDetail cyclecountDetailFor = cycleCountDetailService.getById(id);
- if(cyclecountDetailFor.getEnableStatus() > 1){
+ CycleCountDetail cyclecountDetails = cycleCountDetailService.getById(id);
+ if(cyclecountDetails.getEnableStatus() > 5){
return AjaxResult.error("盘点已开始执行，不允许删除该盘点明细！");
}
cycleCountDetailService.removeById(id);
+ //取消库存盘点状态
+ InventoryDetail inventoryDetail = inventoryDetailService.getById(cyclecountDetails.getInventoryDetailId());
+ inventoryDetail.setLockCode("");
+ inventoryDetailService.saveOrUpdate(inventoryDetail);
}
return AjaxResult.success("删除成功！");
}
diff --git a/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java b/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java
index 5903736..87a1b29 100644
--- a/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java
@@ -111,7 +111,7 @@ public class CycleCountDetailServiceImpl extends ServiceImpl<CycleCountDetailMap
ccd.setLastUpdated(new Date());
ccd.setLastUpdatedBy(ShiroUtils.getLoginName());
this.save(ccd);
- //更新库存锁
+ //更新库存盘点锁
inventoryDetail.setLockCode("cyclecount");
inventoryDetailService.saveOrUpdate(inventoryDetail);
}
@@ -280,6 +280,8 @@ public class CycleCountDetailServiceImpl extends ServiceImpl<CycleCountDetailMap
cycleCountDetail.setLastUpdated(new Date());
cycleCountDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
cycleCountDetail.setEnableStatus(5);
+ cycleCountDetail.setTaskHeaderId(task.getId());
+ cycleCountDetail.setTaskDetailId(taskDetail.getId());
this.saveOrUpdate(cycleCountDetail);
//修改主单状态
diff --git a/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java b/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
index 65625bb..1116ed7 100644
--- a/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
@@ -935,7 +935,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
item.setLastUpdated(new Date()); //更新时间
list.add(item);
}
- if (taskDetailService.saveOrUpdateBatch(list) == false || taskHeaderService.saveOrUpdate(taskHeader) == false) {
+ if (taskDetailService.saveOrUpdateBatch(list) == false ||
+ taskHeaderService.saveOrUpdate(taskHeader) == false) {
throw new ServiceException("任务单据状态更新失败！");
}
//释放库位状态
@@ -951,13 +952,49 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
@Transactional
@Override
public AjaxResult completeCycleCountTask(TaskHeader taskHeader){
- /*盘点完成，传入任务主单，查出任务明细，通过任务明细查找盘点的明细单，完成任务同时，修改盘点细单和主单的状态*/
-
-
-
+ /*盘点完成，传入任务主单，查出任务明细，通过任务明细查找盘点的明细单，
+ 完成任务同时，修改盘点细单和主单的状态，完成后库存锁复位*/
+ //修改任务主单状态
+ taskHeader.setStatus(100);
+ taskHeader.setLastUpdatedBy(ShiroUtils.getLoginName()); //更新用户
+ taskHeader.setLastUpdated(new Date()); //更新时间
+ //task更新明细单状态
+ TaskDetail taskDetail = new TaskDetail();
+ taskDetail.setWarehouseCode(taskHeader.getWarehouseCode());
+ taskDetail.setTaskType(taskHeader.getTaskType());
+ taskDetail.setTaskId(taskHeader.getId());
+ LambdaQueryWrapper lambdaQueryWrapper = Wrappers.lambdaQuery(taskDetail);
+ List<TaskDetail> taskDetailList = taskDetailService.list(lambdaQueryWrapper);//查询子单
+ List<TaskDetail> list = new CopyOnWriteArrayList<>();
+ //修改任务明细状态的同时查找到盘点明细的条目并修改状态，最后修改主单状态
+ List<CycleCountDetail> cycleCountDetailList = new CopyOnWriteArrayList<>();
+ for(TaskDetail item:taskDetailList){
+ item.setStatus(100);
+ item.setLastUpdatedBy(ShiroUtils.getLoginName()); //更新用户
+ item.setLastUpdated(new Date()); //更新时间
+ list.add(item);
+ CycleCountDetail cycleCountDetail = cycleCountDetailService.getById(item.getBillDetailId());//盘点明细
+ cycleCountDetail.setEnableStatus(100);
+ cycleCountDetail.setCompletedBy(ShiroUtils.getLoginName());
+ cycleCountDetail.setCompletedAt(new Date());
+ cycleCountDetailList.add(cycleCountDetail);
+ //取消库存盘点锁
+ InventoryDetail inventoryDetail = inventoryDetailService.getById(cycleCountDetail.getInventoryDetailId());
+ inventoryDetail.setLockCode("");
+ inventoryDetailService.saveOrUpdate(inventoryDetail);
+ }
+ if ( taskHeaderService.saveOrUpdate(taskHeader) == false ||
+ taskDetailService.saveOrUpdateBatch(list) == false ||
+ cycleCountDetailService.saveOrUpdateBatch(cycleCountDetailList) == false) {
+ throw new ServiceException("盘点任务单据状态更新失败！");
+ }
+ //更新主单状态
+ cycleCountHeaderService.updataHeaderStatus(cycleCountDetailList.get(0).getCycleCountHeadCode());
+ //释放库位
+ locationService.updateStatus(cycleCountDetailList.get(0).getLocationCode(), "empty");
+ return AjaxResult.success("完成盘点任务");
- return null;
}
/**
diff --git a/src/main/resources/static/ajax/libs/bootstrap-table/bootstrap-table.min.js b/src/main/resources/static/ajax/libs/bootstrap-table/bootstrap-table.min.js
index 909903c..2f5b2d0 100644
--- a/src/main/resources/static/ajax/libs/bootstrap-table/bootstrap-table.min.js
+++ b/src/main/resources/static/ajax/libs/bootstrap-table/bootstrap-table.min.js
@@ -782,6 +782,11 @@
this.checkAll_(!0)
}, p.prototype.uncheckAll = function () {
this.checkAll_(!1)
+ },p.prototype.getRowByIndex = function (index) {
+ if((index * 1+1)>this.options.data.length){
+ throw new Error("Unknown method: 没有当前序号!");
+ }
+ return this.options.data[index * 1];
}, p.prototype.checkInvert = function () {
var b = this, c = b.$selectItem.filter(":enabled"), d = c.filter(":checked");
c.each(function () {
@@ -893,7 +898,7 @@
return b
} : "function" == typeof b && (this.options[c("format%s", a)] = b)), this.initToolbar(), this.initPagination(), this.initBody()
};
- var q = ["getOptions", "getSelections", "getAllSelections", "getData", "load", "append", "prepend", "remove", "removeAll", "insertRow", "updateRow", "updateCell", "updateByUniqueId", "removeByUniqueId", "getRowByUniqueId", "showRow", "hideRow", "getRowsHidden", "mergeCells", "checkAll", "uncheckAll", "checkInvert", "check", "uncheck", "checkBy", "uncheckBy", "refresh", "resetView", "resetWidth", "destroy", "showLoading", "hideLoading", "showColumn", "hideColumn", "getHiddenColumns", "getVisibleColumns", "showAllColumns", "hideAllColumns", "filterBy", "scrollTo", "getScrollPosition", "selectPage", "prevPage", "nextPage", "togglePagination", "toggleView", "refreshOptions", "resetSearch", "expandRow", "collapseRow", "expandAllRows", "collapseAllRows", "updateFormatText"];
+ var q = ["getOptions", "getSelections", "getAllSelections", "getData", "load", "append", "prepend", "remove", "removeAll", "insertRow", "updateRow", "updateCell", "updateByUniqueId", "removeByUniqueId", "getRowByUniqueId", "showRow", "hideRow", "getRowsHidden", "mergeCells", "checkAll", "uncheckAll", "checkInvert", "check", "uncheck", "checkBy", "uncheckBy", "refresh", "resetView", "resetWidth", "destroy", "showLoading", "hideLoading", "showColumn", "hideColumn", "getHiddenColumns", "getVisibleColumns", "showAllColumns", "hideAllColumns", "filterBy", "scrollTo", "getScrollPosition", "selectPage", "prevPage", "nextPage", "togglePagination", "toggleView", "refreshOptions", "resetSearch", "expandRow", "collapseRow", "expandAllRows", "collapseAllRows", "updateFormatText","getRowByIndex"];
a.fn.bootstrapTable = function (b) {
var c, d = Array.prototype.slice.call(arguments, 1);
return this.each(function () {
diff --git a/src/main/resources/static/ajax/libs/bootstrap-table/extensions/editable/bootstrap-table-editable.js b/src/main/resources/static/ajax/libs/bootstrap-table/extensions/editable/bootstrap-table-editable.js
index 3ac9d69..3262ff8 100644
--- a/src/main/resources/static/ajax/libs/bootstrap-table/extensions/editable/bootstrap-table-editable.js
+++ b/src/main/resources/static/ajax/libs/bootstrap-table/extensions/editable/bootstrap-table-editable.js
@@ -1,1451 +1,146 @@
-(function (global, factory) {
- typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('jquery')) :
- typeof define === 'function' && define.amd ? define(['jquery'], factory) :
- (global = global || self, factory(global.jQuery));
-}(this, function ($) { 'use strict';
-
- $ = $ && $.hasOwnProperty('default') ? $['default'] : $;
-
- var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
-
- function createCommonjsModule(fn, module) {
- return module = { exports: {} }, fn(module, module.exports), module.exports;
- }
-
- var O = 'object';
- var check = function (it) {
- return it && it.Math == Math && it;
- };
-
- // https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
- var global_1 =
- // eslint-disable-next-line no-undef
- check(typeof globalThis == O && globalThis) ||
- check(typeof window == O && window) ||
- check(typeof self == O && self) ||
- check(typeof commonjsGlobal == O && commonjsGlobal) ||
- // eslint-disable-next-line no-new-func
- Function('return this')();
-
- var fails = function (exec) {
- try {
- return !!exec();
- } catch (error) {
- return true;
- }
- };
-
- // Thank's IE8 for his funny defineProperty
- var descriptors = !fails(function () {
- return Object.defineProperty({}, 'a', { get: function () { return 7; } }).a != 7;
- });
-
- var nativePropertyIsEnumerable = {}.propertyIsEnumerable;
- var getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
-
- // Nashorn ~ JDK8 bug
- var NASHORN_BUG = getOwnPropertyDescriptor && !nativePropertyIsEnumerable.call({ 1: 2 }, 1);
-
- // `Object.prototype.propertyIsEnumerable` method implementation
- // https://tc39.github.io/ecma262/#sec-object.prototype.propertyisenumerable
- var f = NASHORN_BUG ? function propertyIsEnumerable(V) {
- var descriptor = getOwnPropertyDescriptor(this, V);
- return !!descriptor && descriptor.enumerable;
- } : nativePropertyIsEnumerable;
-
- var objectPropertyIsEnumerable = {
- f: f
- };
-
- var createPropertyDescriptor = function (bitmap, value) {
- return {
- enumerable: !(bitmap & 1),
- configurable: !(bitmap & 2),
- writable: !(bitmap & 4),
- value: value
- };
- };
-
- var toString = {}.toString;
-
- var classofRaw = function (it) {
- return toString.call(it).slice(8, -1);
- };
-
- var split = ''.split;
-
- // fallback for non-array-like ES3 and non-enumerable old V8 strings
- var indexedObject = fails(function () {
- // throws an error in rhino, see https://github.com/mozilla/rhino/issues/346
- // eslint-disable-next-line no-prototype-builtins
- return !Object('z').propertyIsEnumerable(0);
- }) ? function (it) {
- return classofRaw(it) == 'String' ? split.call(it, '') : Object(it);
- } : Object;
-
- // `RequireObjectCoercible` abstract operation
- // https://tc39.github.io/ecma262/#sec-requireobjectcoercible
- var requireObjectCoercible = function (it) {
- if (it == undefined) throw TypeError("Can't call method on " + it);
- return it;
- };
-
- // toObject with fallback for non-array-like ES3 strings
-
-
-
- var toIndexedObject = function (it) {
- return indexedObject(requireObjectCoercible(it));
- };
-
- var isObject = function (it) {
- return typeof it === 'object' ? it !== null : typeof it === 'function';
- };
-
- // `ToPrimitive` abstract operation
- // https://tc39.github.io/ecma262/#sec-toprimitive
- // instead of the ES6 spec version, we didn't implement @@toPrimitive case
- // and the second argument - flag - preferred type is a string
- var toPrimitive = function (input, PREFERRED_STRING) {
- if (!isObject(input)) return input;
- var fn, val;
- if (PREFERRED_STRING && typeof (fn = input.toString) == 'function' && !isObject(val = fn.call(input))) return val;
- if (typeof (fn = input.valueOf) == 'function' && !isObject(val = fn.call(input))) return val;
- if (!PREFERRED_STRING && typeof (fn = input.toString) == 'function' && !isObject(val = fn.call(input))) return val;
- throw TypeError("Can't convert object to primitive value");
- };
-
- var hasOwnProperty = {}.hasOwnProperty;
-
- var has = function (it, key) {
- return hasOwnProperty.call(it, key);
- };
-
- var document = global_1.document;
- // typeof document.createElement is 'object' in old IE
- var EXISTS = isObject(document) && isObject(document.createElement);
-
- var documentCreateElement = function (it) {
- return EXISTS ? document.createElement(it) : {};
- };
-
- // Thank's IE8 for his funny defineProperty
- var ie8DomDefine = !descriptors && !fails(function () {
- return Object.defineProperty(documentCreateElement('div'), 'a', {
- get: function () { return 7; }
- }).a != 7;
- });
-
- var nativeGetOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
-
- // `Object.getOwnPropertyDescriptor` method
- // https://tc39.github.io/ecma262/#sec-object.getownpropertydescriptor
- var f$1 = descriptors ? nativeGetOwnPropertyDescriptor : function getOwnPropertyDescriptor(O, P) {
- O = toIndexedObject(O);
- P = toPrimitive(P, true);
- if (ie8DomDefine) try {
- return nativeGetOwnPropertyDescriptor(O, P);
- } catch (error) { /* empty */ }
- if (has(O, P)) return createPropertyDescriptor(!objectPropertyIsEnumerable.f.call(O, P), O[P]);
- };
-
- var objectGetOwnPropertyDescriptor = {
- f: f$1
- };
-
- var anObject = function (it) {
- if (!isObject(it)) {
- throw TypeError(String(it) + ' is not an object');
- } return it;
- };
-
- var nativeDefineProperty = Object.defineProperty;
-
- // `Object.defineProperty` method
- // https://tc39.github.io/ecma262/#sec-object.defineproperty
- var f$2 = descriptors ? nativeDefineProperty : function defineProperty(O, P, Attributes) {
- anObject(O);
- P = toPrimitive(P, true);
- anObject(Attributes);
- if (ie8DomDefine) try {
- return nativeDefineProperty(O, P, Attributes);
- } catch (error) { /* empty */ }
- if ('get' in Attributes || 'set' in Attributes) throw TypeError('Accessors not supported');
- if ('value' in Attributes) O[P] = Attributes.value;
- return O;
- };
-
- var objectDefineProperty = {
- f: f$2
- };
-
- var hide = descriptors ? function (object, key, value) {
- return objectDefineProperty.f(object, key, createPropertyDescriptor(1, value));
- } : function (object, key, value) {
- object[key] = value;
- return object;
- };
-
- var setGlobal = function (key, value) {
- try {
- hide(global_1, key, value);
- } catch (error) {
- global_1[key] = value;
- } return value;
- };
-
- var shared = createCommonjsModule(function (module) {
- var SHARED = '__core-js_shared__';
- var store = global_1[SHARED] || setGlobal(SHARED, {});
-
- (module.exports = function (key, value) {
- return store[key] || (store[key] = value !== undefined ? value : {});
- })('versions', []).push({
- version: '3.1.3',
- mode: 'global',
- copyright: '© 2019 Denis Pushkarev (zloirock.ru)'
- });
- });
-
- var functionToString = shared('native-function-to-string', Function.toString);
-
- var WeakMap = global_1.WeakMap;
-
- var nativeWeakMap = typeof WeakMap === 'function' && /native code/.test(functionToString.call(WeakMap));
-
- var id = 0;
- var postfix = Math.random();
-
- var uid = function (key) {
- return 'Symbol(' + String(key === undefined ? '' : key) + ')_' + (++id + postfix).toString(36);
- };
-
- var keys = shared('keys');
-
- var sharedKey = function (key) {
- return keys[key] || (keys[key] = uid(key));
- };
-
- var hiddenKeys = {};
-
- var WeakMap$1 = global_1.WeakMap;
- var set, get, has$1;
-
- var enforce = function (it) {
- return has$1(it) ? get(it) : set(it, {});
- };
-
- var getterFor = function (TYPE) {
- return function (it) {
- var state;
- if (!isObject(it) || (state = get(it)).type !== TYPE) {
- throw TypeError('Incompatible receiver, ' + TYPE + ' required');
- } return state;
- };
- };
-
- if (nativeWeakMap) {
- var store = new WeakMap$1();
- var wmget = store.get;
- var wmhas = store.has;
- var wmset = store.set;
- set = function (it, metadata) {
- wmset.call(store, it, metadata);
- return metadata;
- };
- get = function (it) {
- return wmget.call(store, it) || {};
- };
- has$1 = function (it) {
- return wmhas.call(store, it);
- };
- } else {
- var STATE = sharedKey('state');
- hiddenKeys[STATE] = true;
- set = function (it, metadata) {
- hide(it, STATE, metadata);
- return metadata;
- };
- get = function (it) {
- return has(it, STATE) ? it[STATE] : {};
- };
- has$1 = function (it) {
- return has(it, STATE);
- };
- }
-
- var internalState = {
- set: set,
- get: get,
- has: has$1,
- enforce: enforce,
- getterFor: getterFor
- };
-
- var redefine = createCommonjsModule(function (module) {
- var getInternalState = internalState.get;
- var enforceInternalState = internalState.enforce;
- var TEMPLATE = String(functionToString).split('toString');
-
- shared('inspectSource', function (it) {
- return functionToString.call(it);
- });
-
- (module.exports = function (O, key, value, options) {
- var unsafe = options ? !!options.unsafe : false;
- var simple = options ? !!options.enumerable : false;
- var noTargetGet = options ? !!options.noTargetGet : false;
- if (typeof value == 'function') {
- if (typeof key == 'string' && !has(value, 'name')) hide(value, 'name', key);
- enforceInternalState(value).source = TEMPLATE.join(typeof key == 'string' ? key : '');
- }
- if (O === global_1) {
- if (simple) O[key] = value;
- else setGlobal(key, value);
- return;
- } else if (!unsafe) {
- delete O[key];
- } else if (!noTargetGet && O[key]) {
- simple = true;
- }
- if (simple) O[key] = value;
- else hide(O, key, value);
- // add fake Function#toString for correct work wrapped methods / constructors with methods like LoDash isNative
- })(Function.prototype, 'toString', function toString() {
- return typeof this == 'function' && getInternalState(this).source || functionToString.call(this);
- });
- });
-
- var path = global_1;
-
- var aFunction = function (variable) {
- return typeof variable == 'function' ? variable : undefined;
- };
-
- var getBuiltIn = function (namespace, method) {
- return arguments.length < 2 ? aFunction(path[namespace]) || aFunction(global_1[namespace])
- : path[namespace] && path[namespace][method] || global_1[namespace] && global_1[namespace][method];
- };
-
- var ceil = Math.ceil;
- var floor = Math.floor;
-
- // `ToInteger` abstract operation
- // https://tc39.github.io/ecma262/#sec-tointeger
- var toInteger = function (argument) {
- return isNaN(argument = +argument) ? 0 : (argument > 0 ? floor : ceil)(argument);
- };
-
- var min = Math.min;
-
- // `ToLength` abstract operation
- // https://tc39.github.io/ecma262/#sec-tolength
- var toLength = function (argument) {
- return argument > 0 ? min(toInteger(argument), 0x1FFFFFFFFFFFFF) : 0; // 2 ** 53 - 1 == 9007199254740991
- };
-
- var max = Math.max;
- var min$1 = Math.min;
-
- // Helper for a popular repeating case of the spec:
- // Let integer be ? ToInteger(index).
- // If integer < 0, let result be max((length + integer), 0); else let result be min(length, length).
- var toAbsoluteIndex = function (index, length) {
- var integer = toInteger(index);
- return integer < 0 ? max(integer + length, 0) : min$1(integer, length);
- };
-
- // `Array.prototype.{ indexOf, includes }` methods implementation
- var createMethod = function (IS_INCLUDES) {
- return function ($this, el, fromIndex) {
- var O = toIndexedObject($this);
- var length = toLength(O.length);
- var index = toAbsoluteIndex(fromIndex, length);
- var value;
- // Array#includes uses SameValueZero equality algorithm
- // eslint-disable-next-line no-self-compare
- if (IS_INCLUDES && el != el) while (length > index) {
- value = O[index++];
- // eslint-disable-next-line no-self-compare
- if (value != value) return true;
- // Array#indexOf ignores holes, Array#includes - not
- } else for (;length > index; index++) {
- if ((IS_INCLUDES || index in O) && O[index] === el) return IS_INCLUDES || index || 0;
- } return !IS_INCLUDES && -1;
- };
- };
-
- var arrayIncludes = {
- // `Array.prototype.includes` method
- // https://tc39.github.io/ecma262/#sec-array.prototype.includes
- includes: createMethod(true),
- // `Array.prototype.indexOf` method
- // https://tc39.github.io/ecma262/#sec-array.prototype.indexof
- indexOf: createMethod(false)
- };
-
- var indexOf = arrayIncludes.indexOf;
-
-
- var objectKeysInternal = function (object, names) {
- var O = toIndexedObject(object);
- var i = 0;
- var result = [];
- var key;
- for (key in O) !has(hiddenKeys, key) && has(O, key) && result.push(key);
- // Don't enum bug & hidden keys
- while (names.length > i) if (has(O, key = names[i++])) {
- ~indexOf(result, key) || result.push(key);
- }
- return result;
- };
-
- // IE8- don't enum bug keys
- var enumBugKeys = [
- 'constructor',
- 'hasOwnProperty',
- 'isPrototypeOf',
- 'propertyIsEnumerable',
- 'toLocaleString',
- 'toString',
- 'valueOf'
- ];
-
- var hiddenKeys$1 = enumBugKeys.concat('length', 'prototype');
-
- // `Object.getOwnPropertyNames` method
- // https://tc39.github.io/ecma262/#sec-object.getownpropertynames
- var f$3 = Object.getOwnPropertyNames || function getOwnPropertyNames(O) {
- return objectKeysInternal(O, hiddenKeys$1);
- };
-
- var objectGetOwnPropertyNames = {
- f: f$3
- };
-
- var f$4 = Object.getOwnPropertySymbols;
-
- var objectGetOwnPropertySymbols = {
- f: f$4
- };
-
- // all object keys, includes non-enumerable and symbols
- var ownKeys = getBuiltIn('Reflect', 'ownKeys') || function ownKeys(it) {
- var keys = objectGetOwnPropertyNames.f(anObject(it));
- var getOwnPropertySymbols = objectGetOwnPropertySymbols.f;
- return getOwnPropertySymbols ? keys.concat(getOwnPropertySymbols(it)) : keys;
- };
-
- var copyConstructorProperties = function (target, source) {
- var keys = ownKeys(source);
- var defineProperty = objectDefineProperty.f;
- var getOwnPropertyDescriptor = objectGetOwnPropertyDescriptor.f;
- for (var i = 0; i < keys.length; i++) {
- var key = keys[i];
- if (!has(target, key)) defineProperty(target, key, getOwnPropertyDescriptor(source, key));
- }
- };
-
- var replacement = /#|\.prototype\./;
-
- var isForced = function (feature, detection) {
- var value = data[normalize(feature)];
- return value == POLYFILL ? true
- : value == NATIVE ? false
- : typeof detection == 'function' ? fails(detection)
- : !!detection;
- };
-
- var normalize = isForced.normalize = function (string) {
- return String(string).replace(replacement, '.').toLowerCase();
- };
-
- var data = isForced.data = {};
- var NATIVE = isForced.NATIVE = 'N';
- var POLYFILL = isForced.POLYFILL = 'P';
-
- var isForced_1 = isForced;
-
- var getOwnPropertyDescriptor$1 = objectGetOwnPropertyDescriptor.f;
-
-
-
-
-
-
- /*
- options.target - name of the target object
- options.global - target is the global object
- options.stat - export as static methods of target
- options.proto - export as prototype methods of target
- options.real - real prototype method for the `pure` version
- options.forced - export even if the native feature is available
- options.bind - bind methods to the target, required for the `pure` version
- options.wrap - wrap constructors to preventing global pollution, required for the `pure` version
- options.unsafe - use the simple assignment of property instead of delete + defineProperty
- options.sham - add a flag to not completely full polyfills
- options.enumerable - export as enumerable property
- options.noTargetGet - prevent calling a getter on target
- */
- var _export = function (options, source) {
- var TARGET = options.target;
- var GLOBAL = options.global;
- var STATIC = options.stat;
- var FORCED, target, key, targetProperty, sourceProperty, descriptor;
- if (GLOBAL) {
- target = global_1;
- } else if (STATIC) {
- target = global_1[TARGET] || setGlobal(TARGET, {});
- } else {
- target = (global_1[TARGET] || {}).prototype;
- }
- if (target) for (key in source) {
- sourceProperty = source[key];
- if (options.noTargetGet) {
- descriptor = getOwnPropertyDescriptor$1(target, key);
- targetProperty = descriptor && descriptor.value;
- } else targetProperty = target[key];
- FORCED = isForced_1(GLOBAL ? key : TARGET + (STATIC ? '.' : '#') + key, options.forced);
- // contained in target
- if (!FORCED && targetProperty !== undefined) {
- if (typeof sourceProperty === typeof targetProperty) continue;
- copyConstructorProperties(sourceProperty, targetProperty);
- }
- // add a flag to not completely full polyfills
- if (options.sham || (targetProperty && targetProperty.sham)) {
- hide(sourceProperty, 'sham', true);
- }
- // extend global
- redefine(target, key, sourceProperty, options);
- }
- };
-
- // `IsArray` abstract operation
- // https://tc39.github.io/ecma262/#sec-isarray
- var isArray = Array.isArray || function isArray(arg) {
- return classofRaw(arg) == 'Array';
- };
-
- // `ToObject` abstract operation
- // https://tc39.github.io/ecma262/#sec-toobject
- var toObject = function (argument) {
- return Object(requireObjectCoercible(argument));
- };
-
- var createProperty = function (object, key, value) {
- var propertyKey = toPrimitive(key);
- if (propertyKey in object) objectDefineProperty.f(object, propertyKey, createPropertyDescriptor(0, value));
- else object[propertyKey] = value;
- };
-
- var nativeSymbol = !!Object.getOwnPropertySymbols && !fails(function () {
- // Chrome 38 Symbol has incorrect toString conversion
- // eslint-disable-next-line no-undef
- return !String(Symbol());
- });
-
- var Symbol$1 = global_1.Symbol;
- var store$1 = shared('wks');
-
- var wellKnownSymbol = function (name) {
- return store$1[name] || (store$1[name] = nativeSymbol && Symbol$1[name]
- || (nativeSymbol ? Symbol$1 : uid)('Symbol.' + name));
- };
-
- var SPECIES = wellKnownSymbol('species');
-
- // `ArraySpeciesCreate` abstract operation
- // https://tc39.github.io/ecma262/#sec-arrayspeciescreate
- var arraySpeciesCreate = function (originalArray, length) {
- var C;
- if (isArray(originalArray)) {
- C = originalArray.constructor;
- // cross-realm fallback
- if (typeof C == 'function' && (C === Array || isArray(C.prototype))) C = undefined;
- else if (isObject(C)) {
- C = C[SPECIES];
- if (C === null) C = undefined;
- }
- } return new (C === undefined ? Array : C)(length === 0 ? 0 : length);
- };
-
- var SPECIES$1 = wellKnownSymbol('species');
-
- var arrayMethodHasSpeciesSupport = function (METHOD_NAME) {
- return !fails(function () {
- var array = [];
- var constructor = array.constructor = {};
- constructor[SPECIES$1] = function () {
- return { foo: 1 };
- };
- return array[METHOD_NAME](Boolean).foo !== 1;
- });
- };
-
- var IS_CONCAT_SPREADABLE = wellKnownSymbol('isConcatSpreadable');
- var MAX_SAFE_INTEGER = 0x1FFFFFFFFFFFFF;
- var MAXIMUM_ALLOWED_INDEX_EXCEEDED = 'Maximum allowed index exceeded';
-
- var IS_CONCAT_SPREADABLE_SUPPORT = !fails(function () {
- var array = [];
- array[IS_CONCAT_SPREADABLE] = false;
- return array.concat()[0] !== array;
- });
-
- var SPECIES_SUPPORT = arrayMethodHasSpeciesSupport('concat');
-
- var isConcatSpreadable = function (O) {
- if (!isObject(O)) return false;
- var spreadable = O[IS_CONCAT_SPREADABLE];
- return spreadable !== undefined ? !!spreadable : isArray(O);
- };
-
- var FORCED = !IS_CONCAT_SPREADABLE_SUPPORT || !SPECIES_SUPPORT;
-
- // `Array.prototype.concat` method
- // https://tc39.github.io/ecma262/#sec-array.prototype.concat
- // with adding support of @@isConcatSpreadable and @@species
- _export({ target: 'Array', proto: true, forced: FORCED }, {
- concat: function concat(arg) { // eslint-disable-line no-unused-vars
- var O = toObject(this);
- var A = arraySpeciesCreate(O, 0);
- var n = 0;
- var i, k, length, len, E;
- for (i = -1, length = arguments.length; i < length; i++) {
- E = i === -1 ? O : arguments[i];
- if (isConcatSpreadable(E)) {
- len = toLength(E.length);
- if (n + len > MAX_SAFE_INTEGER) throw TypeError(MAXIMUM_ALLOWED_INDEX_EXCEEDED);
- for (k = 0; k < len; k++, n++) if (k in E) createProperty(A, n, E[k]);
- } else {
- if (n >= MAX_SAFE_INTEGER) throw TypeError(MAXIMUM_ALLOWED_INDEX_EXCEEDED);
- createProperty(A, n++, E);
- }
- }
- A.length = n;
- return A;
- }
- });
-
- var aFunction$1 = function (it) {
- if (typeof it != 'function') {
- throw TypeError(String(it) + ' is not a function');
- } return it;
- };
-
- // optional / simple context binding
- var bindContext = function (fn, that, length) {
- aFunction$1(fn);
- if (that === undefined) return fn;
- switch (length) {
- case 0: return function () {
- return fn.call(that);
- };
- case 1: return function (a) {
- return fn.call(that, a);
- };
- case 2: return function (a, b) {
- return fn.call(that, a, b);
- };
- case 3: return function (a, b, c) {
- return fn.call(that, a, b, c);
- };
- }
- return function (/* ...args */) {
- return fn.apply(that, arguments);
- };
- };
-
- var push = [].push;
-
- // `Array.prototype.{ forEach, map, filter, some, every, find, findIndex }` methods implementation
- var createMethod$1 = function (TYPE) {
- var IS_MAP = TYPE == 1;
- var IS_FILTER = TYPE == 2;
- var IS_SOME = TYPE == 3;
- var IS_EVERY = TYPE == 4;
- var IS_FIND_INDEX = TYPE == 6;
- var NO_HOLES = TYPE == 5 || IS_FIND_INDEX;
- return function ($this, callbackfn, that, specificCreate) {
- var O = toObject($this);
- var self = indexedObject(O);
- var boundFunction = bindContext(callbackfn, that, 3);
- var length = toLength(self.length);
- var index = 0;
- var create = specificCreate || arraySpeciesCreate;
- var target = IS_MAP ? create($this, length) : IS_FILTER ? create($this, 0) : undefined;
- var value, result;
- for (;length > index; index++) if (NO_HOLES || index in self) {
- value = self[index];
- result = boundFunction(value, index, O);
- if (TYPE) {
- if (IS_MAP) target[index] = result; // map
- else if (result) switch (TYPE) {
- case 3: return true; // some
- case 5: return value; // find
- case 6: return index; // findIndex
- case 2: push.call(target, value); // filter
- } else if (IS_EVERY) return false; // every
- }
- }
- return IS_FIND_INDEX ? -1 : IS_SOME || IS_EVERY ? IS_EVERY : target;
- };
- };
-
- var arrayIteration = {
- // `Array.prototype.forEach` method
- // https://tc39.github.io/ecma262/#sec-array.prototype.foreach
- forEach: createMethod$1(0),
- // `Array.prototype.map` method
- // https://tc39.github.io/ecma262/#sec-array.prototype.map
- map: createMethod$1(1),
- // `Array.prototype.filter` method
- // https://tc39.github.io/ecma262/#sec-array.prototype.filter
- filter: createMethod$1(2),
- // `Array.prototype.some` method
- // https://tc39.github.io/ecma262/#sec-array.prototype.some
- some: createMethod$1(3),
- // `Array.prototype.every` method
- // https://tc39.github.io/ecma262/#sec-array.prototype.every
- every: createMethod$1(4),
- // `Array.prototype.find` method
- // https://tc39.github.io/ecma262/#sec-array.prototype.find
- find: createMethod$1(5),
- // `Array.prototype.findIndex` method
- // https://tc39.github.io/ecma262/#sec-array.prototype.findIndex
- findIndex: createMethod$1(6)
- };
-
- // `Object.keys` method
- // https://tc39.github.io/ecma262/#sec-object.keys
- var objectKeys = Object.keys || function keys(O) {
- return objectKeysInternal(O, enumBugKeys);
- };
-
- // `Object.defineProperties` method
- // https://tc39.github.io/ecma262/#sec-object.defineproperties
- var objectDefineProperties = descriptors ? Object.defineProperties : function defineProperties(O, Properties) {
- anObject(O);
- var keys = objectKeys(Properties);
- var length = keys.length;
- var index = 0;
- var key;
- while (length > index) objectDefineProperty.f(O, key = keys[index++], Properties[key]);
- return O;
- };
-
- var html = getBuiltIn('document', 'documentElement');
-
- var IE_PROTO = sharedKey('IE_PROTO');
-
- var PROTOTYPE = 'prototype';
- var Empty = function () { /* empty */ };
-
- // Create object with fake `null` prototype: use iframe Object with cleared prototype
- var createDict = function () {
- // Thrash, waste and sodomy: IE GC bug
- var iframe = documentCreateElement('iframe');
- var length = enumBugKeys.length;
- var lt = '<';
- var script = 'script';
- var gt = '>';
- var js = 'java' + script + ':';
- var iframeDocument;
- iframe.style.display = 'none';
- html.appendChild(iframe);
- iframe.src = String(js);
- iframeDocument = iframe.contentWindow.document;
- iframeDocument.open();
- iframeDocument.write(lt + script + gt + 'document.F=Object' + lt + '/' + script + gt);
- iframeDocument.close();
- createDict = iframeDocument.F;
- while (length--) delete createDict[PROTOTYPE][enumBugKeys[length]];
- return createDict();
- };
-
- // `Object.create` method
- // https://tc39.github.io/ecma262/#sec-object.create
- var objectCreate = Object.create || function create(O, Properties) {
- var result;
- if (O !== null) {
- Empty[PROTOTYPE] = anObject(O);
- result = new Empty();
- Empty[PROTOTYPE] = null;
- // add "__proto__" for Object.getPrototypeOf polyfill
- result[IE_PROTO] = O;
- } else result = createDict();
- return Properties === undefined ? result : objectDefineProperties(result, Properties);
- };
-
- hiddenKeys[IE_PROTO] = true;
-
- var UNSCOPABLES = wellKnownSymbol('unscopables');
- var ArrayPrototype = Array.prototype;
-
- // Array.prototype[@@unscopables]
- // https://tc39.github.io/ecma262/#sec-array.prototype-@@unscopables
- if (ArrayPrototype[UNSCOPABLES] == undefined) {
- hide(ArrayPrototype, UNSCOPABLES, objectCreate(null));
- }
-
- // add a key to Array.prototype[@@unscopables]
- var addToUnscopables = function (key) {
- ArrayPrototype[UNSCOPABLES][key] = true;
- };
-
- var $find = arrayIteration.find;
-
-
- var FIND = 'find';
- var SKIPS_HOLES = true;
-
- // Shouldn't skip holes
- if (FIND in []) Array(1)[FIND](function () { SKIPS_HOLES = false; });
-
- // `Array.prototype.find` method
- // https://tc39.github.io/ecma262/#sec-array.prototype.find
- _export({ target: 'Array', proto: true, forced: SKIPS_HOLES }, {
- find: function find(callbackfn /* , that = undefined */) {
- return $find(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
- }
- });
-
- // https://tc39.github.io/ecma262/#sec-array.prototype-@@unscopables
- addToUnscopables(FIND);
-
- var sloppyArrayMethod = function (METHOD_NAME, argument) {
- var method = [][METHOD_NAME];
- return !method || !fails(function () {
- // eslint-disable-next-line no-useless-call,no-throw-literal
- method.call(null, argument || function () { throw 1; }, 1);
- });
- };
-
- var $indexOf = arrayIncludes.indexOf;
-
-
- var nativeIndexOf = [].indexOf;
-
- var NEGATIVE_ZERO = !!nativeIndexOf && 1 / [1].indexOf(1, -0) < 0;
- var SLOPPY_METHOD = sloppyArrayMethod('indexOf');
-
- // `Array.prototype.indexOf` method
- // https://tc39.github.io/ecma262/#sec-array.prototype.indexof
- _export({ target: 'Array', proto: true, forced: NEGATIVE_ZERO || SLOPPY_METHOD }, {
- indexOf: function indexOf(searchElement /* , fromIndex = 0 */) {
- return NEGATIVE_ZERO
- // convert -0 to +0
- ? nativeIndexOf.apply(this, arguments) || 0
- : $indexOf(this, searchElement, arguments.length > 1 ? arguments[1] : undefined);
- }
- });
-
- var nativeJoin = [].join;
-
- var ES3_STRINGS = indexedObject != Object;
- var SLOPPY_METHOD$1 = sloppyArrayMethod('join', ',');
-
- // `Array.prototype.join` method
- // https://tc39.github.io/ecma262/#sec-array.prototype.join
- _export({ target: 'Array', proto: true, forced: ES3_STRINGS || SLOPPY_METHOD$1 }, {
- join: function join(separator) {
- return nativeJoin.call(toIndexedObject(this), separator === undefined ? ',' : separator);
- }
- });
-
- // `RegExp.prototype.flags` getter implementation
- // https://tc39.github.io/ecma262/#sec-get-regexp.prototype.flags
- var regexpFlags = function () {
- var that = anObject(this);
- var result = '';
- if (that.global) result += 'g';
- if (that.ignoreCase) result += 'i';
- if (that.multiline) result += 'm';
- if (that.dotAll) result += 's';
- if (that.unicode) result += 'u';
- if (that.sticky) result += 'y';
- return result;
- };
-
- var nativeExec = RegExp.prototype.exec;
- // This always refers to the native implementation, because the
- // String#replace polyfill uses ./fix-regexp-well-known-symbol-logic.js,
- // which loads this file before patching the method.
- var nativeReplace = String.prototype.replace;
-
- var patchedExec = nativeExec;
-
- var UPDATES_LAST_INDEX_WRONG = (function () {
- var re1 = /a/;
- var re2 = /b*/g;
- nativeExec.call(re1, 'a');
- nativeExec.call(re2, 'a');
- return re1.lastIndex !== 0 || re2.lastIndex !== 0;
- })();
-
- // nonparticipating capturing group, copied from es5-shim's String#split patch.
- var NPCG_INCLUDED = /()??/.exec('')[1] !== undefined;
-
- var PATCH = UPDATES_LAST_INDEX_WRONG || NPCG_INCLUDED;
-
- if (PATCH) {
- patchedExec = function exec(str) {
- var re = this;
- var lastIndex, reCopy, match, i;
-
- if (NPCG_INCLUDED) {
- reCopy = new RegExp('^' + re.source + '$(?!\\s)', regexpFlags.call(re));
- }
- if (UPDATES_LAST_INDEX_WRONG) lastIndex = re.lastIndex;
-
- match = nativeExec.call(re, str);
-
- if (UPDATES_LAST_INDEX_WRONG && match) {
- re.lastIndex = re.global ? match.index + match[0].length : lastIndex;
- }
- if (NPCG_INCLUDED && match && match.length > 1) {
- // Fix browsers whose `exec` methods don't consistently return `undefined`
- // for NPCG, like IE8. NOTE: This doesn' work for /(.?)?/
- nativeReplace.call(match[0], reCopy, function () {
- for (i = 1; i < arguments.length - 2; i++) {
- if (arguments[i] === undefined) match[i] = undefined;
- }
- });
- }
-
- return match;
- };
- }
-
- var regexpExec = patchedExec;
-
- var SPECIES$2 = wellKnownSymbol('species');
-
- var REPLACE_SUPPORTS_NAMED_GROUPS = !fails(function () {
- // #replace needs built-in support for named groups.
- // #match works fine because it just return the exec results, even if it has
- // a "grops" property.
- var re = /./;
- re.exec = function () {
- var result = [];
- result.groups = { a: '7' };
- return result;
- };
- return ''.replace(re, '$<a>') !== '7';
- });
-
- // Chrome 51 has a buggy "split" implementation when RegExp#exec !== nativeExec
- // Weex JS has frozen built-in prototypes, so use try / catch wrapper
- var SPLIT_WORKS_WITH_OVERWRITTEN_EXEC = !fails(function () {
- var re = /(?:)/;
- var originalExec = re.exec;
- re.exec = function () { return originalExec.apply(this, arguments); };
- var result = 'ab'.split(re);
- return result.length !== 2 || result[0] !== 'a' || result[1] !== 'b';
- });
-
- var fixRegexpWellKnownSymbolLogic = function (KEY, length, exec, sham) {
- var SYMBOL = wellKnownSymbol(KEY);
-
- var DELEGATES_TO_SYMBOL = !fails(function () {
- // String methods call symbol-named RegEp methods
- var O = {};
- O[SYMBOL] = function () { return 7; };
- return ''[KEY](O) != 7;
- });
-
- var DELEGATES_TO_EXEC = DELEGATES_TO_SYMBOL && !fails(function () {
- // Symbol-named RegExp methods call .exec
- var execCalled = false;
- var re = /a/;
- re.exec = function () { execCalled = true; return null; };
-
- if (KEY === 'split') {
- // RegExp[@@split] doesn't call the regex's exec method, but first creates
- // a new one. We need to return the patched regex when creating the new one.
- re.constructor = {};
- re.constructor[SPECIES$2] = function () { return re; };
- }
-
- re[SYMBOL]('');
- return !execCalled;
- });
-
- if (
- !DELEGATES_TO_SYMBOL ||
- !DELEGATES_TO_EXEC ||
- (KEY === 'replace' && !REPLACE_SUPPORTS_NAMED_GROUPS) ||
- (KEY === 'split' && !SPLIT_WORKS_WITH_OVERWRITTEN_EXEC)
- ) {
- var nativeRegExpMethod = /./[SYMBOL];
- var methods = exec(SYMBOL, ''[KEY], function (nativeMethod, regexp, str, arg2, forceStringMethod) {
- if (regexp.exec === regexpExec) {
- if (DELEGATES_TO_SYMBOL && !forceStringMethod) {
- // The native String method already delegates to @@method (this
- // polyfilled function), leasing to infinite recursion.
- // We avoid it by directly calling the native @@method method.
- return { done: true, value: nativeRegExpMethod.call(regexp, str, arg2) };
- }
- return { done: true, value: nativeMethod.call(str, regexp, arg2) };
- }
- return { done: false };
- });
- var stringMethod = methods[0];
- var regexMethod = methods[1];
-
- redefine(String.prototype, KEY, stringMethod);
- redefine(RegExp.prototype, SYMBOL, length == 2
- // 21.2.5.8 RegExp.prototype[@@replace](string, replaceValue)
- // 21.2.5.11 RegExp.prototype[@@split](string, limit)
- ? function (string, arg) { return regexMethod.call(string, this, arg); }
- // 21.2.5.6 RegExp.prototype[@@match](string)
- // 21.2.5.9 RegExp.prototype[@@search](string)
- : function (string) { return regexMethod.call(string, this); }
- );
- if (sham) hide(RegExp.prototype[SYMBOL], 'sham', true);
- }
- };
-
- // `String.prototype.{ codePointAt, at }` methods implementation
- var createMethod$2 = function (CONVERT_TO_STRING) {
- return function ($this, pos) {
- var S = String(requireObjectCoercible($this));
- var position = toInteger(pos);
- var size = S.length;
- var first, second;
- if (position < 0 || position >= size) return CONVERT_TO_STRING ? '' : undefined;
- first = S.charCodeAt(position);
- return first < 0xD800 || first > 0xDBFF || position + 1 === size
- || (second = S.charCodeAt(position + 1)) < 0xDC00 || second > 0xDFFF
- ? CONVERT_TO_STRING ? S.charAt(position) : first
- : CONVERT_TO_STRING ? S.slice(position, position + 2) : (first - 0xD800 << 10) + (second - 0xDC00) + 0x10000;
- };
- };
-
- var stringMultibyte = {
- // `String.prototype.codePointAt` method
- // https://tc39.github.io/ecma262/#sec-string.prototype.codepointat
- codeAt: createMethod$2(false),
- // `String.prototype.at` method
- // https://github.com/mathiasbynens/String.prototype.at
- charAt: createMethod$2(true)
- };
-
- var charAt = stringMultibyte.charAt;
-
- // `AdvanceStringIndex` abstract operation
- // https://tc39.github.io/ecma262/#sec-advancestringindex
- var advanceStringIndex = function (S, index, unicode) {
- return index + (unicode ? charAt(S, index).length : 1);
- };
-
- // `RegExpExec` abstract operation
- // https://tc39.github.io/ecma262/#sec-regexpexec
- var regexpExecAbstract = function (R, S) {
- var exec = R.exec;
- if (typeof exec === 'function') {
- var result = exec.call(R, S);
- if (typeof result !== 'object') {
- throw TypeError('RegExp exec method returned something other than an Object or null');
- }
- return result;
- }
-
- if (classofRaw(R) !== 'RegExp') {
- throw TypeError('RegExp#exec called on incompatible receiver');
- }
-
- return regexpExec.call(R, S);
- };
-
- var max$1 = Math.max;
- var min$2 = Math.min;
- var floor$1 = Math.floor;
- var SUBSTITUTION_SYMBOLS = /\$([$&'`]|\d\d?|<[^>]*>)/g;
- var SUBSTITUTION_SYMBOLS_NO_NAMED = /\$([$&'`]|\d\d?)/g;
-
- var maybeToString = function (it) {
- return it === undefined ? it : String(it);
- };
-
- // @@replace logic
- fixRegexpWellKnownSymbolLogic('replace', 2, function (REPLACE, nativeReplace, maybeCallNative) {
- return [
- // `String.prototype.replace` method
- // https://tc39.github.io/ecma262/#sec-string.prototype.replace
- function replace(searchValue, replaceValue) {
- var O = requireObjectCoercible(this);
- var replacer = searchValue == undefined ? undefined : searchValue[REPLACE];
- return replacer !== undefined
- ? replacer.call(searchValue, O, replaceValue)
- : nativeReplace.call(String(O), searchValue, replaceValue);
- },
- // `RegExp.prototype[@@replace]` method
- // https://tc39.github.io/ecma262/#sec-regexp.prototype-@@replace
- function (regexp, replaceValue) {
- var res = maybeCallNative(nativeReplace, regexp, this, replaceValue);
- if (res.done) return res.value;
-
- var rx = anObject(regexp);
- var S = String(this);
-
- var functionalReplace = typeof replaceValue === 'function';
- if (!functionalReplace) replaceValue = String(replaceValue);
-
- var global = rx.global;
- if (global) {
- var fullUnicode = rx.unicode;
- rx.lastIndex = 0;
- }
- var results = [];
- while (true) {
- var result = regexpExecAbstract(rx, S);
- if (result === null) break;
-
- results.push(result);
- if (!global) break;
-
- var matchStr = String(result[0]);
- if (matchStr === '') rx.lastIndex = advanceStringIndex(S, toLength(rx.lastIndex), fullUnicode);
- }
-
- var accumulatedResult = '';
- var nextSourcePosition = 0;
- for (var i = 0; i < results.length; i++) {
- result = results[i];
-
- var matched = String(result[0]);
- var position = max$1(min$2(toInteger(result.index), S.length), 0);
- var captures = [];
- // NOTE: This is equivalent to
- // captures = result.slice(1).map(maybeToString)
- // but for some reason `nativeSlice.call(result, 1, result.length)` (called in
- // the slice polyfill when slicing native arrays) "doesn't work" in safari 9 and
- // causes a crash (https://pastebin.com/N21QzeQA) when trying to debug it.
- for (var j = 1; j < result.length; j++) captures.push(maybeToString(result[j]));
- var namedCaptures = result.groups;
- if (functionalReplace) {
- var replacerArgs = [matched].concat(captures, position, S);
- if (namedCaptures !== undefined) replacerArgs.push(namedCaptures);
- var replacement = String(replaceValue.apply(undefined, replacerArgs));
- } else {
- replacement = getSubstitution(matched, S, position, captures, namedCaptures, replaceValue);
- }
- if (position >= nextSourcePosition) {
- accumulatedResult += S.slice(nextSourcePosition, position) + replacement;
- nextSourcePosition = position + matched.length;
- }
- }
- return accumulatedResult + S.slice(nextSourcePosition);
- }
- ];
-
- // https://tc39.github.io/ecma262/#sec-getsubstitution
- function getSubstitution(matched, str, position, captures, namedCaptures, replacement) {
- var tailPos = position + matched.length;
- var m = captures.length;
- var symbols = SUBSTITUTION_SYMBOLS_NO_NAMED;
- if (namedCaptures !== undefined) {
- namedCaptures = toObject(namedCaptures);
- symbols = SUBSTITUTION_SYMBOLS;
- }
- return nativeReplace.call(replacement, symbols, function (match, ch) {
- var capture;
- switch (ch.charAt(0)) {
- case '$': return '$';
- case '&': return matched;
- case '`': return str.slice(0, position);
- case "'": return str.slice(tailPos);
- case '<':
- capture = namedCaptures[ch.slice(1, -1)];
- break;
- default: // \d\d?
- var n = +ch;
- if (n === 0) return match;
- if (n > m) {
- var f = floor$1(n / 10);
- if (f === 0) return match;
- if (f <= m) return captures[f - 1] === undefined ? ch.charAt(1) : captures[f - 1] + ch.charAt(1);
- return match;
- }
- capture = captures[n - 1];
- }
- return capture === undefined ? '' : capture;
- });
- }
- });
-
- function _classCallCheck(instance, Constructor) {
- if (!(instance instanceof Constructor)) {
- throw new TypeError("Cannot call a class as a function");
- }
- }
-
- function _defineProperties(target, props) {
- for (var i = 0; i < props.length; i++) {
- var descriptor = props[i];
- descriptor.enumerable = descriptor.enumerable || false;
- descriptor.configurable = true;
- if ("value" in descriptor) descriptor.writable = true;
- Object.defineProperty(target, descriptor.key, descriptor);
- }
- }
-
- function _createClass(Constructor, protoProps, staticProps) {
- if (protoProps) _defineProperties(Constructor.prototype, protoProps);
- if (staticProps) _defineProperties(Constructor, staticProps);
- return Constructor;
- }
-
- function _inherits(subClass, superClass) {
- if (typeof superClass !== "function" && superClass !== null) {
- throw new TypeError("Super expression must either be null or a function");
- }
-
- subClass.prototype = Object.create(superClass && superClass.prototype, {
- constructor: {
- value: subClass,
- writable: true,
- configurable: true
- }
- });
- if (superClass) _setPrototypeOf(subClass, superClass);
- }
-
- function _getPrototypeOf(o) {
- _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) {
- return o.__proto__ || Object.getPrototypeOf(o);
- };
- return _getPrototypeOf(o);
- }
-
- function _setPrototypeOf(o, p) {
- _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {
- o.__proto__ = p;
- return o;
- };
-
- return _setPrototypeOf(o, p);
- }
-
- function _assertThisInitialized(self) {
- if (self === void 0) {
- throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
- }
-
- return self;
- }
-
- function _possibleConstructorReturn(self, call) {
- if (call && (typeof call === "object" || typeof call === "function")) {
- return call;
- }
-
- return _assertThisInitialized(self);
- }
-
- function _superPropBase(object, property) {
- while (!Object.prototype.hasOwnProperty.call(object, property)) {
- object = _getPrototypeOf(object);
- if (object === null) break;
- }
-
- return object;
- }
-
- function _get(target, property, receiver) {
- if (typeof Reflect !== "undefined" && Reflect.get) {
- _get = Reflect.get;
- } else {
- _get = function _get(target, property, receiver) {
- var base = _superPropBase(target, property);
-
- if (!base) return;
- var desc = Object.getOwnPropertyDescriptor(base, property);
-
- if (desc.get) {
- return desc.get.call(receiver);
- }
-
- return desc.value;
- };
- }
-
- return _get(target, property, receiver || target);
- }
-
- /**
- * @author zhixin wen <wenzhixin2010@gmail.com>
- * extensions: https://github.com/vitalets/x-editable
- */
-
- var Utils = $.fn.bootstrapTable.utils;
- $.extend($.fn.bootstrapTable.defaults, {
- editable: true,
- onEditableInit: function onEditableInit() {
- return false;
- },
- onEditableSave: function onEditableSave(field, row, rowIndex, oldValue, $el) {
- return false;
- },
- onEditableShown: function onEditableShown(field, row, $el, editable) {
- return false;
- },
- onEditableHidden: function onEditableHidden(field, row, $el, reason) {
- return false;
- }
- });
- $.extend($.fn.bootstrapTable.Constructor.EVENTS, {
- 'editable-init.bs.table': 'onEditableInit',
- 'editable-save.bs.table': 'onEditableSave',
- 'editable-shown.bs.table': 'onEditableShown',
- 'editable-hidden.bs.table': 'onEditableHidden'
- });
-
- $.BootstrapTable =
- /*#__PURE__*/
- function (_$$BootstrapTable) {
- _inherits(_class, _$$BootstrapTable);
-
- function _class() {
- _classCallCheck(this, _class);
-
- return _possibleConstructorReturn(this, _getPrototypeOf(_class).apply(this, arguments));
- }
-
- _createClass(_class, [{
- key: "initTable",
- value: function initTable() {
- var _this = this;
-
- _get(_getPrototypeOf(_class.prototype), "initTable", this).call(this);
-
- if (!this.options.editable) {
- return;
- }
-
- $.each(this.columns, function (i, column) {
- if (!column.editable) {
- return;
- }
-
- var editableOptions = {};
- var editableDataMarkup = [];
- var editableDataPrefix = 'editable-';
-
- var processDataOptions = function processDataOptions(key, value) {
- // Replace camel case with dashes.
- var dashKey = key.replace(/([A-Z])/g, function ($1) {
- return "-".concat($1.toLowerCase());
- });
-
- if (dashKey.indexOf(editableDataPrefix) === 0) {
- editableOptions[dashKey.replace(editableDataPrefix, 'data-')] = value;
- }
- };
-
- $.each(_this.options, processDataOptions);
-
- column.formatter = column.formatter || function (value) {
- return value;
- };
-
- column._formatter = column._formatter ? column._formatter : column.formatter;
-
- column.formatter = function (value, row, index) {
- var result = Utils.calculateObjectValue(column, column._formatter, [value, row, index], value);
- result = typeof result === 'undefined' || result === null ? _this.options.undefinedText : result;
- $.each(column, processDataOptions);
- $.each(editableOptions, function (key, value) {
- editableDataMarkup.push(" ".concat(key, "=\"").concat(value, "\""));
- });
- var _dont_edit_formatter = false;
-
- if (column.editable.hasOwnProperty('noeditFormatter')) {
- _dont_edit_formatter = column.editable.noeditFormatter(value, row, index);
- }
-
- if (_dont_edit_formatter === false) {
- return "<a href=\"javascript:void(0)\"\n data-name=\"".concat(column.field, "\"\n data-pk=\"").concat(row[_this.options.idField], "\"\n data-value=\"").concat(result, "\"\n ").concat(editableDataMarkup.join(''), "></a>");
- }
-
- return _dont_edit_formatter;
- };
- });
- }
- }, {
- key: "initBody",
- value: function initBody(fixedScroll) {
- var _this2 = this;
-
- _get(_getPrototypeOf(_class.prototype), "initBody", this).call(this, fixedScroll);
-
- if (!this.options.editable) {
- return;
- }
-
- $.each(this.columns, function (i, column) {
- if (!column.editable) {
- return;
- }
-
- var data = _this2.getData();
-
- var $field = _this2.$body.find("a[data-name=\"".concat(column.field, "\"]"));
-
- $field.each(function (i, element) {
- var $element = $(element);
- var $tr = $element.closest('tr');
- var index = $tr.data('index');
- var row = data[index];
- var editableOpts = Utils.calculateObjectValue(column, column.editable, [index, row, $element], {});
- $element.editable(editableOpts);
- });
- $field.off('save').on('save', function (_ref, _ref2) {
- var currentTarget = _ref.currentTarget;
- var submitValue = _ref2.submitValue;
- var $this = $(currentTarget);
-
- var data = _this2.getData();
-
- var rowIndex = $this.parents('tr[data-index]').data('index');
- var row = data[rowIndex];
- var oldValue = row[column.field];
- $this.data('value', submitValue);
- row[column.field] = submitValue;
-
- _this2.trigger('editable-save', column.field, row, rowIndex, oldValue, $this);
-
- _this2.initBody();
- });
- $field.off('shown').on('shown', function (_ref3, editable) {
- var currentTarget = _ref3.currentTarget;
- var $this = $(currentTarget);
-
- var data = _this2.getData();
-
- var rowIndex = $this.parents('tr[data-index]').data('index');
- var row = data[rowIndex];
-
- _this2.trigger('editable-shown', column.field, row, $this, editable);
- });
- $field.off('hidden').on('hidden', function (_ref4, reason) {
- var currentTarget = _ref4.currentTarget;
- var $this = $(currentTarget);
-
- var data = _this2.getData();
-
- var rowIndex = $this.parents('tr[data-index]').data('index');
- var row = data[rowIndex];
-
- _this2.trigger('editable-hidden', column.field, row, $this, reason);
- });
- });
- this.trigger('editable-init');
- }
- }]);
-
- return _class;
- }($.BootstrapTable);
-
-}));
+/**
+ * @author zhixin wen <wenzhixin2010@gmail.com>
+ * extensions: https://github.com/vitalets/x-editable
+ */
+
+(function($) {
+
+ 'use strict';
+
+ $.extend($.fn.bootstrapTable.defaults, {
+ editable: true,
+ onEditableInit: function() {
+ return false;
+ },
+ onEditableSave: function(field, row, oldValue, $el) {
+ return false;
+ },
+ onEditableShown: function(field, row, $el, editable) {
+ return false;
+ },
+ onEditableHidden: function(field, row, $el, reason) {
+ return false;
+ }
+ });
+
+ $.extend($.fn.bootstrapTable.Constructor.EVENTS, {
+ 'editable-init.bs.table': 'onEditableInit',
+ 'editable-save.bs.table': 'onEditableSave',
+ 'editable-shown.bs.table': 'onEditableShown',
+ 'editable-hidden.bs.table': 'onEditableHidden'
+ });
+
+ var BootstrapTable = $.fn.bootstrapTable.Constructor,
+ _initTable = BootstrapTable.prototype.initTable,
+ _initBody = BootstrapTable.prototype.initBody;
+
+ BootstrapTable.prototype.initTable = function() {
+ var that = this;
+ _initTable.apply(this, Array.prototype.slice.apply(arguments));
+
+ if (!this.options.editable) {
+ return;
+ }
+
+ $.each(this.columns, function(i, column) {
+ if (!column.editable) {
+ return;
+ }
+
+ var editableOptions = {},
+ editableDataMarkup = [],
+ editableDataPrefix = 'editable-';
+
+ var processDataOptions = function(key, value) {
+ // Replace camel case with dashes.
+ var dashKey = key.replace(/([A-Z])/g, function($1) {
+ return "-" + $1.toLowerCase();
+ });
+ if (dashKey.slice(0, editableDataPrefix.length) == editableDataPrefix) {
+ var dataKey = dashKey.replace(editableDataPrefix, 'data-');
+ editableOptions[dataKey] = value;
+ }
+ };
+
+ $.each(that.options, processDataOptions);
+
+ column.formatter = column.formatter || function(value, row, index) {
+ return value;
+ };
+ column._formatter = column._formatter ? column._formatter : column.formatter;
+ column.formatter = function(value, row, index) {
+ var result = column._formatter ? column._formatter(value, row, index) : value;
+
+ $.each(column, processDataOptions);
+
+ $.each(editableOptions, function(key, value) {
+ editableDataMarkup.push(' ' + key + '="' + value + '"');
+ });
+
+ var _dont_edit_formatter = false;
+ if (column.editable.hasOwnProperty('noeditFormatter')) {
+ _dont_edit_formatter = column.editable.noeditFormatter(value, row, index);
+ }
+
+ if (_dont_edit_formatter === false) {
+ return ['<a href="javascript:void(0)"',
+ ' data-name="' + column.field + '"',
+ ' data-pk="' + row[that.options.idField] + '"',
+ ' data-value="' + result + '"',
+ editableDataMarkup.join(''),
+ '>' + '</a>'
+ ].join('');
+ } else {
+ return _dont_edit_formatter;
+ }
+
+ };
+ });
+ };
+
+ BootstrapTable.prototype.initBody = function() {
+ var that = this;
+ _initBody.apply(this, Array.prototype.slice.apply(arguments));
+
+ if (!this.options.editable) {
+ return;
+ }
+
+ $.each(this.columns, function(i, column) {
+ if (!column.editable) {
+ return;
+ }
+
+ that.$body.find('a[data-name="' + column.field + '"]').editable(column.editable)
+ .off('save').on('save', function(e, params) {
+ var data = that.getData(),
+ index = $(this).parents('tr[data-index]').data('index'),
+ row = data[index],
+ oldValue = row[column.field];
+
+ $(this).data('value', params.submitValue);
+ row[column.field] = params.submitValue;
+ that.trigger('editable-save', column.field, row, oldValue, $(this));
+ that.resetFooter();
+ });
+ that.$body.find('a[data-name="' + column.field + '"]').editable(column.editable)
+ .off('shown').on('shown', function(e, editable) {
+ var data = that.getData(),
+ index = $(this).parents('tr[data-index]').data('index'),
+ row = data[index];
+
+ that.trigger('editable-shown', column.field, row, $(this), editable);
+ });
+ that.$body.find('a[data-name="' + column.field + '"]').editable(column.editable)
+ .off('hidden').on('hidden', function(e, reason) {
+ var data = that.getData(),
+ index = $(this).parents('tr[data-index]').data('index'),
+ row = data[index];
+
+ that.trigger('editable-hidden', column.field, row, $(this), reason);
+ });
+ });
+ this.trigger('editable-init');
+ };
+
+})(jQuery);
\ No newline at end of file
diff --git a/src/main/resources/templates/check/checkHeader/checkHeader.html b/src/main/resources/templates/check/checkHeader/checkHeader.html
index 2627d0d..0a23c26 100644
--- a/src/main/resources/templates/check/checkHeader/checkHeader.html
+++ b/src/main/resources/templates/check/checkHeader/checkHeader.html
@@ -233,7 +233,12 @@
function queryParams(params) {
return {
- type:[[${type}]]
+ type:[[${type}]],
+ pageSize: params.limit,
+ pageNum: params.offset / params.limit + 1,
+ searchValue: params.search,
+ orderByColumn: params.sort,
+ isAsc: params.order
};
};
diff --git a/src/main/resources/templates/check/checkingRegister/checkingRegister.html b/src/main/resources/templates/check/checkingRegister/checkingRegister.html
index 9511325..0604a94 100644
--- a/src/main/resources/templates/check/checkingRegister/checkingRegister.html
+++ b/src/main/resources/templates/check/checkingRegister/checkingRegister.html
@@ -241,8 +241,6 @@
pageSize: params.limit,
pageNum: params.offset / params.limit + 1,
searchValue: params.search,
- orderByColumn: params.sort,
- isAsc: params.order
};
addButton();
}
@@ -292,7 +290,16 @@
index: index, //行索引
field: field, //列名
value: value //cell值
- })
+ });
+
+ var dataRow = $table.bootstrapTable('getRowByIndex',index);
+ var url = null;
+ if (dataRow.id == null || dataRow.id == ""){
+ url = prefix+"/add";
+ } else {
+ url = prefix+"/edit";
+ }
+ $.operate.submit(url, "post", "json", dataRow);
}
</script>
</body>