@jeecg/online 1.0.1 → 3.4.3-GA

package/FormSchemaFactory.js

@@ -37,20 +37,22 @@ var __async = (__this, __arguments, generator) => {
 import { UploadTypeEnum } from "/@/components/Form/src/jeecg/components/JUpload";
 const SUBMIT_FLOW_KEY = "jeecg_submit_form_and_flow";
 const SUBMIT_FLOW_ID = "flow_submit_id";
+const ONL_FORM_TABLE_NAME = "online_form_table_name";
 const VALIDATE_FAILED = "validate-failed";
 const SETUP = "setup";
 const ENHANCEJS = "EnhanceJS";
 const FORM_VIEW_TO_QUERY_VIEW = {
-  "password": "text",
-  "file": "text",
-  "image": "text",
-  "textarea": "text",
-  "umeditor": "text",
-  "markdown": "text",
-  "checkbox": "list_multi",
-  "radio": "list"
+  password: "text",
+  file: "text",
+  image: "text",
+  textarea: "text",
+  umeditor: "text",
+  markdown: "text",
+  checkbox: "list_multi",
+  radio: "list"
 };
 const POP_CONTAINER = ".jeecg-online-modal .ant-modal-content";
+const ONL_AUTH_PRE = "online_";
 class IFormSchema {
   constructor(key, data) {
     this._data = data;
@@ -70,6 +72,7 @@ class IFormSchema {
     this.schemaProp = {};
     this.searchForm = false;
     this.disabled = false;
+    this.popContainer = "";
     this.handleWidgetAttr(data);
   }
   getFormItemSchema() {
@@ -81,7 +84,13 @@ class IFormSchema {
     let fs = {
       field: this.field,
       label: this.label,
-      component: "Input"
+      labelLength: 4,
+      component: "Input",
+      itemProps: {
+        labelCol: {
+          class: "online-form-label"
+        }
+      }
     };
     let rules = this.getRule();
     if (rules.length > 0 && this.onlyValidator) {
@@ -154,12 +163,12 @@ class IFormSchema {
         rules.push({ required: true, message: msg });
       }
     }
-    if (view == "sel_user") {
+    if ("sel_user" == view) {
       if (pattern === "only" && this.onlyValidator) {
         rules.push({ validator: this.onlyValidator });
       }
     }
-    if (view === "list" || view === "radio" || view === "markdown" || view === "pca" || view.indexOf("sel") >= 0 || view === "time") {
+    if ("list" === view || "radio" === view || "markdown" === view || "pca" === view || view.indexOf("sel") >= 0 || "time" === view) {
       return rules;
     }
     if (view.indexOf("upload") >= 0 || view.indexOf("file") >= 0 || view.indexOf("image") >= 0) {
@@ -192,17 +201,17 @@ class IFormSchema {
         schema.componentProps.disabled = true;
       }
       if (!schema.componentProps.hasOwnProperty("onChange")) {
-        schema.componentProps["onChange"] = (value) => {
+        schema.componentProps["onChange"] = (value, formData) => {
           if (value instanceof Event) {
             value = value.target.value;
           }
           if (value instanceof Array) {
             value = value.join(",");
           }
-          if (!this.formRef.value.$formValueChange) {
+          if (!this.formRef || !this.formRef.value || !this.formRef.value.$formValueChange) {
             console.log("\u5F53\u524D\u8868\u5355\u65E0\u6CD5\u89E6\u53D1change\u4E8B\u4EF6,field\uFF1A" + this.field);
           } else {
-            this.formRef.value.$formValueChange(this.field, value);
+            this.formRef.value.$formValueChange(this.field, value, formData);
           }
         };
       }
@@ -232,6 +241,8 @@ class IFormSchema {
   getPopContainer() {
     if (this.searchForm === true) {
       return "body";
+    } else if (this.popContainer) {
+      return `.${this.popContainer} .ant-modal-content`;
     } else {
       return POP_CONTAINER;
     }
@@ -245,6 +256,14 @@ class IFormSchema {
       }
     }
   }
+  setCustomPopContainer(modalClass) {
+    this.popContainer = modalClass;
+  }
+  getLinkFieldInfo() {
+    return "";
+  }
+  setOtherInfo(_arg) {
+  }
 }
 class InputWidget extends IFormSchema {
   getItem() {
@@ -276,6 +295,9 @@ class DateWidget extends IFormSchema {
         valueFormat: this.format,
         style: {
           width: "100%"
+        },
+        getPopupContainer: (_node) => {
+          return this.getModalAsContainer();
         }
       }
     });
@@ -285,23 +307,48 @@ class SelectWidget extends IFormSchema {
   constructor(key, data) {
     super(key, data);
     this.options = this.getOptions(data["enum"]);
+    this.dictTable = data["dictTable"];
+    this.dictText = data["dictText"];
+    this.dictCode = data["dictCode"];
   }
   getItem() {
     let item = super.getItem();
+    let component = this.getFormComponent();
+    let componentProps = this.getComponentProps();
     return Object.assign({}, item, {
-      component: "Select",
-      componentProps: {
-        options: this.options,
-        allowClear: true,
-        style: {
-          width: "100%"
-        },
-        getPopupContainer: (_node) => {
-          return this.getModalAsContainer();
-        }
-      }
+      component,
+      componentProps
     });
   }
+  getFormComponent() {
+    if (this.options.length > 0) {
+      return "Select";
+    } else {
+      return "JDictSelectTag";
+    }
+  }
+  getComponentProps() {
+    let props = {
+      allowClear: true,
+      style: {
+        width: "100%"
+      },
+      getPopupContainer: (_node) => {
+        return this.getModalAsContainer();
+      }
+    };
+    if (this.options.length > 0) {
+      props["options"] = this.options;
+    } else {
+      if (!this.dictTable) {
+        props["dictCode"] = this.dictCode;
+      } else {
+        let temp = `${this.dictTable},${this.dictText},${this.dictCode}`;
+        props["dictCode"] = encodeURI(temp);
+      }
+    }
+    return props;
+  }
   getOptions(array) {
     if (!array || array.length == 0) {
       return [];
@@ -496,9 +543,10 @@ class TreeCategoryWidget extends IFormSchema {
         multiple: this.multi,
         pid: pidValue,
         back: this.textField,
-        onChange: (_val, backVal) => {
+        onChange: (val, backVal) => {
           if (this.formRef) {
             this.formRef.value.setFieldsValue(backVal);
+            this.formRef.value.$formValueChange(this.field, val);
           }
         }
       };
@@ -572,7 +620,11 @@ class EditorWidget extends IFormSchema {
     let item = super.getItem();
     return Object.assign({}, item, {
       component: "JEditor",
-      componentProps: {}
+      componentProps: {
+        options: {
+          auto_focus: false
+        }
+      }
     });
   }
 }
@@ -852,6 +904,83 @@ class NumberWidget extends IFormSchema {
     return props;
   }
 }
+class LinkTableWidget extends IFormSchema {
+  constructor(key, data) {
+    super(key, data);
+    this.dictTable = data.dictTable;
+    this.dictText = data.dictText;
+    this.dictCode = data.dictCode;
+    this.view = data.view;
+    this.componentString = "";
+    this.linkFields = [];
+  }
+  getItem() {
+    let item = super.getItem();
+    const componentProps = this.getComponentProps();
+    return Object.assign({}, item, {
+      component: this.componentString,
+      componentProps
+    });
+  }
+  getComponentProps() {
+    let props = {
+      textField: this.dictText,
+      tableName: this.dictTable,
+      valueField: this.dictCode
+    };
+    let extend = this.getExtendData();
+    if (extend.multiSelect) {
+      props["multi"] = true;
+    } else {
+      props["multi"] = false;
+    }
+    if (extend.imageField) {
+      props["imageField"] = extend.imageField;
+    } else {
+      props["imageField"] = "";
+    }
+    if (extend.showType == "select") {
+      this.componentString = "LinkTableSelect";
+      let popContainer = this.getPopContainer();
+      props["popContainer"] = popContainer;
+    } else {
+      this.componentString = "LinkTableCard";
+    }
+    if (this.linkFields.length > 0) {
+      props["linkFields"] = this.linkFields;
+    }
+    return props;
+  }
+  setOtherInfo(arr) {
+    this.linkFields = arr;
+  }
+}
+class LinkTableFieldWidget extends IFormSchema {
+  constructor(key, data) {
+    super(key, data);
+    this.dictTable = data["dictTable"];
+    this.dictText = data["dictText"];
+  }
+  getItem() {
+    let item = super.getItem();
+    return Object.assign({}, item, {
+      componentProps: {
+        readOnly: true,
+        allowClear: false,
+        disabled: true,
+        style: {
+          background: "none",
+          color: "rgba(0, 0, 0, 0.85)",
+          border: "none"
+        }
+      }
+    });
+  }
+  getLinkFieldInfo() {
+    let arr = [this.dictTable, `${this.field},${this.dictText}`];
+    return arr;
+  }
+}
 class FormSchemaFactory {
   static createFormSchema(key, data) {
     let view = data.view;
@@ -899,6 +1028,10 @@ class FormSchemaFactory {
         return new TreeSelectWidget(key, data);
       case "switch":
         return new SwitchWidget(key, data);
+      case "link_table":
+        return new LinkTableWidget(key, data);
+      case "link_table_field":
+        return new LinkTableFieldWidget(key, data);
       case "slot":
         return new SlotWidget(key, data);
       case "hidden":
@@ -914,9 +1047,9 @@ class FormSchemaFactory {
   static createSlotFormSchema(key, data) {
     let slotFs = new SlotWidget(key, data);
     let view = data.view;
-    if (view == "date") {
+    if ("date" == view) {
       slotFs.groupDate();
-    } else if (view == "datetime") {
+    } else if ("datetime" == view) {
       slotFs.groupDatetime();
     } else {
       let type = data.type;
@@ -935,4 +1068,4 @@ class FormSchemaFactory {
     };
   }
 }
-export { ENHANCEJS as E, FormSchemaFactory as F, SUBMIT_FLOW_KEY as S, VALIDATE_FAILED as V, SUBMIT_FLOW_ID as a, FORM_VIEW_TO_QUERY_VIEW as b, SETUP as c };
+export { ENHANCEJS as E, FormSchemaFactory as F, ONL_FORM_TABLE_NAME as O, SUBMIT_FLOW_KEY as S, VALIDATE_FAILED as V, ONL_AUTH_PRE as a, SUBMIT_FLOW_ID as b, FORM_VIEW_TO_QUERY_VIEW as c, SETUP as d };

package/IndexTable.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, resolveComponent, openBlock, createBlock } from "vue";
+import { defineComponent, ref, resolveComponent, openBlock, createBlock, mergeProps } from "vue";
 import { JVxeTypes } from "/@/components/jeecg/JVxeTable/types";
 import { u as useTableSync } from "./useTableSync.js";
 import { _ as _export_sfc } from "./index.js";
@@ -7,6 +7,7 @@ import "/@/utils/dict";
 import "/@/utils/dict/JDictSelectUtil";
 import "/@/utils/uuid";
 import "./pick.js";
+import "./_flatRest.js";
 import "./isArray.js";
 import "./toString.js";
 import "./_arrayPush.js";
@@ -59,7 +60,7 @@ const _sfc_main = defineComponent({
       }
     ]);
     const setup = useTableSync(columns);
-    const { tableRef, loading, dataSource, tableHeight, setDataSource, validateData } = setup;
+    const { tableRef, loading, dataSource, tableHeight, tableProps, setDataSource, validateData } = setup;
     function syncTable(dbTable) {
       let options = [];
       let data = dbTable.value.tableRef.getTableData();
@@ -73,12 +74,12 @@ const _sfc_main = defineComponent({
       });
       columns.value[1].options = options;
     }
-    return { tableRef, loading, dataSource, columns, tableHeight, syncTable, setDataSource, validateData };
+    return { tableRef, loading, dataSource, columns, tableHeight, tableProps, syncTable, setDataSource, validateData };
   }
 });
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_JVxeTable = resolveComponent("JVxeTable");
-  return openBlock(), createBlock(_component_JVxeTable, {
+  return openBlock(), createBlock(_component_JVxeTable, mergeProps({
     ref: "tableRef",
     rowNumber: "",
     rowSelection: "",
@@ -90,7 +91,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     columns: _ctx.columns,
     dataSource: _ctx.dataSource,
     toolbar: _ctx.actionButton
-  }, null, 8, ["maxHeight", "loading", "columns", "dataSource", "toolbar"]);
+  }, _ctx.tableProps), null, 16, ["maxHeight", "loading", "columns", "dataSource", "toolbar"]);
 }
 var IndexTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 export { IndexTable as default };

package/JModalTip.js

@@ -0,0 +1,54 @@
+import { computed, openBlock, createElementBlock, createElementVNode, createCommentVNode, pushScopeId, popScopeId } from "vue";
+import { _ as _export_sfc } from "./index.js";
+import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
+import "/@/hooks/web/useMessage";
+import "vue-router";
+var JModalTip_vue_vue_type_style_index_0_scoped_true_lang = "";
+const _sfc_main = {
+  name: "JModalTip",
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    }
+  },
+  emits: ["save", "cancel"],
+  setup(props) {
+    const flag = computed(() => {
+      return props.visible;
+    });
+    return {
+      flag
+    };
+  }
+};
+const _withScopeId = (n) => (pushScopeId("data-v-c18755ca"), n = n(), popScopeId(), n);
+const _hoisted_1 = {
+  key: 0,
+  class: "jeecg-update-tip-bar"
+};
+const _hoisted_2 = { class: "container" };
+const _hoisted_3 = { class: "outer" };
+const _hoisted_4 = { class: "inner" };
+const _hoisted_5 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("span", { class: "tip" }, "\u6B63\u5728\u4FEE\u6539\u8868\u5355\u6570\u636E \xB7\xB7\xB7", -1));
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return $setup.flag ? (openBlock(), createElementBlock("div", _hoisted_1, [
+    createElementVNode("div", _hoisted_2, [
+      createElementVNode("div", _hoisted_3, [
+        createElementVNode("div", _hoisted_4, [
+          _hoisted_5,
+          createElementVNode("div", {
+            class: "cancel",
+            onClick: _cache[0] || (_cache[0] = ($event) => _ctx.$emit("cancel"))
+          }, "\u53D6\u6D88"),
+          createElementVNode("div", {
+            class: "save",
+            onClick: _cache[1] || (_cache[1] = ($event) => _ctx.$emit("save"))
+          }, "\u4FDD\u5B58")
+        ])
+      ])
+    ])
+  ])) : createCommentVNode("", true);
+}
+var JModalTip = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-c18755ca"]]);
+export { JModalTip as default };

package/JOnlineSearchSelect.js

@@ -27,16 +27,24 @@ const _sfc_main = {
   setup(props, { emit }) {
     let selected = ref("");
     let selectOptions = ref([]);
-    watch(() => props.value, (newVal) => {
-      if (!newVal) {
-        selected.value = void 0;
-      } else {
-        selected.value = newVal;
-      }
-    }, { immediate: true });
-    watch(() => props.sql, () => {
-      resetOptions();
-    }, { immediate: true });
+    watch(
+      () => props.value,
+      (newVal) => {
+        if (!newVal) {
+          selected.value = void 0;
+        } else {
+          selected.value = newVal;
+        }
+      },
+      { immediate: true }
+    );
+    watch(
+      () => props.sql,
+      () => {
+        resetOptions();
+      },
+      { immediate: true }
+    );
     const handleSearch = useDebounceFn(searchByKeyword, 800);
     function searchByKeyword(keyword = "") {
       let params = {

package/LeftDepart.js

@@ -84,7 +84,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     }, {
       depIcon: withCtx(({ selected }) => [
         createVNode(_component_a_icon, {
-          style: normalizeStyle({ "color": selected ? "blue" : "" }),
+          style: normalizeStyle({ color: selected ? "blue" : "" }),
           type: "apartment"
         }, null, 8, ["style"])
       ]),

package/LeftRole.js

@@ -59,10 +59,13 @@ const _sfc_main = defineComponent({
     const [registerTable, { clearSelectedRowKeys }, { rowSelection }] = tableContext;
     function loadData(params) {
       return __async(this, null, function* () {
-        let { code, success, result, message } = yield defHttp.get({
-          url: "/sys/role/list",
-          params
-        }, { isTransformResponse: false });
+        let { code, success, result, message } = yield defHttp.get(
+          {
+            url: "/sys/role/list",
+            params
+          },
+          { isTransformResponse: false }
+        );
         if (success) {
           return result;
         }

package/LeftUser.js

@@ -78,10 +78,13 @@ const _sfc_main = defineComponent({
     const [registerTable, { clearSelectedRowKeys }, { rowSelection }] = tableContext;
     function loadData(params) {
       return __async(this, null, function* () {
-        let { code, success, result, message } = yield defHttp.get({
-          url: "/sys/user/list",
-          params
-        }, { isTransformResponse: false });
+        let { code, success, result, message } = yield defHttp.get(
+          {
+            url: "/sys/user/list",
+            params
+          },
+          { isTransformResponse: false }
+        );
         if (success) {
           return result;
         }