emacroh5lib 1.0.85 → 1.0.87

package/dist/emacroh5lib.min.js.LICENSE.txt

@@ -36,10 +36,6 @@ Licensed under MIT. https://github.com/101arrowz/fflate/blob/master/LICENSE
 version 0.6.9
 */
 
-/*! sheetjs (C) 2013-present SheetJS -- http://sheetjs.com */
-
-/*! xlsx.js (C) 2013-present SheetJS -- http://sheetjs.com */
-
 /**
   * vue-class-component v7.2.3
   * (c) 2015-present Evan You

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emacroh5lib",
-  "version": "1.0.85",
+  "version": "1.0.87",
   "description": "EMacro前端组件库",
   "main": "dist/emacroh5lib.min.js",
   "scripts": {
@@ -79,6 +79,7 @@
     "@types/js-cookie": "^3.0.1",
     "@vue/cli-plugin-typescript": "^5.0.4",
     "axios": "^0.26.1",
+    "blueimp-md5": "^2.19.0",
     "browser-md5-file": "^1.1.1",
     "core-js": "^3.22.2",
     "deep-eql": "^4.0.0",

package/src/index.ts

@@ -1,6 +1,6 @@
 
 import { EMacro } from "./utilities/EMacro";
-
+import TaskScheduler from "./utilities/TaskScheduler";
 
 import FileViewer from './views/FileViewer/index.vue'
 import ImageViewer from './views/ImageViewer/index.vue'
@@ -34,4 +34,4 @@ if (typeof window !== 'undefined' && (window as any).Vue) {
 
 
 export default {}
-export { EMacro, FileViewer, ImageViewer, VideoViewer, ModelViewer, DragResizeView, HtmlViewer }
+export { EMacro, FileViewer, ImageViewer, VideoViewer, ModelViewer, DragResizeView, HtmlViewer, TaskScheduler }

package/src/utilities/EMacro.ts

@@ -1,8 +1,7 @@
 
 import XLSX from "xlsx";
 // import XLSX from "./dist/xlsx.js";
- 
-
+  
 
 // const XLSX = require("./dist/xlsx.js")
 import BMF from 'browser-md5-file';
@@ -306,6 +305,8 @@ export namespace EMacro {
         }
     }
 
+ 
+
 }
 
 

package/src/utilities/TaskScheduler.js

@@ -0,0 +1,244 @@
+
+import md5 from "blueimp-md5"
+
+class STATE {
+    // 未就绪
+    static NotReady = 0
+    // 就绪
+    static Ready = 1
+    // 运行中
+    static Running = 2
+    // 已删除
+    static Deleted = 3
+    // 任务执行异常
+    static Error = 4
+}
+
+class FunctionUtil {
+
+    static createFunction(fun) {
+
+        if (typeof fun === 'function') {
+            return fun
+        } else if (typeof fun === 'string') {
+            return new Function('return ' + fun)();
+        } else {
+            return null
+        }
+    }
+
+    static getParamNames(fun) {
+
+        if (typeof fun !== 'function') {
+            throw Error("参数fun必须是function类型")
+        }
+
+        let funStr = fun.toString();
+        // let _param = fun.toString().match(/function\s*([^(].+[\)$])/)[1];
+        // _param = _param.substring(this.getName().length + 1, _param.length-1);
+
+        let paramNames = funStr.substring(funStr.indexOf('(') + 1, funStr.indexOf(')'));
+        if (paramNames.length <= 0) return [];
+        paramNames = paramNames.split(',').map(function (name) { // 清洗多余字符
+            return name.match(/\w+/)[0]
+        });
+
+        return paramNames;
+    }
+
+    static getFunctionName(fun) {
+
+        let _callee = fun.toString().replace(/[\s\?]*/g, ""),
+            comb = _callee.length >= 50 ? 50 : _callee.length;
+        _callee = _callee.substring(0, comb);
+        let name = _callee.match(/^function([^\(]+?)\(/);
+        if (name && name[1])
+            return name[1];
+
+        let caller = fun.caller,
+            _caller = caller.toString().replace(/[\s\?]*/g, "");
+        let last = _caller.indexOf(_callee),
+            str = _caller.substring(last - 30, last);
+        name = str.match(/var([^\=]+?)\=/);
+        if (name && name[1])
+            return name[1];
+
+        return "anonymous"
+    }
+
+}
+
+class Task {
+
+    constructor(fun, config) {
+
+        const funMd5 = md5(fun.toString())
+        if (typeof config === 'number') {
+            this.interval = parseInt(config)
+            this.immediate = true
+            this.name = funMd5
+        } else if (typeof config === 'object') {
+            const { interval, immediate, name, onStop, onError } = config
+            this.interval = parseInt(interval)
+            this.immediate = immediate
+            this.name = name || funMd5
+            this.onStop = onStop
+            this.onError = onError
+        }
+
+        this.callback = fun
+        this.executions = 0 // 函数执行次数 
+        this.state = STATE.NotReady
+        this.timerIdList = []
+    }
+
+    execute() {
+
+        return new Promise((resolve, reject) => {
+
+            try {
+                if (this.state != STATE.Ready)
+                    return reject(this)
+
+                this.state = STATE.Running
+
+                this.callback()
+
+                this.executions++
+                this.state = STATE.Ready
+                return resolve(this)
+            } catch (error) {
+                this.state = STATE.Ready
+                this.error = error
+                return reject(this)
+            }
+
+        })
+    }
+
+    ready() {
+        if (this.state == STATE.Ready) {
+            console.warn("task already running", this);
+            return
+        }
+        this.state = STATE.Ready
+    }
+
+    stop() {
+        if (this.state == STATE.NotReady) {
+            console.warn("task is stopped", this);
+            return
+        }
+        this.state = STATE.NotReady
+    }
+
+    clearTimer() {
+        while (this.timerIdList.length > 0)
+            clearTimeout(this.timerIdList.splice(-1, 1))
+    }
+
+}
+
+class TaskScheduler {
+
+    static taskMap = new Map()
+
+    static createTask(fun, config) {
+
+        if (typeof config !== 'number' && typeof config !== 'object') {
+            throw Error('argument config must be a number or an object')
+        }
+
+        if (typeof fun === 'string')
+            fun = FunctionUtil.createFunction(fun)
+
+        if (typeof fun !== 'function')
+            throw Error('invalid argument', fun)
+
+        const task = new Task(fun, config)
+        TaskScheduler.taskMap.set(task.name, task)
+        return task
+    }
+
+    static runAllTask() {
+
+        for (const iterator of TaskScheduler.taskMap) {
+            const name = iterator[0]
+            const task = iterator[1]
+
+            if (isNaN(task.interval) || task.interval <= 0) {
+                console.warn("the interval of the task is invalid", task);
+                continue
+            }
+
+            if (task.state !== STATE.Ready)
+                task.ready()
+            const interval = task.interval
+            if (task.immediate)
+                task.interval = 0
+            setTimeout(() => {
+                TaskScheduler.runTask(task)
+                task.interval = interval
+            }, task.interval);
+
+        }
+    }
+
+    static stopAllTask() {
+        for (const iterator of TaskScheduler.taskMap) {
+            const name = iterator[0]
+            const task = iterator[1]
+            task.stop()
+        }
+    }
+
+    static runTask(task) {
+
+        if (task.state != STATE.Ready) {
+
+            task.onStop && task.onStop()
+            if (task.state == STATE.NotReady) {
+            } else if (task.state == STATE.Deleted) {
+            }
+            task.clearTimer()
+            task = null
+            return
+        }
+
+        task.execute()
+            .then(() => {
+                while (task.timerIdList.length > 2)
+                    clearTimeout(task.timerIdList.splice(-1, 1))
+                task.timerIdList.push(setTimeout(() => TaskScheduler.runTask(task), task.interval))
+            }).catch((task) => {
+                task.state = STATE.Error
+                task.onError && task.onError()
+                task.clearTimer()
+                console.error("task scheduling exception", task);
+            })
+    }
+
+    static stopTask(name) {
+        const task = TaskScheduler.taskMap.get(name)
+        if (task) {
+            task.stop()
+        } else {
+            console.warn('not found task: ' + name);
+        }
+    }
+
+    static deleteTask(name) {
+
+        const task = TaskScheduler.taskMap.get(name)
+        if (task) {
+            task.state = STATE.Deleted
+        } else {
+            console.warn('not found task: ' + name);
+            return false
+        }
+        return TaskScheduler.taskMap.delete(name)
+    }
+
+}
+
+export default TaskScheduler

