ylyx-cli 1.0.16 → 1.1.1

package/templates/vue-app/files/src/views/components/camera/cameraTest.vue

@@ -1,158 +1,158 @@
-<template>
-  <div>
-    <!--开启摄像头-->
-    <!-- <Button  type="primary"  @click="callCamera" style="margin-right: 10px;">开启摄像头</Button> -->
-    <!-- <Button @click = 'changePhoto' style="margin-right: 10px;">切换摄像头</Button> -->
-    <!--关闭摄像头-->
-    <!-- <Button  type="primary"  @click="closeCamera">关闭摄像头</Button> -->
-
-    <el-row>
-      <el-col :span="18">
-        <!--图片展示-->
-        <video ref="video" width="640" height="480" autoplay></video>
-      </el-col>
-      <el-col :span="6">
-        <!--canvas截取流-->
-        <canvas ref="canvas" width="200" height="150"></canvas>
-      </el-col>
-    </el-row>
-
-    <el-row>
-      <el-col :span="6">
-        <el-select v-model="modelSel" @change="changeSel" placeholder="请选择视频源">
-          <el-option
-            v-for="item in videoArr"
-            :key="item.index"
-            :label="item.label"
-            :value="item.id">
-          </el-option>
-        </el-select>
-      </el-col>
-      <el-col :span="6"><el-button type="primary" @click="photograph">拍照</el-button></el-col>
-    </el-row>
-    <!-- <Select v-model="modelSel" style="width:200px" @on-change="changeSel">
-            <Option v-for="(item,index) in videoArr" :value="item.id" :key="index">{{ item.label }}</Option>
-        </Select> -->
-  </div>
-</template>
-<script>
-export default {
-  data() {
-    return {
-      videoArr: [], //所有的摄像头
-      modelSel: '', //
-      myInterval: null,
-    };
-  },
-  created() {
-    this.changePhoto();
-  },
-  methods: {
-    // 调用摄像头
-    callCamera() {
-      // H5调用电脑摄像头API
-      navigator.mediaDevices
-        .getUserMedia({
-          video: true,
-        })
-        .then(success => {
-          // 摄像头开启成功
-          this.$refs['video'].srcObject = success;
-          // 实时拍照效果
-          this.$refs['video'].play();
-        })
-        .catch(error => {
-          console.error('摄像头开启失败，请检查摄像头是否可用！');
-        });
-    },
-    // 拍照
-    photograph() {
-      let ctx = this.$refs['canvas'].getContext('2d');
-      // 把当前视频帧内容渲染到canvas上
-      ctx.drawImage(this.$refs['video'], 0, 0, 200, 150);
-      // 转base64格式、图片格式转换、图片质量压缩---支持两种格式image/jpeg+image/png
-      let imgBase64 = this.$refs['canvas'].toDataURL('image/jpeg');
-      console.log(imgBase64);
-      this.$emit('sentDataURL', imgBase64);
-    },
-    // 关闭摄像头
-    closeCamera() {
-      if (!this.$refs['video'].srcObject) return;
-      let stream = this.$refs['video'].srcObject;
-      let tracks = stream.getTracks();
-      tracks.forEach(track => {
-        track.stop();
-      });
-      this.$refs['video'].srcObject = null;
-    },
-
-    //切换本地摄像头
-    changePhoto() {
-      /**得到所有的设备*/
-      navigator.mediaDevices
-        .enumerateDevices()
-        .then(devices => {
-          console.log(devices);
-          this.videoArr = [];
-          devices.forEach(device => {
-            if (device.kind == 'videoinput') {
-              this.videoArr.push({
-                label: device.label,
-                id: device.deviceId,
-              });
-            }
-          });
-          for (var i = 0; i < this.videoArr.length; i++) {
-            if (this.videoArr[i].label != '') {
-            }
-            this.modelSel = this.videoArr[i].label;
-            break;
-          }
-        })
-        .catch(function (err) {
-          layer.msg(err.name + ': ' + err.message);
-        });
-      this.callCamera();
-    },
-    //切换下拉
-    changeSel(val) {
-      const videoConstraints = {};
-      if (val === '') {
-        videoConstraints.facingMode = 'environment';
-      } else {
-        videoConstraints.deviceId = { exact: val };
-      }
-      var constraints = {
-        video: videoConstraints,
-      };
-      console.log(constraints);
-      this.getUserMedia(constraints);
-    },
-
-    /**打开摄像头*/
-    getUserMedia(constraints, success, error) {
-      if (navigator.mediaDevices.getUserMedia) {
-        //最新的标准API
-        navigator.mediaDevices
-          .getUserMedia(constraints)
-          .then(success => {
-            // 摄像头开启成功
-            this.$refs['video'].srcObject = success;
-            // 实时拍照效果
-            this.$refs['video'].play();
-          })
-          .catch(error);
-      } else if (navigator.webkitGetUserMedia) {
-        //webkit核心浏览器
-        navigator.webkitGetUserMedia(constraints, success, error);
-      } else if (navigator.mozGetUserMedia) {
-        //firfox浏览器
-        navigator.mozGetUserMedia(constraints, success, error);
-      } else if (navigator.getUserMedia) {
-        //旧版API
-        navigator.getUserMedia(constraints, success, error);
-      }
-    },
-  },
-};
-</script>
+<template>
+  <div>
+    <!--开启摄像头-->
+    <!-- <Button  type="primary"  @click="callCamera" style="margin-right: 10px;">开启摄像头</Button> -->
+    <!-- <Button @click = 'changePhoto' style="margin-right: 10px;">切换摄像头</Button> -->
+    <!--关闭摄像头-->
+    <!-- <Button  type="primary"  @click="closeCamera">关闭摄像头</Button> -->
+
+    <el-row>
+      <el-col :span="18">
+        <!--图片展示-->
+        <video ref="video" width="640" height="480" autoplay></video>
+      </el-col>
+      <el-col :span="6">
+        <!--canvas截取流-->
+        <canvas ref="canvas" width="200" height="150"></canvas>
+      </el-col>
+    </el-row>
+
+    <el-row>
+      <el-col :span="6">
+        <el-select v-model="modelSel" @change="changeSel" placeholder="请选择视频源">
+          <el-option
+            v-for="item in videoArr"
+            :key="item.index"
+            :label="item.label"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </el-col>
+      <el-col :span="6"><el-button type="primary" @click="photograph">拍照</el-button></el-col>
+    </el-row>
+    <!-- <Select v-model="modelSel" style="width:200px" @on-change="changeSel">
+            <Option v-for="(item,index) in videoArr" :value="item.id" :key="index">{{ item.label }}</Option>
+        </Select> -->
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      videoArr: [], //所有的摄像头
+      modelSel: '', //
+      myInterval: null,
+    };
+  },
+  created() {
+    this.changePhoto();
+  },
+  methods: {
+    // 调用摄像头
+    callCamera() {
+      // H5调用电脑摄像头API
+      navigator.mediaDevices
+        .getUserMedia({
+          video: true,
+        })
+        .then(success => {
+          // 摄像头开启成功
+          this.$refs['video'].srcObject = success;
+          // 实时拍照效果
+          this.$refs['video'].play();
+        })
+        .catch(error => {
+          console.error('摄像头开启失败，请检查摄像头是否可用！');
+        });
+    },
+    // 拍照
+    photograph() {
+      let ctx = this.$refs['canvas'].getContext('2d');
+      // 把当前视频帧内容渲染到canvas上
+      ctx.drawImage(this.$refs['video'], 0, 0, 200, 150);
+      // 转base64格式、图片格式转换、图片质量压缩---支持两种格式image/jpeg+image/png
+      let imgBase64 = this.$refs['canvas'].toDataURL('image/jpeg');
+      console.log(imgBase64);
+      this.$emit('sentDataURL', imgBase64);
+    },
+    // 关闭摄像头
+    closeCamera() {
+      if (!this.$refs['video'].srcObject) return;
+      let stream = this.$refs['video'].srcObject;
+      let tracks = stream.getTracks();
+      tracks.forEach(track => {
+        track.stop();
+      });
+      this.$refs['video'].srcObject = null;
+    },
+
+    //切换本地摄像头
+    changePhoto() {
+      /**得到所有的设备*/
+      navigator.mediaDevices
+        .enumerateDevices()
+        .then(devices => {
+          console.log(devices);
+          this.videoArr = [];
+          devices.forEach(device => {
+            if (device.kind == 'videoinput') {
+              this.videoArr.push({
+                label: device.label,
+                id: device.deviceId,
+              });
+            }
+          });
+          for (var i = 0; i < this.videoArr.length; i++) {
+            if (this.videoArr[i].label != '') {
+            }
+            this.modelSel = this.videoArr[i].label;
+            break;
+          }
+        })
+        .catch(function (err) {
+          layer.msg(err.name + ': ' + err.message);
+        });
+      this.callCamera();
+    },
+    //切换下拉
+    changeSel(val) {
+      const videoConstraints = {};
+      if (val === '') {
+        videoConstraints.facingMode = 'environment';
+      } else {
+        videoConstraints.deviceId = { exact: val };
+      }
+      var constraints = {
+        video: videoConstraints,
+      };
+      console.log(constraints);
+      this.getUserMedia(constraints);
+    },
+
+    /**打开摄像头*/
+    getUserMedia(constraints, success, error) {
+      if (navigator.mediaDevices.getUserMedia) {
+        //最新的标准API
+        navigator.mediaDevices
+          .getUserMedia(constraints)
+          .then(success => {
+            // 摄像头开启成功
+            this.$refs['video'].srcObject = success;
+            // 实时拍照效果
+            this.$refs['video'].play();
+          })
+          .catch(error);
+      } else if (navigator.webkitGetUserMedia) {
+        //webkit核心浏览器
+        navigator.webkitGetUserMedia(constraints, success, error);
+      } else if (navigator.mozGetUserMedia) {
+        //firfox浏览器
+        navigator.mozGetUserMedia(constraints, success, error);
+      } else if (navigator.getUserMedia) {
+        //旧版API
+        navigator.getUserMedia(constraints, success, error);
+      }
+    },
+  },
+};
+</script>

