Merge branch 'master' of ssh://code.fineres.com:7999/~dailer/fineui

bin/cli/worker/template/main_thread.helper.t

@@ -1,5 +1,7 @@
 import { ${WorkerName}MainThreadWorker } from './main_thread/${workerName}_main_thread';
 // 不需要一起打包的话则不需要引入这行
+// FuiWorkerPlugin中的属性会同步到fui-worker中，同时支持loader行内传入属性
+// 根据实际需求传入inline，返回格式 true -> blob url，false -> servicePath
 import { workerUrl } from 'fui-worker!./worker_thread/${workerName}_worker_thread';
 
 export class ${WorkerName}WorkerHelper {
@@ -23,6 +25,7 @@ export class ${WorkerName}WorkerHelper {
 
     /**
      * 格式化worker url，比如补充一些环境信息到参数里
+     * 可通过 #hash 将参数传入blob url
      * @param url worker url
      */
     private urlFormatter(url: string) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20220802151352",
+  "version": "2.0.20220805101538",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

plugins/webpack-fui-worker-plugin/index.js

@@ -5,6 +5,7 @@
 const path = require('path');
 const webpack = require('webpack');
 const { WorkerPluginName } = require('./constants');
+const ModuleFilenameHelpers = require('webpack/lib/ModuleFilenameHelpers');
 
 class FuiWorkerPlugin {
     constructor(options = {}) {
@@ -39,6 +40,39 @@ class FuiWorkerPlugin {
             // 动态添加 worker 的 worker-loader, 命名为 "fui-worker"
             compiler.options.resolveLoader.alias['fui-worker'] = path.resolve(__dirname, './worker-loader.js');
         });
+
+        // 将FuiWorkerPlugin的参数传递给fui-worker loader
+        compiler.hooks.compilation.tap(WorkerPluginName, compilation => {
+            compilation.hooks.normalModuleLoader.tap(WorkerPluginName, (context, module) => {
+                // 仅提供给fui-worker
+                const fuiLoader = module.loaders.find(loader => loader.loader.indexOf('fui-worker') !== -1);
+
+                if (fuiLoader) {
+                    const resource = module.resource;
+
+                    if (!resource) return;
+
+                    // fui-worker通过options读取
+                    context.options = context.options || {};
+
+                    const index = resource.indexOf('?');
+                    
+                    if (ModuleFilenameHelpers.matchObject(
+                            this.options,
+                            index < 0 ? resource : resource.substr(0, index)
+                        )) {
+                        for (const key of Object.keys(this.options)) {
+                            // 忽略关键属性
+                            if (key === "include" || key === "exclude" || key === "test") {
+                                continue;
+                            }
+                            
+                            context.options[key] = this.options[key];
+                        }
+                    }
+                }
+            })
+        })
     }
 }
 

plugins/webpack-fui-worker-plugin/worker-loader.js

@@ -43,7 +43,7 @@ function loader() {
     const entryFileName = `${FileNamePrefix}index`;
 
     // 获取传递给 loader 的 options
-    loaderUtils.getOptions(this) || {};
+    const options = Object.assign(loaderUtils.getOptions(this) || {}, this.options);
 
     // 创建 childCompiler, 用于实现 worker 构建为独立 js 资源
     const childCompiler = this._compilation.createChildCompiler(WorkerLoaderName, {
@@ -92,15 +92,24 @@ function loader() {
             return callback(error);
         }
 
-        return callback(
+        // 支持blob url形式
+        return options.inline
+            ? callback(
                 null,
                 // 插入代码的转译和压缩由主构建配置的 babel/ts loader 处理, 不需要 worker-worker 来处理
                 // 添加 @ts-nocheck 避免 ts-check 报错
                 `// @ts-nocheck
+                const blob = new Blob([${JSON.stringify(compilation.assets[entry].source())}]);
+                export const workerUrl = window.URL.createObjectURL(blob);
+                `
+            )
+            : callback(
+                null,
+                `// @ts-nocheck
                 const servicePath = __webpack_public_path__ + ${JSON.stringify(entry)};
                 export const workerUrl = servicePath;
                 `
-        );
+            )
     });
 
     return;

src/case/combo/iconcombo/combo.icon.js

@@ -20,7 +20,8 @@ BI.IconCombo = BI.inherit(BI.Widget, {
             adjustXOffset: 0,
             adjustYOffset: 0,
             offsetStyle: "left",
-            chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE
+            chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
+            isShowDown: true
         });
     },
 
@@ -42,7 +43,8 @@ BI.IconCombo = BI.inherit(BI.Widget, {
             height: o.height,
             iconWidth: o.iconWidth,
             iconHeight: o.iconHeight,
-            value: o.value
+            value: o.value,
+            isShowDown: o.isShowDown
         });
         this.popup = BI.createWidget(o.popup, {
             type: "bi.icon_combo_popup",

src/widget/time/time.combo.js

@@ -60,13 +60,14 @@
                 }
             };
             return {
-                type: "bi.htape",
+                type: "bi.horizontal_fill",
-                items: [{
+                cls: "bi-border bi-border-radius",
-                    type: "bi.absolute",
+                columnSize: ["fill", this.constants.iconWidth],
+                height: opts.height - 2,
+                width: opts.width - 2,
                 items: [{
                     el: {
                         type: "bi.combo",
-                            cls: "bi-border bi-border-radius",
                         container: opts.container,
                         toggle: false,
                         isNeedAdjustHeight: opts.isNeedAdjustHeight,
@@ -170,16 +171,11 @@
                             self.combo = _ref;
                         }
                     },
-                        top: 0,
-                        left: 0,
-                        right: 0,
-                        bottom: 0
                 }, {
                     el: {
                         type: "bi.icon_button",
-                            cls: "bi-trigger-icon-button time-font icon-size-16",
+                        cls: "bi-trigger-icon-button time-font",
                         width: this.constants.iconWidth,
-                            height: opts.height,
                         listeners: [{
                             eventName: BI.IconButton.EVENT_CHANGE,
                             action: function () {
@@ -194,9 +190,6 @@
                             self.triggerBtn = _ref;
                         }
                     },
-                        top: 0,
-                        right: 0
-                    }]
                 }]
             };
         },