Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
wenzhixin committed Mar 4, 2023
2 parents 2867376 + 284df64 commit 5ce1fb5
Show file tree
Hide file tree
Showing 303 changed files with 21,364 additions and 15,707 deletions.
54 changes: 34 additions & 20 deletions .eslintrc.js → .eslintrc.cjs
Expand Up @@ -2,56 +2,69 @@ module.exports = {
root: true,
env: {
browser: true,
es2021: true,
node: true
},
parserOptions: {
parser: 'babel-eslint',
ecmaVersion: 2017,
sourceType: 'module'
},
extends: [
'eslint:recommended'
],
parserOptions: {
parser: '@babel/eslint-parser',
ecmaVersion: 'latest',
sourceType: 'module'
},
rules: {
'array-bracket-newline': ['error', 'consistent'],
'array-bracket-spacing': ['error', 'never'],
'array-element-newline': 'off',
'arrow-parens': ['error', 'as-needed'],
'arrow-spacing': ['error', { after: true, before: true }],
'block-spacing': 'error',
'brace-style': ['error', '1tbs'],
camelcase: 'off',
'comma-dangle': ['error', 'never'],
'comma-spacing': ['error', { after: true, before: false }],
'comma-style': 'off',
'computed-property-spacing': ['error', 'never'],
'default-case': 'error',
'dot-location': ['error', 'property'],
'eol-last': ['error', 'always'],
eqeqeq: 'error',
'func-call-spacing': ['error', 'never'],
'guard-for-in': 'warn',
indent: ['error',
2,
{
ArrayExpression: 1,
CallExpression: { arguments: 1 },
FunctionDeclaration: { parameters: 'first' },
ImportDeclaration: 'first',
MemberExpression: 1,
ObjectExpression: 1,
SwitchCase: 1
}],
indent: ['error', 2, {
ArrayExpression: 1,
CallExpression: { arguments: 1 },
FunctionDeclaration: { parameters: 'first' },
ImportDeclaration: 'first',
MemberExpression: 1,
ObjectExpression: 1,
SwitchCase: 1
}],
'jsdoc/require-jsdoc': 0,
'key-spacing': ['error', { afterColon: true, beforeColon: false, mode: 'strict' }],
'keyword-spacing': ['error', { after: true, before: true }],
'linebreak-style': 'off',
'line-comment-position': 'off',
'lines-around-comment': 'off',
'lines-between-class-members': ['error', 'always'],
'max-len': 'off',
'max-statements-per-line': ['error', { max: 1 }],
'multiline-ternary': 'off',
'no-alert': 'error',
'no-async-promise-executor': 'off',
'no-case-declarations': 'off',
'no-console': ['warn', { allow: ['warn', 'error', 'trace'] }],
'no-duplicate-imports': 'error',
'no-else-return': ['error', { allowElseIf: false }],
'no-extra-parens': 'error',
'no-lonely-if': 'error',
'no-mixed-spaces-and-tabs': 'error',
'no-multi-spaces': 'error',
'no-multi-str': 'error',
'no-multiple-empty-lines': 'error',
'no-new-func': 'error',
'no-param-reassign': 'off',
'no-prototype-builtins': 'off',
'no-return-assign': 'error',
'no-return-await': 'error',
Expand All @@ -65,6 +78,7 @@ module.exports = {
'no-useless-constructor': 'warn',
'no-var': 'error',
'no-void': 'error',
'no-whitespace-before-property': 'error',
'object-curly-spacing': ['error', 'always'],
'object-shorthand': 'error',
'one-var': ['error', 'never'],
Expand All @@ -87,14 +101,14 @@ module.exports = {
'sort-imports': 'off',
'space-before-blocks': ['error', { classes: 'always', functions: 'always', keywords: 'always' }],
'space-before-function-paren': ['error', 'always'],
'space-in-parens': [2, 'never'],
'space-in-parens': ['error', 'never'],
'space-infix-ops': 'error',
'spaced-comment': ['error', 'always'],
'switch-colon-spacing': 'error'
'switch-colon-spacing': 'error',
'template-curly-spacing': ['error', 'never']
},
globals: {
$: true,
jQuery: true,
adsbygoogle: true
jQuery: true
}
}
23 changes: 23 additions & 0 deletions CHANGELOG.md
@@ -1,6 +1,29 @@
ChangeLog
---------

### 1.21.3

#### Core

- **New:** Added `escapeTitle` table option.
- **New:** Added Aria Label to the search input for screenreaders.
- **New:** Persist data attributes for the header(`th`).
- **Update:** Fixed wrong condition for searching with server-side pagination.
- **Update:** Fixed overwriting the `filterOptions` after rebuild.
- **Update:** Fixed apostrophe issue when table via `html`.
- **Update:** Updated extend util instead of `$.extend`.
- **Update:** Updated Constructor.EVENTS to events.
- **Update:** Updated packages to the latest version.

#### Extensions

- **Update(cookie):** Fixed issue with hidden and radio/checkbox columns.
- **Update(export):** Fixed `exportTypes` option not working bug.
- **Update(filter-control):** Fixed selector scope issues with multiple tables.
- **Update(filter-control):** Fixed filtering values issue of select with `html` value.
- **Update(reorder-columns):** Fixed same internal function name with `reorder-rows`.
- **Update(treegrid):** Fixed `treegrid` not working when id is text.

### 1.21.2

#### Core
Expand Down
14 changes: 14 additions & 0 deletions cypress.config.js
@@ -0,0 +1,14 @@
import { defineConfig } from 'cypress'
import plugins from './cypress/plugins/index.js'

export default defineConfig({
video: false,
screenshot: false,
e2e: {
// We've imported your old cypress plugins here.
// You may want to clean this up later by importing these.
setupNodeEvents(on, config) {
return plugins(on, config)
},
},
})
4 changes: 0 additions & 4 deletions cypress.json

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion cypress/plugins/index.js
Expand Up @@ -15,7 +15,7 @@
/**
* @type {Cypress.PluginConfig}
*/
module.exports = (on, config) => {
export default (on, config) => {
// `on` is used to hook into various events Cypress emits
// `config` is the resolved Cypress config
}
File renamed without changes.

0 comments on commit 5ce1fb5

Please sign in to comment.