@ibiz-template/vue3-components 0.2.6 → 0.2.8

package/es/control/form/form-detail/form-mdctrl/form-mdctrl-container/form-mdctrl-container.mjs

@@ -27,7 +27,7 @@ const FormMDCtrlContainer = /* @__PURE__ */ defineComponent({
     const insertButtonClick = () => {
       emit("insertButtonClick");
     };
-    const hasCaption = !!c.model.caption;
+    const hasCaption = c.model.showCaption && !!c.model.caption;
     return {
       ns,
       c,
@@ -47,7 +47,7 @@ const FormMDCtrlContainer = /* @__PURE__ */ defineComponent({
         "class": this.ns.b("title")
       }, [createVNode("span", {
         "class": this.ns.b("caption")
-      }, [this.controller.model.caption]), withDirectives(createVNode(resolveComponent("el-button"), {
+      }, [this.controller.model.showCaption && this.controller.model.caption]), withDirectives(createVNode(resolveComponent("el-button"), {
         "class": this.ns.b("add-btn"),
         "onClick": () => this.insertButtonClick()
       }, {

package/es/control/index.d.ts

@@ -22,3 +22,4 @@ export * from './kanban';
 export * from './tree-grid-ex';
 export * from './tree-grid';
 export * from './medit-view-panel';
+export * from './map';

package/es/control/index.mjs

@@ -22,6 +22,7 @@ export { IBizKanbanControl } from './kanban/index.mjs';
 export { IBizTreeGridExControl } from './tree-grid-ex/index.mjs';
 export { IBizTreeGridControl } from './tree-grid/index.mjs';
 export { IBizMEditViewPanelControl } from './medit-view-panel/index.mjs';
+export { IBizMapControl } from './map/index.mjs';
 export { AppMenuProvider } from './app-menu/app-menu.provider.mjs';
 export { AppMenuIconViewProvider } from './app-menu-icon-view/app-menu-icon-view.provider.mjs';
 export { GridProvider } from './grid/grid/grid.provider.mjs';

package/es/control/map/index.d.ts

@@ -0,0 +1,5 @@
+import { App } from 'vue';
+export declare const IBizMapControl: {
+    install(v: App): void;
+};
+export default IBizMapControl;

package/es/control/map/index.mjs

@@ -0,0 +1,13 @@
+import { ControlType, registerControlProvider } from '@ibiz-template/runtime';
+import MapControl from './map.mjs';
+import { MapProvider } from './map.provider.mjs';
+
+"use strict";
+const IBizMapControl = {
+  install(v) {
+    v.component(MapControl.name, MapControl);
+    registerControlProvider(ControlType.MAP, () => new MapProvider());
+  }
+};
+
+export { IBizMapControl, IBizMapControl as default };

package/es/control/map/map.css

@@ -0,0 +1 @@
+.ibiz-control-map{width:100%;height:100%}.ibiz-control-map__map{width:100%;height:100%}

package/es/control/map/map.d.ts

@@ -0,0 +1,62 @@
+import { PropType } from 'vue';
+import { ISysMap } from '@ibiz/model-core';
+import './map.scss';
+import { MapController, IControlProvider } from '@ibiz-template/runtime';
+declare const MapControl: import("vue").DefineComponent<{
+    modelData: {
+        type: PropType<ISysMap>;
+        required: true;
+    };
+    context: {
+        type: PropType<IContext>;
+        required: true;
+    };
+    params: {
+        type: PropType<IParams>;
+        default: () => {};
+    };
+    provider: {
+        type: PropType<IControlProvider>;
+    };
+    mdctrlActiveMode: {
+        type: NumberConstructor;
+        default: undefined;
+    };
+    loadDefault: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+}, {
+    c: MapController;
+    ns: import("@ibiz-template/core").Namespace;
+    mapRef: import("vue").Ref<any>;
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    modelData: {
+        type: PropType<ISysMap>;
+        required: true;
+    };
+    context: {
+        type: PropType<IContext>;
+        required: true;
+    };
+    params: {
+        type: PropType<IParams>;
+        default: () => {};
+    };
+    provider: {
+        type: PropType<IControlProvider>;
+    };
+    mdctrlActiveMode: {
+        type: NumberConstructor;
+        default: undefined;
+    };
+    loadDefault: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+}>>, {
+    params: IParams;
+    mdctrlActiveMode: number;
+    loadDefault: boolean;
+}, {}>;
+export default MapControl;

package/es/control/map/map.mjs

@@ -0,0 +1,71 @@
+import { ref, onMounted, resolveComponent, createVNode, defineComponent } from 'vue';
+import { useControlController, useNamespace } from '@ibiz-template/vue3-util';
+import './map.css';
+import { MapController } from '@ibiz-template/runtime';
+
+"use strict";
+const MapControl = /* @__PURE__ */ defineComponent({
+  name: "IBizMapControl",
+  props: {
+    modelData: {
+      type: Object,
+      required: true
+    },
+    context: {
+      type: Object,
+      required: true
+    },
+    params: {
+      type: Object,
+      default: () => ({})
+    },
+    provider: {
+      type: Object
+    },
+    mdctrlActiveMode: {
+      type: Number,
+      default: void 0
+    },
+    loadDefault: {
+      type: Boolean,
+      default: true
+    }
+  },
+  setup() {
+    const c = useControlController((...args) => new MapController(...args));
+    const ns = useNamespace(`control-${c.model.controlType.toLowerCase()}`);
+    const mapRef = ref();
+    onMounted(() => {
+    });
+    return {
+      c,
+      ns,
+      mapRef
+    };
+  },
+  render() {
+    const {
+      state
+    } = this.c;
+    return createVNode(resolveComponent("iBizControlBase"), {
+      "controller": this.c
+    }, {
+      default: () => [state.isLoaded && createVNode(resolveComponent("iBizMapChart"), {
+        "areaData": state.areaData,
+        "pointData": state.pointData,
+        "class": this.ns.e("map"),
+        "onMapChange": (e) => {
+          this.c.onMapChange(e.areaCode);
+        },
+        "onPointChange": (e) => {
+          this.c.onAreaClick(e);
+        },
+        "onAreaChange": (e) => {
+          this.c.onPointClick(e);
+        }
+      }, null)]
+    });
+  }
+});
+
+export { MapControl as default };

package/es/control/map/map.provider.d.ts

@@ -0,0 +1,13 @@
+import { IControlProvider } from '@ibiz-template/runtime';
+/**
+ * 地图适配器
+ *
+ * @author lxm
+ * @date 2022-10-25 18:10:57
+ * @export
+ * @class ChartProvider
+ * @implements {IControlProvider}
+ */
+export declare class MapProvider implements IControlProvider {
+    component: string;
+}

package/es/control/map/map.provider.mjs

@@ -0,0 +1,14 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
+class MapProvider {
+  constructor() {
+    __publicField(this, "component", "IBizMapControl");
+  }
+}
+
+export { MapProvider };

package/es/control/pickup-view-panel/pickup-view-panel.mjs

@@ -1,4 +1,4 @@
-import { toRefs, toRaw, watch, resolveComponent, h, createVNode, defineComponent } from 'vue';
+import { resolveComponent, h, createVNode, defineComponent } from 'vue';
 import { useControlController, useNamespace } from '@ibiz-template/vue3-util';
 import { PickupViewPanelController } from '@ibiz-template/runtime';
 import './pickup-view-panel.css';
@@ -38,18 +38,9 @@ const PickupViewPanelControl = /* @__PURE__ */ defineComponent({
       default: false
     }
   },
-  setup(props) {
+  setup() {
     const c = useControlController((...args) => new PickupViewPanelController(...args));
     const ns = useNamespace(`control-${c.model.controlType.toLowerCase()}`);
-    const {
-      context,
-      params
-    } = toRefs(props);
-    watch([context, params], () => {
-      c.context = toRaw(props.context);
-      c.params = toRaw(props.params);
-      c.initNavParam();
-    });
     const onCreated = (event) => {
       c.setEmbedView(event.view);
     };

package/es/editor/check-box-list/ibiz-checkbox-list/ibiz-checkbox-list.css

@@ -1 +1 @@
-.ibiz-checkbox-list__text{font-size:var(--ibiz-form-item-font-size);color:var(--ibiz-form-item-text-color)}.ibiz-checkbox-list--readonly{color:var(--ibiz-form-item-readonly-color)}
+.ibiz-checkbox-list__text{font-size:var(--ibiz-form-item-font-size);color:var(--ibiz-form-item-text-color)}.ibiz-checkbox-list--readonly{font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-editor-default-line-height);color:var(--ibiz-form-item-readonly-color)}

package/es/editor/data-picker/ibiz-mpicker/ibiz-mpicker.css

@@ -1 +1 @@
-@charset "UTF-8";.ibiz-mpicker{display:flex}.ibiz-mpicker input::-moz-placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-mpicker input::placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-mpicker .el-input.is-disabled .el-input__inner{color:var(--ibiz-form-item-disabled-color);background-color:var(--ibiz-form-item-disabled-bg-color);border-color:var(--ibiz-form-item-disabled-border-color)}.ibiz-mpicker .el-select{width:100%}.ibiz-mpicker ion-icon{font-size:var(--ibiz-form-item-font-size);cursor:pointer}.ibiz-mpicker__buns-position{position:relative;right:11px;display:inline-block}.ibiz-mpicker__btns{position:absolute;right:0;height:100%;color:var(--ibiz-form-item-placeholder-color);display:flex;align-items:center;justify-content:center}.ibiz-mpicker--disabled ion-icon{pointer-events:none}.ibiz-mpicker--readonly{color:var(--ibiz-form-item-readonly-color)}
+@charset "UTF-8";.ibiz-mpicker{display:flex}.ibiz-mpicker input::-moz-placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-mpicker input::placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-mpicker .el-input.is-disabled .el-input__inner{color:var(--ibiz-form-item-disabled-color);background-color:var(--ibiz-form-item-disabled-bg-color);border-color:var(--ibiz-form-item-disabled-border-color)}.ibiz-mpicker .el-select{width:100%}.ibiz-mpicker ion-icon{font-size:var(--ibiz-form-item-font-size);cursor:pointer}.ibiz-mpicker__buns-position{position:relative;right:11px;display:inline-block}.ibiz-mpicker__btns{position:absolute;right:0;height:100%;color:var(--ibiz-form-item-placeholder-color);display:flex;align-items:center;justify-content:center}.ibiz-mpicker--disabled ion-icon{pointer-events:none}.ibiz-mpicker--readonly{font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-editor-default-line-height);color:var(--ibiz-form-item-readonly-color)}

package/es/editor/data-picker/ibiz-mpicker/ibiz-mpicker.mjs

@@ -50,7 +50,11 @@ const IBizMPicker = /* @__PURE__ */ defineComponent({
             });
           });
         } else {
-          selectItems.value = JSON.parse(newVal);
+          try {
+            selectItems.value = JSON.parse(newVal);
+          } catch (error) {
+            ibiz.log.error(`SIMPLE\u7C7B\u578B\u5730\u5740\u680F\u503C\u683C\u5F0F${newVal}\u4E0D\u7B26\u5408JSON\u5B57\u7B26\u4E32\u8981\u6C42`);
+          }
         }
         selectItems.value.forEach((item) => {
           curValue.value.push(item[c.keyName]);

package/es/editor/data-picker/ibiz-picker-dropdown/ibiz-picker-dropdown.css

@@ -1 +1 @@
-.ibiz-picker-dropdown .el-select{width:100%}.ibiz-picker-dropdown .el-input .el-input__inner{font-size:var(--ibiz-form-item-font-size);color:var(--ibiz-form-item-text-color);border-color:var(--ibiz-form-item-border-color)}.ibiz-picker-dropdown .el-input .el-input__inner::-moz-placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-picker-dropdown .el-input .el-input__inner::placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-picker-dropdown .el-input.is-disabled .el-input__inner{color:var(--ibiz-form-item-disabled-color);background-color:var(--ibiz-form-item-disabled-bg-color);border-color:var(--ibiz-form-item-disabled-border-color)}.ibiz-picker-dropdown--readonly{color:var(--ibiz-form-item-readonly-color)}
+.ibiz-picker-dropdown .el-select{width:100%}.ibiz-picker-dropdown .el-input .el-input__inner{font-size:var(--ibiz-form-item-font-size);color:var(--ibiz-form-item-text-color);border-color:var(--ibiz-form-item-border-color)}.ibiz-picker-dropdown .el-input .el-input__inner::-moz-placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-picker-dropdown .el-input .el-input__inner::placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-picker-dropdown .el-input.is-disabled .el-input__inner{color:var(--ibiz-form-item-disabled-color);background-color:var(--ibiz-form-item-disabled-bg-color);border-color:var(--ibiz-form-item-disabled-border-color)}.ibiz-picker-dropdown--readonly{font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-editor-default-line-height);color:var(--ibiz-form-item-readonly-color)}

package/es/editor/data-picker/ibiz-picker-dropdown/ibiz-picker-dropdown.mjs

@@ -169,7 +169,7 @@ const IBizPickerDropDown = /* @__PURE__ */ defineComponent({
       }, [renderString(this.curValue)]);
     }
     return createVNode("div", {
-      "class": [this.ns.b(), this.disabled ? this.ns.m("disabled") : ""]
+      "class": [this.ns.b(), this.disabled ? this.ns.m("disabled") : "", this.readonly ? this.ns.m("readonly") : ""]
     }, [this.readonly ? this.value : createVNode(resolveComponent("el-select"), {
       "modelValue": this.refValue,
       "onUpdate:modelValue": ($event) => this.refValue = $event,

package/es/editor/date-picker/ibiz-date-picker/ibiz-date-picker.css

@@ -1 +1 @@
-.ibiz-date-picker .el-date-editor{width:100%}.ibiz-date-picker input{font-size:var(--ibiz-form-item-font-size);color:var(--ibiz-form-item-text-color);border-color:var(--ibiz-form-item-border-color)}.ibiz-date-picker input::-moz-placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-date-picker input::placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-date-picker input[disabled]{color:var(--ibiz-form-item-disabled-color);background-color:var(--ibiz-form-item-disabled-bg-color);border-color:var(--ibiz-form-item-disabled-border-color)}.ibiz-date-picker--readonly{color:var(--ibiz-form-item-readonly-color)}.ibiz-date-picker .el-input__wrapper .el-input__prefix{display:none}
+.ibiz-date-picker .el-date-editor{width:100%}.ibiz-date-picker input{font-size:var(--ibiz-form-item-font-size);color:var(--ibiz-form-item-text-color);border-color:var(--ibiz-form-item-border-color)}.ibiz-date-picker input::-moz-placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-date-picker input::placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-date-picker input[disabled]{color:var(--ibiz-form-item-disabled-color);background-color:var(--ibiz-form-item-disabled-bg-color);border-color:var(--ibiz-form-item-disabled-border-color)}.ibiz-date-picker--readonly{font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-editor-default-line-height);color:var(--ibiz-form-item-readonly-color)}.ibiz-date-picker .el-input__wrapper .el-input__prefix{display:none}

package/es/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.css

@@ -1 +1 @@
-.ibiz-dropdown{width:var(--ibiz-dropdown-width);--ibiz-dropdown-width:100%}.ibiz-dropdown__branch-node>.el-tree-node__content{--ibiz-color-disabled-text:var(--ibiz-color-text-0)}.ibiz-dropdown .el-select{width:100%}
+.ibiz-dropdown{width:var(--ibiz-dropdown-width);--ibiz-dropdown-width:100%}.ibiz-dropdown__branch-node>.el-tree-node__content{--ibiz-color-disabled-text:var(--ibiz-color-text-0)}.ibiz-dropdown .el-select{width:100%}.ibiz-dropdown--readonly{font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-editor-default-line-height);color:var(--ibiz-form-item-readonly-color)}

package/es/editor/radio-button-list/ibiz-radio/ibiz-radio.css

@@ -1 +1 @@
-.ibiz-radio__text{font-size:var(--ibiz-form-item-font-size);color:var(--ibiz-form-item-text-color)}.ibiz-radio--readonly{color:var(--ibiz-form-item-readonly-color)}
+.ibiz-radio__text{font-size:var(--ibiz-form-item-font-size);color:var(--ibiz-form-item-text-color)}.ibiz-radio--readonly{font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-editor-default-line-height);color:var(--ibiz-form-item-readonly-color)}

package/es/editor/text-box/input/input.css

@@ -1 +1 @@
-.ibiz-input{height:100%;font-size:var(--ibiz-form-item-font-size);font-weight:var(--ibiz-form-item-regular);--ibiz-input-min-height:32px;--ibiz-input-readonly-color:var(--ibiz-color-disabled-text);--ibiz-input-placeholder-color:var(--ibiz-color-text-2)}.ibiz-input__ai-chat{position:absolute;right:10px;bottom:10px;width:36px;height:36px;padding:8px;font-size:18px;color:var(--ibiz-color-primary-text);cursor:pointer;background-color:var(--ibiz-color-primary);border-radius:15px}.ibiz-input__ai-chat:hover{color:var(--ibiz-color-primary-hover-text);background-color:var(--ibiz-color-primary-hover)}.ibiz-input .el-input .el-input__inner{height:100%}.ibiz-input .el-input .el-input__inner::-moz-placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-input .el-input .el-input__inner::placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-input .el-textarea .el-textarea__inner{height:100%}.ibiz-input .el-textarea .el-textarea__inner::-moz-placeholder{color:var(--ibiz-form-item-placeholder-color);word-break:break-word;white-space:pre-wrap}.ibiz-input .el-textarea .el-textarea__inner::placeholder{color:var(--ibiz-form-item-placeholder-color);word-break:break-word;white-space:pre-wrap}.ibiz-input .ibiz-input-input{height:100%;min-height:var(--ibiz-input-min-height)}.ibiz-input--readonly{line-height:var(--ibiz-input-min-height);color:var(--ibiz-input-readonly-color)}.ibiz-input .el-input__suffix .ibiz-input__unit{font-style:normal}.ibiz-input--readonly{height:auto}
+.ibiz-input{height:100%;font-size:var(--ibiz-form-item-font-size);font-weight:var(--ibiz-form-item-regular);--ibiz-input-min-height:var(--ibiz-editor-default-line-height)}.ibiz-input__ai-chat{position:absolute;right:10px;bottom:10px;width:36px;height:36px;padding:8px;font-size:18px;color:var(--ibiz-color-primary-text);cursor:pointer;background-color:var(--ibiz-color-primary);border-radius:15px}.ibiz-input__ai-chat:hover{color:var(--ibiz-color-primary-hover-text);background-color:var(--ibiz-color-primary-hover)}.ibiz-input .el-input .el-input__inner{height:100%}.ibiz-input .el-input .el-input__inner::-moz-placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-input .el-input .el-input__inner::placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-input .el-textarea .el-textarea__inner{height:100%}.ibiz-input .el-textarea .el-textarea__inner::-moz-placeholder{color:var(--ibiz-form-item-placeholder-color);word-break:break-word;white-space:pre-wrap}.ibiz-input .el-textarea .el-textarea__inner::placeholder{color:var(--ibiz-form-item-placeholder-color);word-break:break-word;white-space:pre-wrap}.ibiz-input .ibiz-input-input{height:100%;min-height:var(--ibiz-input-min-height)}.ibiz-input--readonly{height:auto;line-height:var(--ibiz-input-min-height);color:var(--ibiz-form-item-readonly-color)}.ibiz-input .el-input__suffix .ibiz-input__unit{font-style:normal}

package/es/index.mjs

@@ -43,6 +43,7 @@ import { IBizKanbanControl } from './control/kanban/index.mjs';
 import { IBizTreeGridExControl } from './control/tree-grid-ex/index.mjs';
 import { IBizMEditViewPanelControl } from './control/medit-view-panel/index.mjs';
 import { IBizChartExpBarControl } from './control/exp-bar/chart-exp-bar/index.mjs';
+import { IBizMapControl } from './control/map/index.mjs';
 export { IBizIcon } from './common/icon/icon.mjs';
 export { IBizRouterView } from './common/router-view/router-view.mjs';
 export { IBizCol } from './common/col/col.mjs';
@@ -255,8 +256,9 @@ var index = {
     v.use(IBizTreeGridExControl);
     v.use(IBizMEditViewPanelControl);
     v.use(IBizChartExpBarControl);
+    v.use(IBizMapControl);
     v.use(IBizEditor);
   }
 };
 
-export { IBizAppMenuControl, IBizAppMenuIconViewControl, IBizCalendarControl, IBizCalendarExpBarControl, IBizCaptionBarControl, IBizChartControl, IBizChartExpBarControl, IBizCommonComponents, IBizDRBarControl, IBizDRTabControl, IBizDashboardControl, IBizDataViewControl, IBizDataViewExpBarControl, IBizEditFormControl, IBizEditor, IBizFormControl, IBizGridControl, IBizGridExpBarControl, IBizKanbanControl, IBizListControl, IBizListExpBarControl, IBizMEditViewPanelControl, IBizPanelComponents, IBizPanelControl, IBizPickupViewPanelControl, IBizPortalView, IBizSearchBarControl, IBizSearchFormControl, IBizTabExpPanelControl, IBizToolbarControl, IBizTreeControl, IBizTreeExpBarControl, IBizTreeGridControl, IBizTreeGridExControl, IBizView, IBizViewLayoutPanelControl, IBizWFStepTraceView, IBizWizardPanelControl, index as default };
+export { IBizAppMenuControl, IBizAppMenuIconViewControl, IBizCalendarControl, IBizCalendarExpBarControl, IBizCaptionBarControl, IBizChartControl, IBizChartExpBarControl, IBizCommonComponents, IBizDRBarControl, IBizDRTabControl, IBizDashboardControl, IBizDataViewControl, IBizDataViewExpBarControl, IBizEditFormControl, IBizEditor, IBizFormControl, IBizGridControl, IBizGridExpBarControl, IBizKanbanControl, IBizListControl, IBizListExpBarControl, IBizMEditViewPanelControl, IBizMapControl, IBizPanelComponents, IBizPanelControl, IBizPickupViewPanelControl, IBizPortalView, IBizSearchBarControl, IBizSearchFormControl, IBizTabExpPanelControl, IBizToolbarControl, IBizTreeControl, IBizTreeExpBarControl, IBizTreeGridControl, IBizTreeGridExControl, IBizView, IBizViewLayoutPanelControl, IBizWFStepTraceView, IBizWizardPanelControl, index as default };

package/es/view-engine/index-view.engine.mjs

@@ -1,4 +1,5 @@
 import { ViewEngineBase, ViewCallTag } from '@ibiz-template/runtime';
+import { isNil, isEmpty } from 'ramda';
 
 "use strict";
 class IndexViewEngine extends ViewEngineBase {
@@ -74,31 +75,30 @@ class IndexViewEngine extends ViewEngineBase {
   setTheme() {
     const viewStyle = this.view.model.viewStyle;
     const htmlDom = document.querySelector("html");
-    let removeClasses = [];
-    let addClass = "";
+    let themeClass = "";
     if (htmlDom && viewStyle) {
       switch (viewStyle) {
         case "DEFAULT":
-          removeClasses = ["dark", "omni-oa"];
-          addClass = "light";
+          if (!isNil(ibiz.config.theme) && !isEmpty(ibiz.config.theme)) {
+            themeClass = ibiz.config.theme;
+          } else {
+            themeClass = "light";
+          }
           break;
         case "STYLE2":
-          removeClasses = ["light", "omni-oa"];
-          addClass = "dark";
+          themeClass = "dark";
           break;
         case "STYLE3":
-          removeClasses = ["light", "dark"];
-          addClass = "omni-oa";
+          themeClass = "omni-oa";
           break;
         default:
-          removeClasses = ["dark", "omni-oa"];
-          addClass = "light";
+          themeClass = "light";
           break;
       }
-      removeClasses.forEach((removeClass) => {
+      htmlDom.classList.forEach((removeClass) => {
         htmlDom.classList.remove(removeClass);
       });
-      htmlDom.classList.add(addClass);
+      htmlDom.classList.add(themeClass);
     }
   }
   calcViewHeaderVisible() {

package/es/view-engine/mpickup-view-engine.mjs

@@ -1,3 +1,4 @@
+import { RuntimeModelError } from '@ibiz-template/core';
 import { SysUIActionTag } from '@ibiz-template/runtime';
 import { PickupViewEngine } from './pickup-view.engine.mjs';
 
@@ -24,6 +25,14 @@ class MPickupViewEngine extends PickupViewEngine {
    */
   async onCreated() {
     await super.onCreated();
+    if (!this.view.providers.simplelist) {
+      throw new RuntimeModelError(
+        this.view.model,
+        "\u7F3A\u5C11\u914D\u7F6E\u53EBsimplelist\u7684\u5217\u8868\u90E8\u4EF6"
+      );
+    }
+    const { childNames } = this.view;
+    childNames.push("simplelist");
     if (this.view.params.selectedData) {
       this.selectData = JSON.parse(this.view.params.selectedData);
       delete this.view.params.selectedData;

package/es/view-engine/wf-dyna-edit-view.engine.mjs

@@ -106,7 +106,8 @@ class WFDynaEditViewEngine extends EditViewEngine {
   async calcProcessFormName() {
     const res = await this.entityService.wf.getWFStep(this.view.params);
     this.isEditable = res.data.isEditable === "true";
-    const processForm = res.data["process-mobform"] ? `wfform_${res.data["process-mobform"]}` : "form";
+    const key = `process-${ibiz.env.isMob ? "mob" : ""}form`;
+    const processForm = res.data[key] ? `wfform_${res.data[key]}` : "form";
     return processForm;
   }
   /**

package/lib/common/index.cjs

@@ -2,6 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var vue = require('vue');
 var actionToolbar = require('./action-toolbar/action-toolbar.cjs');
 var col = require('./col/col.cjs');
 var icon = require('./icon/icon.cjs');
@@ -41,6 +42,12 @@ const IBizCommonComponents = {
     v.component(viewMessage.ViewMessage.name, viewMessage.ViewMessage);
     v.component(pagination.IBizPagination.name, pagination.IBizPagination);
     v.component(sortBar.IBizSortBar.name, sortBar.IBizSortBar);
+    v.component(
+      "IBizMapChart",
+      vue.defineAsyncComponent({
+        loader: () => Promise.resolve().then(function () { return require('./map-chart/map-chart.cjs'); })
+      })
+    );
   }
 };
 

package/lib/common/map-chart/map-chart.cjs

@@ -0,0 +1,221 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var vue = require('vue');
+var ramda = require('ramda');
+var vue3Util = require('@ibiz-template/vue3-util');
+var mapChart_util = require('./map-chart.util.cjs');
+var mapManager = require('./map-manager.cjs');
+require('./map-chart.css');
+
+"use strict";
+const IBizMapChart = /* @__PURE__ */ vue.defineComponent({
+  name: "IBizMapChart",
+  props: {
+    areaData: {
+      type: Array
+    },
+    pointData: {
+      type: Array
+    },
+    options: {
+      type: Object,
+      default: () => ({})
+    },
+    defaultAreaCode: {
+      type: String,
+      required: true,
+      default: "320000"
+    }
+  },
+  setup(props, {
+    emit
+  }) {
+    const ns = vue3Util.useNamespace("map-chart");
+    const options = vue.computed(() => ramda.mergeDeepRight(mapChart_util.defaultOpts, props.options));
+    const findData = (id, type) => {
+      if (type === "area" && props.areaData) {
+        return props.areaData.find((item) => item._id === id);
+      }
+      if (type === "point" && props.pointData) {
+        return props.pointData.find((item) => item._id === id);
+      }
+    };
+    const {
+      chartRef,
+      historyNames,
+      changeMap,
+      getCityName,
+      goBack,
+      refresh
+    } = mapManager.useMapManager(options, (mapName) => {
+      const {
+        visualMap,
+        pointSymbol
+      } = options.value;
+      const areaData2 = props.areaData || [];
+      const pointData2 = props.pointData || [];
+      const result = {
+        geo: {
+          map: mapName
+        },
+        tooltip: {
+          trigger: "item",
+          // 全局的tooltip样式
+          textStyle: {
+            color: "#fff",
+            fontSize: 12
+          },
+          backgroundColor: "rgba(0, 0, 0, 0.47)",
+          borderWidth: 0,
+          extraCssText: "backdrop-filter: blur(3px);"
+        },
+        visualMap: {
+          min: visualMap.min,
+          max: visualMap.max,
+          text: visualMap.text,
+          realtime: false,
+          hoverLink: false,
+          inRange: {
+            color: visualMap.rangeColor
+          }
+        },
+        series: [
+          // 地图区块序列
+          {
+            type: "map",
+            map: mapName,
+            // 地图JSON里和name匹配的属性名称
+            nameProperty: "adcodeStr",
+            itemStyle: {
+              borderColor: "#FFF",
+              borderWidth: 2
+            },
+            tooltip: {
+              formatter: (params) => {
+                if (!params.data) {
+                  return;
+                }
+                const find = findData(params.data._id, "area");
+                if (!find) {
+                  return;
+                }
+                return find._tooltip;
+              }
+            },
+            label: {
+              // 区块文字固定显示
+              show: true,
+              // 字体样式
+              color: "#000000",
+              fontSize: 14,
+              formatter: (params) => {
+                return getCityName(params.name);
+              }
+            },
+            select: {
+              disabled: true
+            },
+            data: areaData2.map((item) => ({
+              name: `${item._areaCode}`,
+              value: item._value,
+              _id: item._id
+            }))
+          },
+          // 地图散点序列
+          {
+            type: "scatter",
+            coordinateSystem: "geo",
+            symbol: pointSymbol,
+            symbolSize: 20,
+            visualMap: false,
+            itemStyle: {
+              color: "#FF1D00"
+            },
+            label: {
+              show: true,
+              // 字体样式
+              color: "#000000",
+              fontSize: 14,
+              textShadowBlur: 0,
+              formatter: (params) => {
+                const find = findData(params.data._id, "point");
+                return find == null ? void 0 : find._text;
+              },
+              // 偏移
+              position: "left",
+              offset: [10, -15]
+            },
+            tooltip: {
+              formatter: (params) => {
+                const find = findData(params.data._id, "point");
+                return find == null ? void 0 : find._tooltip;
+              }
+            },
+            data: pointData2.map((item) => {
+              return {
+                _id: item._id,
+                symbol: item._symbol ? `image://${item._symbol}` : void 0,
+                value: [Number(item._longitude), Number(item._latitude)],
+                // 每个点逃离visualMap
+                visualMap: false
+              };
+            })
+          }
+        ]
+      };
+      return result;
+    }, (name, e) => {
+      switch (name) {
+        case "mapChange":
+          emit("mapChange", e);
+          break;
+        case "pointClick":
+          emit("pointClick", {
+            data: findData(e._id, "point")
+          });
+          break;
+        case "areaClick":
+          emit("areaClick", {
+            data: findData(e._id, "area")
+          });
+          break;
+        default:
+          break;
+      }
+    });
+    vue.onMounted(() => {
+      changeMap(props.defaultAreaCode, true);
+    });
+    const {
+      areaData,
+      pointData
+    } = vue.toRefs(props);
+    vue.watch([areaData, pointData], () => {
+      refresh();
+    });
+    return {
+      ns,
+      chartRef,
+      historyNames,
+      goBack
+    };
+  },
+  render() {
+    return vue.createVNode("div", {
+      "class": this.ns.b()
+    }, [vue.createVNode("div", {
+      "class": this.ns.e("chart"),
+      "ref": "chartRef"
+    }, null), this.historyNames.length > 1 && vue.createVNode("div", {
+      "class": this.ns.e("goback"),
+      "onClick": () => {
+        this.goBack();
+      }
+    }, [vue.createTextVNode("\u8FD4\u56DE")])]);
+  }
+});
+
+exports.IBizMapChart = IBizMapChart;
+exports.default = IBizMapChart;

package/lib/common/map-chart/map-chart.css

@@ -0,0 +1 @@
+.ibiz-map-chart{position:relative;min-width:300px;min-height:300px}.ibiz-map-chart__chart{width:100%;height:100%}.ibiz-map-chart__goback{position:absolute;top:60px;right:0;width:100px;height:100px;font-size:20px;color:#002a5f;text-decoration:underline;letter-spacing:6px;cursor:pointer}