package/src/views/ModelViewer/index.vue

@@ -132,6 +132,10 @@
       background: {
         type: Number,
         default: 0xb9d3ff,
+      },
+      transparency: {
+        type: Number,
+        default: 0.6,
       }
     },
     computed: {
@@ -774,7 +778,7 @@
            */
           this.gl.renderer = new THREE.WebGLRenderer({ alpha: true, antialias: true });
           this.gl.renderer.setSize(width, height); //设置渲染区域尺寸
-          this.gl.renderer.setClearColor(this.background, this.background == null ? 0 : 1); //设置背景颜色
+          this.gl.renderer.setClearColor(this.background, this.transparency); //设置背景颜色
 
           this.gl.WebGLoutput.innerHTML = ""
           this.gl.renderer.domElement.style.width = "100%"

package//345/214/205/350/243/205/347/272/277.mtl

@@ -1,103 +0,0 @@
-# WaveFront *.mtl file (generated by Cinema 4D)
-
-newmtl default
-Kd 1 1 1
-
-newmtl 材质.1
-Ka 1 1 1
-Kd 0.12300000339746 0.12884999811649 0.15000000596046
-Ks 1 1 1
-Ns 50
-illum 7
-
-newmtl 材质.10
-Ka 1 1 1
-Kd 0.95999997854233 0.79295998811722 0.12479999661446
-Ks 1 1 1
-Ns 50
-illum 7
-
-newmtl 材质.7
-Ka 1 1 1
-Kd 1 1 1
-Ks 1 1 1
-Ns 90
-illum 7
-
-newmtl 材质.4
-Ka 1 1 1
-Kd 0.9200000166893 0.9200000166893 0.9200000166893
-Ks 1 1 1
-Ns 4
-illum 7
-
-newmtl 材质.2
-Ka 1 1 1
-Kd 0.87000000476837 0.21750000119209 0.21750000119209
-Ks 1 1 1
-Ns 50
-illum 7
-
-newmtl 材质.9
-Ka 1 1 1
-Kd 1 1 1
-Ks 0.68000000715256 0.59273332357407 0.30599999427795
-Ns 90
-illum 7
-
-newmtl 材质.5
-Ka 1 1 1
-Kd 0.23275999724865 0.200100004673 0.68999999761581
-Ks 1 1 1
-Ns 50
-illum 7
-
-newmtl 材质.6
-Ka 1 1 1
-Kd 1 1 1
-Ks 1 1 1
-Ns 50
-illum 7
-
-newmtl 材质.8
-Ka 1 1 1
-Kd 0.75999999046326 0.37873333692551 0.22800000011921
-Ks 1 1 1
-Ns 50
-illum 7
-
-newmtl 材质
-Ka 1 1 1
-Kd 0.62999999523163 0.62999999523163 0.62999999523163
-Ks 1 1 1
-Ns 50
-illum 7
-
-newmtl 材质.1
-Ka 1 1 1
-Kd 0.15639999508858 0.15934666991234 0.17000000178814
-Ks 1 1 1
-Ns 50
-illum 7
-
-newmtl 材质
-Ka 1 1 1
-Kd 0.78200000524521 0.79673331975937 0.85000002384186
-Ks 1 1 1
-Ns 50
-illum 7
-
-newmtl 材质.10
-Ka 1 1 1
-Kd 0.95999997854233 0.79295998811722 0.12479999661446
-Ks 1 1 1
-Ns 50
-illum 7
-
-newmtl 材质.3
-Ka 1 1 1
-Kd 0.88999998569489 0.82770001888275 0.14239999651909
-Ks 1 1 1
-Ns 50
-illum 7
-