apply-clients 3.3.222 → 3.4.2-FuGu-4

package/build/webpack.dev.conf.js

@@ -0,0 +1,51 @@
+var webpack = require('webpack')
+var merge = require('webpack-merge')
+var baseConfig = require('./webpack.base.conf')
+var HtmlWebpackPlugin = require('html-webpack-plugin')
+
+// add hot-reload related code to entry chunks
+Object.keys(baseConfig.entry).forEach(function (name) {
+  baseConfig.entry[name] = ['./build/dev-client'].concat(baseConfig.entry[name])
+})
+
+module.exports = merge(baseConfig, {
+  // eval-source-map is faster for development
+  devtool: '#eval-source-map',
+  devServer: {
+    historyApiFallback: true,
+    host: '0.0.0.0',
+    disableHostCheck: true,
+    noInfo: true
+  },
+  output: {
+    // necessary for the html plugin to work properly
+    // when serving the html from in-memory
+    publicPath: '/'
+  },
+  plugins: [
+    // https://github.com/glenjamin/webpack-hot-middleware#installation--usage
+    new webpack.optimize.OccurenceOrderPlugin(),
+    new webpack.HotModuleReplacementPlugin(),
+    new webpack.NoErrorsPlugin(),
+    // https://github.com/ampedandwired/html-webpack-plugin
+    new HtmlWebpackPlugin({
+      filename: 'index.html',
+      template: 'index.html',
+      inject: true,
+      chunks: ['app']
+    }),
+    // 安卓模拟页面
+    new HtmlWebpackPlugin({
+      filename: 'android.html',
+      template: 'android.html',
+      inject: true,
+      chunks: ['android-app']
+    }),
+    new HtmlWebpackPlugin({
+      filename: 'dingding.html',
+      template: 'dingding.html',
+      inject: true,
+      chunks: ['dingding-app']
+    })
+  ]
+})

package/build/webpack.devandroid.conf.js

@@ -0,0 +1,34 @@
+var webpack = require('webpack')
+var merge = require('webpack-merge')
+var baseConfig = require('./webpack.baseandroid.conf')
+var HtmlWebpackPlugin = require('html-webpack-plugin')
+
+// add hot-reload related code to entry chunks
+Object.keys(baseConfig.entry).forEach(function (name) {
+  baseConfig.entry[name] = ['./build/dev-client'].concat(baseConfig.entry[name])
+})
+
+module.exports = merge(baseConfig, {
+  // eval-source-map is faster for development
+  devtool: 'source-map',
+  //devtool: '#eval-source-map',
+  output: {
+    // necessary for the html plugin to work properly
+    // when serving the html from in-memory
+    publicPath: '/'
+  },
+  plugins: [
+    // https://github.com/glenjamin/webpack-hot-middleware#installation--usage
+    new webpack.optimize.OccurenceOrderPlugin(),
+    new webpack.HotModuleReplacementPlugin(),
+    new webpack.NoErrorsPlugin(),
+    // https://github.com/ampedandwired/html-webpack-plugin
+    //plugin trick
+    new HtmlWebpackPlugin({
+      filename: 'android.html',
+      template: 'android.html',
+      inject: true,
+      chunks: ['android-app']
+    })
+  ]
+})

package/build/webpack.example.conf.js