package/templates/vue-app/files/src/views/components/excel/upload-excel.vue

@@ -1,41 +1,41 @@
-<template>
-  <div class="app-container">
-    <upload-excel-component :on-success="handleSuccess" :before-upload="beforeUpload" />
-    <el-table :data="tableData" border highlight-current-row style="width: 100%; margin-top: 20px">
-      <el-table-column v-for="item of tableHeader" :key="item" :prop="item" :label="item" />
-    </el-table>
-  </div>
-</template>
-
-<script>
-import UploadExcelComponent from '@/components/UploadExcel/index.vue';
-
-export default {
-  name: 'UploadExcel',
-  components: { UploadExcelComponent },
-  data() {
-    return {
-      tableData: [],
-      tableHeader: [],
-    };
-  },
-  methods: {
-    beforeUpload(file) {
-      const isLt1M = file.size / 1024 / 1024 < 1;
-      if (isLt1M) {
-        return true;
-      }
-
-      this.$message({
-        message: '请不要上传大于1m的文件.',
-        type: 'warning',
-      });
-      return false;
-    },
-    handleSuccess({ results, header }) {
-      this.tableData = results;
-      this.tableHeader = header;
-    },
-  },
-};
-</script>
+<template>
+  <div class="app-container">
+    <upload-excel-component :on-success="handleSuccess" :before-upload="beforeUpload" />
+    <el-table :data="tableData" border highlight-current-row style="width: 100%; margin-top: 20px">
+      <el-table-column v-for="item of tableHeader" :key="item" :prop="item" :label="item" />
+    </el-table>
+  </div>
+</template>
+
+<script>
+import UploadExcelComponent from '@/components/UploadExcel/index.vue';
+
+export default {
+  name: 'UploadExcel',
+  components: { UploadExcelComponent },
+  data() {
+    return {
+      tableData: [],
+      tableHeader: [],
+    };
+  },
+  methods: {
+    beforeUpload(file) {
+      const isLt1M = file.size / 1024 / 1024 < 1;
+      if (isLt1M) {
+        return true;
+      }
+
+      this.$message({
+        message: '请不要上传大于1m的文件.',
+        type: 'warning',
+      });
+      return false;
+    },
+    handleSuccess({ results, header }) {
+      this.tableData = results;
+      this.tableHeader = header;
+    },
+  },
+};
+</script>

