Merge pull request #1 from WeBankFinTech/master

update

Author: OOOOOwenXu

.eslintrc.js

@@ -1,69 +1,69 @@
 module.exports = {
-  root: true,
-  env: {
-    node: true
-  },
-  'extends': [
-    'plugin:vue/essential',
-    '@vue/standard'
-  ],
-  rules: {
-    'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
-    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
-    'key-spacing': ['error'],
-    'keyword-spacing': ['error'],
-    'standard/no-callback-literal': 0,
-    'handle-callback-err': 0,
-    'no-return-assign': 0,
-    'eqeqeq': 0,
-    'comma-dangle': 0,
-    'semi': 0,
-    'space-before-function-paren': 0,
-    'keyword-spacing': 0,
-    'no-useless-escape': 0,
-    'no-invalid-this': 0,
-    'operator-linebreak': 0,
-    'indent': [
-        'error',
-        4,
-        {
-            'SwitchCase': 1
-        }
+    root: true,
+    env: {
+        node: true
+    },
+    'extends': [
+        'plugin:vue/essential',
+        '@vue/standard'
     ],
-    'no-const-assign': 'warn',
-    'no-this-before-super': 'warn',
-    'no-undef': 2,
-    'no-unreachable': 'warn',
-    'no-unused-vars': 'warn',
-    'constructor-super': 'warn',
-    'valid-typeof': 'warn',
-    'one-var': 'warn',
-    'max-len': 'off',
-    'no-trailing-spaces': 'off',
-    'require-jsdoc': 'warn',
-    'camelcase': 'warn',
-    'no-invalid-this': 'warn',
-    'linebreak-style': 0,
-    'vue/no-parsing-error': [2, {
-        'x-invalid-end-tag': false,
-        'invalid-first-character-of-tag-name': false
-    }],
-    'no-tabs': 0,
-    'vue/html-indent': [2, 2, {
-        'attribute': 1,
-        'closeBracket': 0,
-        'alignAttributesVertically': false
-    }],
-    'vue/require-default-prop': 0,
-    'vue/component-name-in-template-casing': 0,
-    'vue/html-closing-bracket-spacing': 0,
-    'vue/html-closing-bracket-newline': 0,
-    'vue/singleline-html-element-content-newline': 0,
-    'vue/multiline-html-element-content-newline': 0,
-    'vue/attributes-order': 0,
-    'vue/html-self-closing': 0
-  },
-  parserOptions: {
-    parser: 'babel-eslint'
-  }
+    rules: {
+        'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+        'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+        'key-spacing': ['error'],
+        'keyword-spacing': ['error'],
+        'standard/no-callback-literal': 0,
+        'handle-callback-err': 0,
+        'no-return-assign': 0,
+        'eqeqeq': 0,
+        'comma-dangle': 0,
+        'semi': 0,
+        'space-before-function-paren': 0,
+        'keyword-spacing': 0,
+        'no-useless-escape': 0,
+        'no-invalid-this': 0,
+        'operator-linebreak': 0,
+        'indent': [
+            'error',
+            4,
+            {
+                'SwitchCase': 1
+            }
+        ],
+        'no-const-assign': 'warn',
+        'no-this-before-super': 'warn',
+        'no-undef': 2,
+        'no-unreachable': 'warn',
+        'no-unused-vars': 'warn',
+        'constructor-super': 'warn',
+        'valid-typeof': 'warn',
+        'one-var': 'warn',
+        'max-len': 'off',
+        'no-trailing-spaces': 'off',
+        'require-jsdoc': 'warn',
+        'camelcase': 'warn',
+        'no-invalid-this': 'warn',
+        'linebreak-style': 0,
+        'vue/no-parsing-error': [2, {
+            'x-invalid-end-tag': false,
+            'invalid-first-character-of-tag-name': false
+        }],
+        'no-tabs': 0,
+        'vue/html-indent': [2, 2, {
+            'attribute': 1,
+            'closeBracket': 0,
+            'alignAttributesVertically': false
+        }],
+        'vue/require-default-prop': 0,
+        'vue/component-name-in-template-casing': 0,
+        'vue/html-closing-bracket-spacing': 0,
+        'vue/html-closing-bracket-newline': 0,
+        'vue/singleline-html-element-content-newline': 0,
+        'vue/multiline-html-element-content-newline': 0,
+        'vue/attributes-order': 0,
+        'vue/html-self-closing': 0
+    },
+    parserOptions: {
+        parser: 'babel-eslint'
+    }
 }

.gitignore

@@ -6,5 +6,6 @@
 node_modules/
 dist/
 
-.package-lock.json
-.env.development
+package-lock.json
+.env.development
+wedatasphere-scriptis-*.zip

README.md

@@ -9,6 +9,8 @@ Scriptis
 
 Scriptis is for interactive data analysis with script development(SQL, Pyspark, HiveQL), task submission(Spark, Hive), UDF, function, resource management and intelligent diagnosis.
 
+![运行时功能](docs/zh_CN/images/readme/running.gif)
+
 ## Features
 
 * Script editor: Support multi-language, auto-completion, syntax highlighting and SQL syntax error-correction.
@@ -34,11 +36,9 @@ Read the Quick Start [Quick Start](/docs/en_US/ch3/Scriptis_Quick_Start.md)
 ![Comparison](/docs/en_US/images/readme/Comparison.png)
 
 ## Community
-If you desire immediate response, please kindly raise issues to us or scan the below QR code by WeChat to join our group:
-
-![WeChat](/docs/en_US/images/wechat.jpg)
+If you desire immediate response, please kindly raise issues to us or scan the below QR code by WeChat and QQ to join our group:
 
-QQ  Group:872767532
+![WeChatQQ](/docs/en_US/images/wechatQQ.png)
 
 ## License
 

babel.config.js

@@ -1,5 +1,5 @@
 module.exports = {
-  presets: [
-    '@vue/app'
-  ]
+    presets: [
+        '@vue/app'
+    ]
 }

config.sh

@@ -0,0 +1,8 @@
+# Configuring front-end ports
+scriptis_port="8088"
+
+# URL of the backend linkis gateway
+linkis_url="http://localhost:20401"
+
+# Scriptis ip address
+scriptis_ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}')

docs/en_US/ch4/Scriptis_Manual.md

@@ -152,15 +152,12 @@ This module has the following functions:
 
 2. Visual analysis:  Click on visual analysis button to visualize the result through VSBI.  (Soon to be released)
 
-![ide21](../images/ch4/ide21.png)
-
 3. Downloading:  Users can directly download the results as csv and excel files to local browser. Only support downloading 5000 lines for now. 
 
 4. Exporting:  Results can be exported to the workspace (shared directory of BDAP) in either csv or excel format and would not be restricted to 5000 lines if you choose full export at first. To use full export, add a comment in front of sql: `--set wds.linkis.engine.no.limit.allow=true`
 
 5. Go to Console--Configuration--Pipeline--Import and Export settings--Result export type to choose whether export results in csv format or excel format.  
 
-![ide22](../images/ch4/ide22.png)
 ## 8 Script History 
 
 Script history shows all the running information of the script. A user can quickly find the log and running results of a script that was run before and therefore, avoid running the same script repeatedly.