@@ -0,0 +1,49 @@
+var fs = require('fs')
+var webpack = require('webpack')
+var merge = require('webpack-merge')
+var baseConfig = require('./webpack.base.conf')
+var HtmlWebpackPlugin = require('html-webpack-plugin')
+
+// add hot-reload related code to entry chunks
+Object.keys(baseConfig.entry).forEach(function (name) {
+  baseConfig.entry[name] = ['./build/dev-client'].concat(baseConfig.entry[name])
+})
+
+// 把examples下所有index.html转换成测试例子.html
+fs.readdirSync('./examples').forEach((file) => {
+  baseConfig.plugins.push(
+    // https://github.com/ampedandwired/html-webpack-plugin
+    new HtmlWebpackPlugin({
+      filename: file + '.html',
+      template: `examples/${file}/index.html`,
+      inject: false
+    })
+  )
+})
+
+// 把examples下子目录里的main.js打包成对应组件名的App.js
+fs.readdirSync('./examples').forEach((file) => {
+  baseConfig.entry[file + 'App'] = `./examples/${file}/main.js`
+})
+
+module.exports = merge(baseConfig, {
+  // eval-source-map is faster for development
+  devtool: '#eval-source-map',
+  output: {
+    // necessary for the html plugin to work properly
+    // when serving the html from in-memory
+    publicPath: '/'
+  },
+  plugins: [
+    // https://github.com/glenjamin/webpack-hot-middleware#installation--usage
+    new webpack.optimize.OccurenceOrderPlugin(),
+    new webpack.HotModuleReplacementPlugin(),
+    new webpack.NoErrorsPlugin(),
+    // https://github.com/ampedandwired/html-webpack-plugin
+    new HtmlWebpackPlugin({
+      filename: 'index.html',
+      template: 'index.html',
+      inject: true
+    })
+  ]
+})

package/build/webpack.prod.conf.js

@@ -0,0 +1,60 @@
+var webpack = require('webpack')
+var merge = require('webpack-merge')
+var baseConfig = require('./webpack.base.conf')
+var cssLoaders = require('./css-loaders')
+var ExtractTextPlugin = require('extract-text-webpack-plugin')
+var HtmlWebpackPlugin = require('html-webpack-plugin')
+
+// whether to generate source map for production files.
+// disabling this can speed up the build.
+var SOURCE_MAP = true
+
+module.exports = merge(baseConfig, {
+  stats: {
+    children: false
+  },
+  devtool: SOURCE_MAP ? '#source-map' : false,
+  output: {
+    // naming output files with hashes for better caching.
+    // dist/index.html will be auto-generated with correct URLs.
+    filename: '[name][chunkhash].js',
+    chunkFilename: '[id].[chunkhash].js'
+  },
+  vue: {
+    loaders: cssLoaders({
+      sourceMap: SOURCE_MAP,
+      extract: true
+    })
+  },
+  plugins: [
+    // http://vuejs.github.io/vue-loader/workflow/production.html
+    new webpack.DefinePlugin({
+      'process.env': {
+        NODE_ENV: '"production"'
+      }
+    }),
+    new webpack.optimize.UglifyJsPlugin({
+      compress: {
+        warnings: false
+      }
+    }),
+    new webpack.optimize.OccurenceOrderPlugin(),
+    // extract css into its own file
+    new ExtractTextPlugin('[name].css'),
+    // generate dist index.html with correct asset hash for caching.
+    // you can customize output by editing /index.html
+    // see https://github.com/ampedandwired/html-webpack-plugin
+    new HtmlWebpackPlugin({
+      filename: '../index.html',
+      template: 'index.html',
+      inject: true,
+      minify: {
+        removeComments: true,
+        collapseWhitespace: true,
+        removeAttributeQuotes: true
+        // more options:
+        // https://github.com/kangax/html-minifier#options-quick-reference
+      }
+    })
+  ]
+})

package/build/webpack.prodandroid.conf.js

@@ -0,0 +1,60 @@
+var webpack = require('webpack')
+var merge = require('webpack-merge')
+var baseConfig = require('./webpack.baseandroid.conf')
+var cssLoaders = require('./css-loaders')
+var ExtractTextPlugin = require('extract-text-webpack-plugin')
+var HtmlWebpackPlugin = require('html-webpack-plugin')
+
+// whether to generate source map for production files.
+// disabling this can speed up the build.
+var SOURCE_MAP = true
+
+module.exports = merge(baseConfig, {
+  stats: {
+    children: false
+  },
+  devtool: SOURCE_MAP ? '#source-map' : false,
+  output: {
+    // naming output files with hashes for better caching.
+    // dist/index.html will be auto-generated with correct URLs.
+    filename: '[name].js',
+    chunkFilename: '[id].js'
+  },
+  vue: {
+    loaders: cssLoaders({
+      sourceMap: SOURCE_MAP,
+      extract: true
+    })
+  },
+  plugins: [
+    // http://vuejs.github.io/vue-loader/workflow/production.html
+    new webpack.DefinePlugin({
+      'process.env': {
+        NODE_ENV: '"production"'
+      }
+    }),
+    new webpack.optimize.UglifyJsPlugin({
+      compress: {
+        warnings: false
+      }
+    }),
+    new webpack.optimize.OccurenceOrderPlugin(),
+    // extract css into its own file
+    new ExtractTextPlugin('[name].css'),
+    // generate dist index.html with correct asset hash for caching.
+    // you can customize output by editing /index.html
+    // see https://github.com/ampedandwired/html-webpack-plugin
+    new HtmlWebpackPlugin({
+      filename: '../index.html',
+      template: 'android.html',
+      inject: true,
+      minify: {
+        removeComments: true,
+        collapseWhitespace: true,
+        removeAttributeQuotes: true
+        // more options:
+        // https://github.com/kangax/html-minifier#options-quick-reference
+      }
+    })
+  ]
+})

