@ibiz-template/vue3-components 0.5.7-alpha.6 → 0.5.7-alpha.9

package/lib/control/search-bar/filter-tree/filter-tree.cjs

@@ -9,6 +9,7 @@ require('./filter-tree.css');
 function _isSlot(s) {
   return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !vue.isVNode(s);
 }
+const ScriptValueRegex = /\$\{[^}]*\}/;
 const FilterModes = [{
   valueOP: runtime.ValueOP.EQ,
   label: "\u7B49\u4E8E(=)"
@@ -121,10 +122,12 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
       }
     });
     const onFieldSelect = (node, field) => {
+      node.value = null;
       node.field = field;
     };
     const onValueOPSelect = (node, valueOP) => {
       node.valueOP = valueOP;
+      node.value = null;
     };
     const onGroupLogicTypeChange = (node, logicType) => {
       node.logicType = logicType;
@@ -154,11 +157,18 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
         return null;
       }
       let editor = null;
+      let editorValue = node.value;
+      if (node.disabled && ScriptValueRegex.test(editorValue)) {
+        editorValue = editorValue.replace("${context.srfpersonid}", "\u5F53\u524D\u7528\u6237");
+        editorValue = editorValue.replace("${context.srforgid}", "\u5F53\u524D\u7EC4\u7EC7");
+      }
       if (filterC.editorProvider) {
         const component = vue.resolveComponent(filterC.editorProvider.formEditor);
         editor = vue.h(component, {
-          value: node.value,
+          key: filterC.editor.model.id,
+          value: editorValue,
           controller: filterC.editor,
+          disabled: node.disabled,
           data: {},
           onChange: (val) => {
             node.value = val;
@@ -180,6 +190,7 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
       return vue.createVNode("div", {
         "class": ns.b("item")
       }, [vue.createVNode(vue.resolveComponent("el-select"), {
+        "disabled": node.disabled,
         "model-value": node.field,
         "teleported": false,
         "class": ns.e("field-select"),
@@ -195,6 +206,7 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
       })) ? _slot : {
         default: () => [_slot]
       }), availableModes && availableModes.length > 0 && vue.createVNode(vue.resolveComponent("iBizFilterModeSelect"), {
+        "disabled": node.disabled,
         "class": ns.e("mode-select"),
         "value": node.valueOP,
         "modes": availableModes,

package/lib/control/search-bar/search-bar.cjs

@@ -120,7 +120,7 @@ const SearchBarControl = /* @__PURE__ */ vue.defineComponent({
           }, [groupItem.caption]);
         })])), this.c.model.enableGroup && this.c.isBackendSearchGroup && vue.createVNode(vue.resolveComponent("el-button"), {
           "class": this.ns.b("save"),
-          "title": "\u4FDD\u5B58",
+          "title": "\u4FDD\u5B58\u5206\u7EC4",
           "onClick": this.handleSave
         }, {
           default: () => [vue.createVNode("ion-icon", {

package/lib/panel-component/panel-app-login-view/panel-app-login-view.cjs

@@ -31,9 +31,25 @@ const PanelAppLoginView = /* @__PURE__ */ vue.defineComponent({
       result = [...result, ...props.controller.containerClass, ns.is("hidden", !props.controller.state.visible)];
       return result;
     });
+    const cssVars = vue.computed(() => {
+      let styles = {};
+      const pathName = window.location.pathname;
+      if (pathName) {
+        const lastIndex = pathName.lastIndexOf("/");
+        if (lastIndex !== -1) {
+          const path = pathName.substring(0, lastIndex + 1);
+          styles = {
+            "header-url": "url('".concat(path, "assets/images/login-header.png')"),
+            "avatar-url": "url('".concat(path, "assets/images/login-avatar.png')")
+          };
+        }
+      }
+      return ns.cssVarBlock(styles);
+    });
     return {
       ns,
-      classArr
+      classArr,
+      cssVars
     };
   },
   render() {
@@ -59,6 +75,7 @@ const PanelAppLoginView = /* @__PURE__ */ vue.defineComponent({
     });
     return vue.createVNode("div", {
       "class": this.classArr,
+      "style": this.cssVars,
       "onClick": () => {
         this.controller.onClick();
       }

package/lib/panel-component/panel-app-login-view/panel-app-login-view.css

@@ -1 +1 @@
-.ibiz-panel-app-login-view{display:flex;align-items:center;justify-content:center;width:100vw;height:100vh;background:linear-gradient(120deg,#a1c4fd 0,#c2e9fb 100%);--el-color-primary:#409eff}.ibiz-panel-app-login-view .el-input{--el-input-text-color:#606266;--el-input-border-color:#dcdfe6;--el-input-hover-border-color:#c0c4cc;--el-input-icon-color:#a8abb2}.ibiz-panel-app-login-view .el-button{--el-button-text-color:var(--el-color-white);--el-button-bg-color:var(--el-color-primary);--el-button-border-color:var(--el-color-primary);--el-button-outline-color:var(--el-color-primary-light-5);--el-button-active-color:var(--el-color-primary-dark-2);--el-button-hover-text-color:var(--el-color-white);--el-button-hover-link-text-color:var(--el-color-primary-light-5);--el-button-hover-bg-color:var(--el-color-primary-light-3);--el-button-hover-border-color:var(--el-color-primary-light-3);--el-button-active-bg-color:var(--el-color-primary-dark-2);--el-button-active-border-color:var(--el-color-primary-dark-2);--el-button-disabled-text-color:var(--el-color-white);--el-button-disabled-bg-color:var(--el-color-primary-light-5);--el-button-disabled-border-color:var(--el-color-primary-light-5)}.ibiz-panel-app-login-view .ibiz-panel-container--container1{width:430px;margin-bottom:80px}.ibiz-panel-app-login-view .ibiz-panel-container--container4{position:relative;height:150px;background:url(assets/images/login-header.png);background-size:100% 100%}.ibiz-panel-app-login-view .ibiz-panel-container--container4 .ibiz-rawitem{position:absolute;top:28%;left:50%;height:auto;font-size:var(--ibiz-font-size-header-2);font-weight:var(--ibiz-font-weight-bold);color:rgb(var(--ibiz-white));text-align:center;text-shadow:0 2px 6px rgba(0,0,0,.54);transform:translateX(-50%)}.ibiz-panel-app-login-view .ibiz-panel-container--container5{position:relative;height:380px;padding:100px 40px 40px;background:#fff}.ibiz-panel-app-login-view .ibiz-panel-container--container5 .el-input__inner:-webkit-autofill{box-shadow:0 0 0 1000px #fff inset;-webkit-text-fill-color:#606266}.ibiz-panel-app-login-view .ibiz-panel-container--container5 .el-input__prefix{width:20px;margin-left:-1px}.ibiz-panel-app-login-view .ibiz-panel-container--container5 ion-icon{font-size:16px}.ibiz-panel-app-login-view .ibiz-panel-container--container6{position:absolute;top:-50px;right:calc(50% - 50px);z-index:2;display:block;width:100px;height:100px;-webkit-user-select:none;-moz-user-select:none;user-select:none;background:url(assets/images/login-avatar.png);background-size:100% 100%;border:4px solid #fff;border-radius:50%}.ibiz-panel-app-login-view .ibiz-panel-container--container3>.ibiz-row>*+*{margin-left:10px}.ibiz-panel-app-login-view .ibiz-panel-container--container3>.ibiz-row>.ibiz-col{flex:1}.ibiz-panel-app-login-view .ibiz-panel-container--container3 .ibiz-panel-button{width:100%;padding:0}.ibiz-panel-app-login-view .ibiz-panel-container--container3 .ibiz-panel-button .el-button{font-weight:300;letter-spacing:2px}
+.ibiz-panel-app-login-view{--ibiz-panel-app-login-view-header-url:url("/assets/images/login-header.png");--ibiz-panel-app-login-view-avatar-url:url("/assets/images/login-avatar.png");display:flex;align-items:center;justify-content:center;width:100vw;height:100vh;background:linear-gradient(120deg,#a1c4fd 0,#c2e9fb 100%);--el-color-primary:#409eff}.ibiz-panel-app-login-view .el-input{--el-input-text-color:#606266;--el-input-border-color:#dcdfe6;--el-input-hover-border-color:#c0c4cc;--el-input-icon-color:#a8abb2}.ibiz-panel-app-login-view .el-button{--el-button-text-color:var(--el-color-white);--el-button-bg-color:var(--el-color-primary);--el-button-border-color:var(--el-color-primary);--el-button-outline-color:var(--el-color-primary-light-5);--el-button-active-color:var(--el-color-primary-dark-2);--el-button-hover-text-color:var(--el-color-white);--el-button-hover-link-text-color:var(--el-color-primary-light-5);--el-button-hover-bg-color:var(--el-color-primary-light-3);--el-button-hover-border-color:var(--el-color-primary-light-3);--el-button-active-bg-color:var(--el-color-primary-dark-2);--el-button-active-border-color:var(--el-color-primary-dark-2);--el-button-disabled-text-color:var(--el-color-white);--el-button-disabled-bg-color:var(--el-color-primary-light-5);--el-button-disabled-border-color:var(--el-color-primary-light-5)}.ibiz-panel-app-login-view .ibiz-panel-container--container1{width:430px;margin-bottom:80px}.ibiz-panel-app-login-view .ibiz-panel-container--container4{position:relative;height:150px;background:var(--ibiz-panel-app-login-view-header-url);background-size:100% 100%}.ibiz-panel-app-login-view .ibiz-panel-container--container4 .ibiz-rawitem{position:absolute;top:28%;left:50%;height:auto;font-size:var(--ibiz-font-size-header-2);font-weight:var(--ibiz-font-weight-bold);color:rgb(var(--ibiz-white));text-align:center;text-shadow:0 2px 6px rgba(0,0,0,.54);transform:translateX(-50%)}.ibiz-panel-app-login-view .ibiz-panel-container--container5{position:relative;height:380px;padding:100px 40px 40px;background:#fff}.ibiz-panel-app-login-view .ibiz-panel-container--container5 .el-input__inner:-webkit-autofill{box-shadow:0 0 0 1000px #fff inset;-webkit-text-fill-color:#606266}.ibiz-panel-app-login-view .ibiz-panel-container--container5 .el-input__prefix{width:20px;margin-left:-1px}.ibiz-panel-app-login-view .ibiz-panel-container--container5 ion-icon{font-size:16px}.ibiz-panel-app-login-view .ibiz-panel-container--container6{position:absolute;top:-50px;right:calc(50% - 50px);z-index:2;display:block;width:100px;height:100px;-webkit-user-select:none;-moz-user-select:none;user-select:none;background:var(--ibiz-panel-app-login-view-avatar-url);background-size:100% 100%;border:4px solid #fff;border-radius:50%}.ibiz-panel-app-login-view .ibiz-panel-container--container3>.ibiz-row>*+*{margin-left:10px}.ibiz-panel-app-login-view .ibiz-panel-container--container3>.ibiz-row>.ibiz-col{flex:1}.ibiz-panel-app-login-view .ibiz-panel-container--container3 .ibiz-panel-button{width:100%;padding:0}.ibiz-panel-app-login-view .ibiz-panel-container--container3 .ibiz-panel-button .el-button{font-weight:300;letter-spacing:2px}

package/lib/panel-component/panel-button/panel-button.cjs

@@ -30,12 +30,17 @@ const PanelButton = /* @__PURE__ */ vue.defineComponent({
       sysImage,
       codeName,
       itemStyle,
-      tooltip
+      tooltip,
+      buttonCssStyle
     } = props.modelData;
     const {
       panel,
       state
     } = props.controller;
+    const tempStyle = vue.ref("");
+    if (buttonCssStyle) {
+      tempStyle.value = buttonCssStyle;
+    }
     const captionText = vue.computed(() => {
       if (captionItemName && panel.data) {
         return panel.data[captionItemName.toLowerCase()];
@@ -86,13 +91,16 @@ const PanelButton = /* @__PURE__ */ vue.defineComponent({
       codeName,
       state,
       tooltip,
-      handleButtonClick
+      handleButtonClick,
+      buttonCssStyle,
+      tempStyle
     };
   },
   render() {
     if (this.state.visible) {
       return vue.createVNode("div", {
-        "class": [this.ns.b(), this.ns.m(this.codeName), this.ns.is("loading", this.state.loading), ...this.controller.containerClass]
+        "class": [this.ns.b(), this.ns.m(this.codeName), this.ns.is("loading", this.state.loading), ...this.controller.containerClass],
+        "style": this.tempStyle
       }, [vue.createVNode(vue.resolveComponent("el-button"), {
         "type": this.buttonType,
         "text": this.isText,

package/lib/panel-component/user-message/user-message.cjs

@@ -49,6 +49,7 @@ const UserMessage = /* @__PURE__ */ vue.defineComponent({
   },
   render() {
     return vue.createVNode("div", {
+      "title": "\u901A\u77E5",
       "class": [this.ns.b(), this.ns.m(this.modelData.id), ...this.controller.containerClass]
     }, [vue.createVNode(vue.resolveComponent("el-popover"), {
       "ref": "popoverRef",

package/lib/util/app-drawer/app-drawer-component.cjs

@@ -95,21 +95,19 @@ const AppDrawerComponent = /* @__PURE__ */ vue.defineComponent({
     };
   },
   render() {
-    return vue.createVNode(vue.resolveComponent("el-drawer"), {
-      "model-value": this.isShow,
-      "lock-scroll": true,
-      "size": this.size,
-      "class": this.ns.b(),
-      "z-index": this.drawerZIndex,
-      "direction": this.direction,
-      "before-close": this.onBeforeClose,
-      "onClosed": this.onClosed
-    }, {
-      default: () => {
-        var _a, _b;
-        return [(_b = (_a = this.$slots).default) == null ? void 0 : _b.call(_a, this.modal)];
-      }
-    });
+    var _a, _b;
+    const option = this.opts || {};
+    return vue.h(vue.resolveComponent("el-drawer"), {
+      modelValue: this.isShow,
+      lockScroll: true,
+      size: this.size,
+      class: this.ns.b(),
+      zIndex: this.drawerZIndex,
+      direction: this.direction,
+      beforeClose: this.onBeforeClose,
+      onClosed: this.onClosed,
+      ...option
+    }, (_b = (_a = this.$slots).default) == null ? void 0 : _b.call(_a, this.modal));
   }
 });
 function createDrawer(render, opts) {

package/lib/util/app-modal/app-modal-component.cjs

@@ -87,20 +87,17 @@ const AppModalComponent = /* @__PURE__ */ vue.defineComponent({
     };
   },
   render() {
-    return vue.createVNode(vue.resolveComponent("el-dialog"), {
-      "model-value": this.isShow,
-      "align-center": true,
-      "class": [this.ns.b(), this.options.placement && this.ns.m(this.options.placement), this.options.modalClass],
-      "style": this.customStyle,
-      "z-index": this.modalZIndex,
-      "onClosed": this.onClosed,
-      "before-close": this.onBeforeClose
-    }, {
-      default: () => {
-        var _a, _b;
-        return [(_b = (_a = this.$slots).default) == null ? void 0 : _b.call(_a, this.modal)];
-      }
-    });
+    var _a, _b;
+    return vue.h(vue.resolveComponent("el-dialog"), {
+      modelValue: this.isShow,
+      alignCenter: true,
+      class: [this.ns.b(), this.options.placement && this.ns.m(this.options.placement), this.options.modalClass],
+      style: this.customStyle,
+      zIndex: this.modalZIndex,
+      onClosed: this.onClosed,
+      onBeforeClose: this.onBeforeClose,
+      ...this.options
+    }, (_b = (_a = this.$slots).default) == null ? void 0 : _b.call(_a, this.modal));
   }
 });
 function createModal(render, opts) {

package/lib/util/open-view-util/open-view-util.cjs

@@ -46,7 +46,8 @@ class OpenViewUtil {
     const opts = {
       width: appView.width || "80%",
       height: appView.height || "80%",
-      footerHide: true
+      footerHide: true,
+      ...appView.modalOption
     };
     return vue3Util.openViewModal(
       {
@@ -64,7 +65,8 @@ class OpenViewUtil {
       height: appView.height,
       autoClose: true,
       placement: "bottom",
-      ...options
+      ...options,
+      ...appView.modalOption
     };
     return vue3Util.openViewPopover(
       event,
@@ -92,7 +94,8 @@ class OpenViewUtil {
     const opts = {
       width: appView.width,
       height: appView.height,
-      placement
+      placement,
+      ...appView.modalOption
     };
     return vue3Util.openViewDrawer(
       {

package/lib/view-engine/edit-view.engine.cjs

@@ -2,9 +2,26 @@
 
 var core = require('@ibiz-template/core');
 var runtime = require('@ibiz-template/runtime');
+var ramda = require('ramda');
 
 "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 EditViewEngine extends runtime.ViewEngineBase {
+  constructor() {
+    super(...arguments);
+    /**
+     * 实体名称
+     * @author lxm
+     * @date 2024-01-31 11:05:49
+     * @type {string}
+     */
+    __publicField(this, "deName");
+  }
   get form() {
     return this.view.getController("form");
   }
@@ -12,6 +29,7 @@ class EditViewEngine extends runtime.ViewEngineBase {
     await super.onCreated();
     const { childNames, modal } = this.view;
     childNames.push("form");
+    this.deName = runtime.calcDeCodeNameById(this.view.model.appDataEntityId);
     if (!this.view.slotProps.form) {
       this.view.slotProps.form = {};
     }
@@ -30,6 +48,7 @@ class EditViewEngine extends runtime.ViewEngineBase {
   }
   async onMounted() {
     await super.onMounted();
+    this.initMarkOpenData();
     const { model, evt } = this.view;
     const formDeId = this.form.model.appDataEntityId;
     const formDataStateChange = (event) => {
@@ -218,6 +237,77 @@ class EditViewEngine extends runtime.ViewEngineBase {
     );
     ibiz.mc.command.send({ srfdecodename: "SysTodo" }, "OBJECTUPDATED");
   }
+  /**
+   * 初始化标记打开数据相关逻辑
+   * @author lxm
+   * @date 2024-01-31 11:52:13
+   * @return {*}  {void}
+   */
+  initMarkOpenData() {
+    if (ramda.isNil(this.view.modal.routeDepth)) {
+      return;
+    }
+    let srfkey;
+    const callback = (data) => {
+      if (!this.view.state.activated) {
+        return;
+      }
+      const dataInfo = this.form.getData()[0].srfmajortext;
+      let actionMsg = "";
+      switch (data.action) {
+        case "VIEW":
+          actionMsg = "\u6D4F\u89C8\u4E86";
+          break;
+        case "EDIT":
+          actionMsg = "\u7F16\u8F91\u4E86";
+          break;
+        case "UPDATE":
+          actionMsg = "\u66F4\u65B0\u4E86";
+          break;
+        default:
+          break;
+      }
+      ibiz.notification.info({
+        position: "bottom-right",
+        title: data.username,
+        desc: "".concat(actionMsg, " ").concat(this.view.state.caption, "-").concat(dataInfo)
+      });
+    };
+    this.form.evt.on("onLoadSuccess", (event) => {
+      const formData = event.data[0];
+      srfkey = formData.srfkey;
+      ibiz.markOpenData.action(this.deName, srfkey, "VIEW");
+      ibiz.markOpenData.subscribe(this.deName, srfkey, callback);
+      this.view.evt.on("onDestroyed", () => {
+        ibiz.markOpenData.unsubscribe(this.deName, srfkey, callback);
+      });
+    });
+    let isWait = false;
+    const actionEdit = () => {
+      if (!srfkey || isWait) {
+        return;
+      }
+      isWait = true;
+      ibiz.markOpenData.action(this.deName, srfkey, "EDIT");
+      setTimeout(
+        () => {
+          isWait = false;
+        },
+        1e3 * 60 * 5
+      );
+    };
+    this.form.evt.on("onFormDataChange", actionEdit);
+    this.form.evt.on("onSaveSuccess", () => {
+      if (srfkey) {
+        ibiz.markOpenData.action(this.deName, srfkey, "UPDATE");
+      }
+    });
+    this.view.evt.on("onCloseView", () => {
+      if (srfkey) {
+        ibiz.markOpenData.action(this.deName, srfkey, "CLOSE");
+      }
+    });
+  }
 }
 
 exports.EditViewEngine = EditViewEngine;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-components",
-  "version": "0.5.7-alpha.6",
+  "version": "0.5.7-alpha.9",
   "description": "使用 rollup 编译 vue 组件或者 jsx",
   "main": "lib/index.cjs",
   "module": "es/index.mjs",
@@ -27,11 +27,11 @@
     "@floating-ui/dom": "^1.5.3",
     "@ibiz-template-plugin/ai-chat": "^0.0.1",
     "@ibiz-template-plugin/gantt": "0.1.1",
-    "@ibiz-template/core": "^0.5.7-alpha.6",
-    "@ibiz-template/model-helper": "^0.5.7-alpha.6",
-    "@ibiz-template/runtime": "^0.5.7-alpha.6",
+    "@ibiz-template/core": "^0.5.7-alpha.9",
+    "@ibiz-template/model-helper": "^0.5.7-alpha.9",
+    "@ibiz-template/runtime": "^0.5.7-alpha.9",
     "@ibiz-template/theme": "^0.5.0",
-    "@ibiz-template/vue3-util": "^0.5.7-alpha.6",
+    "@ibiz-template/vue3-util": "^0.5.7-alpha.9",
     "@ibiz/model-core": "^0.1.9",
     "@imengyu/vue3-context-menu": "^1.3.5",
     "@monaco-editor/loader": "^1.4.0",