package/templates/vue-app/files/src/views/components/icons/element-icons.js

@@ -1,74 +1,74 @@
-const elementIcons = [
-  'info',
-  'error',
-  'success',
-  'warning',
-  'question',
-  'back',
-  'arrow-left',
-  'arrow-down',
-  'arrow-right',
-  'arrow-up',
-  'caret-left',
-  'caret-bottom',
-  'caret-top',
-  'caret-right',
-  'd-arrow-left',
-  'd-arrow-right',
-  'minus',
-  'plus',
-  'remove',
-  'circle-plus',
-  'remove-outline',
-  'circle-plus-outline',
-  'close',
-  'check',
-  'circle-close',
-  'circle-check',
-  'circle-close-outline',
-  'circle-check-outline',
-  'zoom-out',
-  'zoom-in',
-  'd-caret',
-  'sort',
-  'sort-down',
-  'sort-up',
-  'tickets',
-  'document',
-  'goods',
-  'sold-out',
-  'news',
-  'message',
-  'date',
-  'printer',
-  'time',
-  'bell',
-  'mobile-phone',
-  'service',
-  'view',
-  'menu',
-  'more',
-  'more-outline',
-  'star-on',
-  'star-off',
-  'location',
-  'location-outline',
-  'phone',
-  'phone-outline',
-  'picture',
-  'picture-outline',
-  'delete',
-  'search',
-  'edit',
-  'edit-outline',
-  'rank',
-  'refresh',
-  'share',
-  'setting',
-  'upload',
-  'upload2',
-  'download',
-  'loading',
-];
-
-export default elementIcons;
+const elementIcons = [
+  'info',
+  'error',
+  'success',
+  'warning',
+  'question',
+  'back',
+  'arrow-left',
+  'arrow-down',
+  'arrow-right',
+  'arrow-up',
+  'caret-left',
+  'caret-bottom',
+  'caret-top',
+  'caret-right',
+  'd-arrow-left',
+  'd-arrow-right',
+  'minus',
+  'plus',
+  'remove',
+  'circle-plus',
+  'remove-outline',
+  'circle-plus-outline',
+  'close',
+  'check',
+  'circle-close',
+  'circle-check',
+  'circle-close-outline',
+  'circle-check-outline',
+  'zoom-out',
+  'zoom-in',
+  'd-caret',
+  'sort',
+  'sort-down',
+  'sort-up',
+  'tickets',
+  'document',
+  'goods',
+  'sold-out',
+  'news',
+  'message',
+  'date',
+  'printer',
+  'time',
+  'bell',
+  'mobile-phone',
+  'service',
+  'view',
+  'menu',
+  'more',
+  'more-outline',
+  'star-on',
+  'star-off',
+  'location',
+  'location-outline',
+  'phone',
+  'phone-outline',
+  'picture',
+  'picture-outline',
+  'delete',
+  'search',
+  'edit',
+  'edit-outline',
+  'rank',
+  'refresh',
+  'share',
+  'setting',
+  'upload',
+  'upload2',
+  'download',
+  'loading',
+];
+
+export default elementIcons;