package/build/webpack.test.conf.js

@@ -0,0 +1,31 @@
+// This is the webpack config used for unit tests.
+
+var utils = require('./utils')
+var webpack = require('webpack')
+var merge = require('webpack-merge')
+var baseConfig = require('./webpack.base.conf')
+
+var webpackConfig = merge(baseConfig, {
+  module: {
+    rules: utils.styleLoaders()
+  },
+  // use inline sourcemap for karma-sourcemap-loader
+  devtool: '#inline-source-map',
+  resolveLoader: {
+    alias: {
+      // necessary to to make lang="scss" work in test when using vue-loader's ?inject option
+      // see discussion at https://github.com/vuejs/vue-loader/issues/724
+      'scss-loader': 'sass-loader'
+    }
+  },
+  plugins: [
+    new webpack.DefinePlugin({
+      'process.env': require('../config/test.env')
+    })
+  ]
+})
+
+// no need for app entry during tests
+delete webpackConfig.entry
+
+module.exports = webpackConfig

package/dingding.html

@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+  <META HTTP-EQUIV="pragma" CONTENT="no-cache">
+  <META HTTP-EQUIV="Cache-Control" CONTENT="no-cache, must-revalidate">
+  <META HTTP-EQUIV="expires" CONTENT="0">
+  <title>报建系统</title>
+  <script src="https://g.alicdn.com/code/npm/@ali/dingtalk-h5-remote-debug-sdk/0.1.3/app.bundle.js"></script>
+  <script>
+    h5RemoteDebugSdk.init({
+      uuid: "31c780c4-2919-427d-a4fb-73e5a451f5b0",
+      observerElement: document.documentElement,
+    });
+  </script>
+</head>
+<body>
+  <ding-ding-app></ding-ding-app>
+</body>
+</html>
+<script>
+</script>

package/index.html

@@ -6,7 +6,7 @@
   <META HTTP-EQUIV="pragma" CONTENT="no-cache">
   <META HTTP-EQUIV="Cache-Control" CONTENT="no-cache, must-revalidate">
   <META HTTP-EQUIV="expires" CONTENT="0">
-  <title>燃气客服系统</title>
+  <title>报建系统</title>
   <script  src="https://webapi.amap.com/maps?v=1.4.2&key=4889f1e58df01cb40415536c8907bf64"></script>
   <!--引入UI组件库（1.1版本） -->
   <script src="https://webapi.amap.com/ui/1.1/main.js?v=1.1.1"></script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.3.222",
+  "version": "3.4.2-FuGu-4",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {
@@ -29,6 +29,7 @@
   "dependencies": {
     "@logicflow/core": "^0.4.3",
     "co": "4.6.0",
+    "dingtalk-jsapi": "^2.13.68",
     "jsencrypt": "^3.0.0-rc.1",
     "less": "^2.7.1",
     "less-loader": "^2.2.3",
@@ -93,9 +94,9 @@
     "style": "0.0.3",
     "style-loader": "^0.20.3",
     "system-clients": "3.1.87",
-    "system-phone": "1.2.81-1",
+    "system-phone": "1.2.80-49",
     "url-loader": "^0.5.7",
-    "vue-client": "1.24.25",
+    "vue-client": "1.24.33",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",

package/src/AndroidApp.vue

@@ -2,11 +2,12 @@
   <!-- <app-base> -->
   <div id="android-app">
     <article>
-      <route :comp="{name: 'app-exploration-user'}" name="root"></route>
-<!--      <route :comp="{name: 'app-process-supervisory'}" name="root"></route>-->
-<!--      <route :comp="{name: 'apply-reserve'}" name="root"></route>-->
-<!--      <route :comp="{name: 'task-graph'}" name="root"></route>-->
-<!--      <route :comp="{name: 'app-istall-function'}" name="root"></route>-->
+<!--      <route :comp="{name: 'build-tsak'}" name="root"></route>-->
+      <!--      <route :comp="{name: 'app-process-supervisory'}" name="root"></route>-->
+      <!--      <route :comp="{name: 'apply-reserve'}" name="root"></route>-->
+      <!--      <route :comp="{name: 'task-graph'}" name="root"></route>-->
+      <!--      <route :comp="{name: 'app-istall-function'}" name="root"></route>-->
+            <route :comp="{name: 'login-app'}" name="root"></route>
     </article>
     <time-out></time-out>
     <message-box></message-box>
@@ -17,14 +18,18 @@
 
 <script>
 
-  export default {
-    ready () {
-      if(!window.onerror) {
-        window.onerror = function (message, file, line, col, error) {
-          // HostApp.alert("Error occured: " + error.message)
-          return false
-        }
+import AlertBox from "vue-client/src/components/AlertBox";
+import AlertBoxBatch from "vue-client/src/components/AlertBoxBatch";
+
+export default {
+  ready () {
+    if(!window.onerror) {
+      window.onerror = function (message, file, line, col, error) {
+        // HostApp.alert("Error occured: " + error.message)
+        return false
       }
     }
-  }
+  },
+  components: { AlertBox, AlertBoxBatch }
+}
 </script>

package/src/App.vue

@@ -1,20 +1,20 @@
-<template>
-  <div>
-    <app-base class="bg">
-      <div class='flex'>
-        <article>
-          <route :comp="{name: 'login'}"></route>
-        </article>
-      </div>
-    </app-base>
-  </div>
-</template>
-
-<script>
-
-
-  export default {
-
-
-  }
-</script>
+<template>
+  <div>
+    <app-base class="bg">
+      <div class='flex'>
+        <article>
+          <route :comp="{name: 'login'}"></route>
+        </article>
+      </div>
+    </app-base>
+  </div>
+</template>
+
+<script>
+
+
+  export default {
+
+
+  }
+</script>

package/src/DingDingApp.vue

@@ -0,0 +1,51 @@
+<template>
+  <div id="dingding-app">
+    {{ title }}
+  </div>
+</template>
+
+<script>
+export default {
+  title: '报建系统',
+  data () {
+    return {
+      title: 'Hello DingDing'
+    }
+  },
+  ready () {
+    // 获取免登授权码
+    this.$dd.ready(() => {
+      console.log('加载成功')
+
+      this.test2()
+    })
+  },
+  methods: {
+    test (res) {
+      this.$dd.device.notification.alert({
+        title: '提示',
+        message: res,
+        buttonName: '确认',
+        onSuccess: () => {
+        },
+        onFail: () => {}
+      })
+    },
+    test2 () {
+      this.$dd.runtime.permission.requestAuthCode({
+        corpId: 'ding6406c45c1a45736df2c783f7214b6d69',
+        onSuccess: (res) => {
+          console.info('获取成功')
+          console.info(res.code)
+          this.test(res.code)
+        },
+        onFail: (err) => {
+          console.info('获取失败')
+          console.info(err)
+          this.test('失败')
+        }
+      })
+    }
+  }
+}
+</script>

package/src/android.js

@@ -7,7 +7,7 @@ import applyAndroid from './applyAndroid'
 
 all()
 apply()
-applyAndroid()
+applyAndroid('yuchuan')
 systemphonegrid()
 
 require('./android-bootstrap/less/bootstrap.less')