@jeecg/online 3.4.3 → 3.4.4-beta2

package/OnlineDetailModal.js

@@ -46,6 +46,9 @@ import "./_commonjsHelpers.js";
 import "/@/store/modules/user";
 import "/@/utils/desform/customExpression";
 import "/@/components/Form/src/componentMap";
+import "./OnlineSelectCascade.js";
+import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
+import "vue-router";
 import "/@/store/modules/permission";
 import "/@/components/Form/index";
 import "./pick.js";
@@ -55,11 +58,10 @@ import "./toString.js";
 import "./_arrayPush.js";
 import "/@/components/Table";
 import "/@/hooks/system/useListPage";
-import "vue-router";
 import "./LinkTableListPiece.js";
-import "@vueuse/core";
 import "./JModalTip.js";
 import "ant-design-vue";
+import "@vueuse/core";
 import "./OnlineSubFormDetail.js";
 const _sfc_main = defineComponent({
   name: "OnlineDetailModal",
@@ -147,7 +149,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     defaultFullscreen: false
   }, _ctx.$attrs, {
     onRegister: _ctx.registerModal,
-    wrapClassName: "jeecg-online-modal"
+    wrapClassName: "jeecg-online-detail-modal"
   }), {
     footer: withCtx(() => [
       createVNode(_component_a_button, {

package/OnlineForm.js

@@ -57,19 +57,21 @@ import "./_commonjsHelpers.js";
 import "/@/store/modules/user";
 import "/@/utils/desform/customExpression";
 import "/@/components/Form/src/componentMap";
+import "./OnlineSelectCascade.js";
+import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
+import "vue-router";
 import "/@/store/modules/permission";
 import "/@/utils/propTypes";
 import "/@/utils/dict/JDictSelectUtil";
 import "/@/utils/common/compUtils";
 import "/@/components/Table";
 import "/@/hooks/system/useListPage";
-import "vue-router";
 import "/@/components/Form/src/utils/Area";
 import "/@/components/Preview/index";
 import "./LinkTableListPiece.js";
-import "@vueuse/core";
 import "./JModalTip.js";
 import "ant-design-vue";
+import "@vueuse/core";
 import "./_flatRest.js";
 import "./isArray.js";
 import "./toString.js";
@@ -154,7 +156,6 @@ const _sfc_main = {
       fieldDisplayStatus
     } = useFormItems(props, onlineFormRef);
     let { EnhanceJS, initCgEnhanceJs } = useEnhance(onlineFormContext, false);
-    console.log("--formSchemas----------", formSchemas);
     const [registerForm, { setProps, validate, resetFields, setFieldsValue, updateSchema, getFieldsValue, scrollToField }] = useForm({
       schemas: formSchemas,
       showActionButtonGroup: false,
@@ -359,8 +360,7 @@ const _sfc_main = {
           }
           subActiveKey.value = activeKey;
           if (arr[i].relationType === 0) {
-            let instance = refMap[key].value;
-            instance = Array.isArray(instance) ? instance[0] : instance;
+            let instance = getSubTableInstance(key);
             sleep(300, () => instance == null ? void 0 : instance.validateTable());
           }
           break;
@@ -374,10 +374,7 @@ const _sfc_main = {
           let arr = subTabInfo.value;
           for (let i = 0; i < arr.length; i++) {
             let key = arr[i].key;
-            let instance = refMap[key].value;
-            if (instance instanceof Array) {
-              instance = instance[0];
-            }
+            let instance = getSubTableInstance(key);
             if (arr[i].relationType == 1) {
               try {
                 let subFormData = yield instance.getAll();
@@ -503,10 +500,7 @@ const _sfc_main = {
         let tableChangeObj = EnhanceJS[tableKey + "_onlChange"]();
         let columnKey = Object.keys(valueObj)[0];
         if (tableChangeObj[columnKey]) {
-          let subRef = refMap[tableKey].value;
-          if (subRef instanceof Array) {
-            subRef = subRef[0];
-          }
+          let subRef = getSubTableInstance(tableKey);
           let formEvent = subRef.getFormEvent();
           let event = __spreadValues({
             column: { key: columnKey },
@@ -592,7 +586,7 @@ const _sfc_main = {
       }
     }
     function clearSubRows(tbname) {
-      let instance = refMap[tbname].value;
+      let instance = getSubTableInstance(tbname);
       let rows = [...instance.getNewDataWithId(), ...subDataSource.value[tbname]];
       if (!rows || rows.length == 0) {
         return false;
@@ -607,7 +601,7 @@ const _sfc_main = {
       if (!rows) {
         return false;
       }
-      let instance = refMap[tbname].value;
+      let instance = getSubTableInstance(tbname);
       if (typeof rows == "object") {
         instance.addRows(rows, true);
       } else {
@@ -675,6 +669,10 @@ const _sfc_main = {
       if (instance instanceof Array) {
         instance = instance[0];
       }
+      if (!instance) {
+        $message.warning("\u5B50\u8868ref\u627E\u4E0D\u5230:" + tableName2);
+        return;
+      }
       return instance;
     }
     function onOpenReportPrint() {
@@ -690,18 +688,10 @@ const _sfc_main = {
       console.log("openSubFormModalForAdd", sub);
       popTableName.value = sub.id;
       popModalRequest.value = false;
-      openPopModal(true, {});
+      openPopModal(true, { isUpdate: false });
     }
     function openSubFormModalForEdit(sub) {
-      let ref2 = refMap[sub.key];
-      if (!ref2 || !ref2.value) {
-        $message.warning("\u5B50\u8868ref\u627E\u4E0D\u5230:" + sub.key);
-        return;
-      }
-      ref2 = ref2.value;
-      if (Array.isArray(ref2)) {
-        ref2 = ref2[0];
-      }
+      let ref2 = getSubTableInstance(sub.key);
       let arr = ref2.getSelectedData();
       if (arr.length != 1) {
         $message.warning("\u8BF7\u9009\u62E9\u4E00\u6761\u6570\u636E");
@@ -715,23 +705,12 @@ const _sfc_main = {
       const tableName2 = data[ONL_FORM_TABLE_NAME];
       let record = omit(data, [ONL_FORM_TABLE_NAME]);
       if (record.id) {
-        const ref2 = refMap[tableName2];
-        if (!ref2 || !ref2.value) {
-          $message.warning("\u5B50\u8868ref\u627E\u4E0D\u5230:" + tableName2);
-          return;
-        }
         let values = omit(__spreadValues({}, record), "id");
         let arr = [{ rowKey: record.id, values }];
-        let instance = ref2.value;
-        if (instance instanceof Array) {
-          instance = instance[0];
-        }
+        let instance = getSubTableInstance(tableName2);
         instance.setValues(arr);
       } else {
-        let instance = refMap[tableName2].value;
-        if (instance instanceof Array) {
-          instance = instance[0];
-        }
+        let instance = getSubTableInstance(tableName2);
         instance.addRows(record, { isOnlineJS: false, setActive: false, emitChange: true });
       }
     }
@@ -750,6 +729,35 @@ const _sfc_main = {
         }
       }
     }
+    function executeMainFillRule() {
+      let formData = getFieldsValue();
+      let fieldProperties = toRaw(defaultValueFields[tableName.value]);
+      loadFormFieldsDefVal(fieldProperties, (values) => {
+        setFieldsValue(values);
+      }, formData);
+    }
+    function executeSubFillRule(subKey, $event) {
+      let subList = subTabInfo.value;
+      if (subList && subList.length > 0) {
+        let arr = subList.filter((sub) => sub.key === subKey);
+        if (arr.length == 0) {
+          console.error("\u6CA1\u627E\u5230\u4E0E\u4E4B\u5339\u914D\u7684\u5B50\u8868", subKey);
+          return;
+        }
+        if (arr[0].relationType == 1) {
+          let subInstance = getSubTableInstance(subKey);
+          subInstance.executeFillRule();
+        } else {
+          let subFieldProperties = toRaw(defaultValueFields[subKey]);
+          let row = toRaw($event.row);
+          loadFormFieldsDefVal(subFieldProperties, (values) => {
+            const { row: row2, target } = $event;
+            let v = [{ rowKey: row2.id, values: __spreadValues({}, values) }];
+            target.setValues(v);
+          }, row);
+        }
+      }
+    }
     let context = {
       tableName,
       loading,
@@ -770,7 +778,9 @@ const _sfc_main = {
       changeOptions,
       isUpdate,
       getSubTableInstance,
-      updateSchema
+      updateSchema,
+      executeMainFillRule,
+      executeSubFillRule
     };
     resetContext(context);
     return {

package/OnlineFormDetail.js

@@ -61,6 +61,9 @@ import "./_commonjsHelpers.js";
 import "/@/store/modules/user";
 import "/@/utils/desform/customExpression";
 import "/@/components/Form/src/componentMap";
+import "./OnlineSelectCascade.js";
+import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
+import "vue-router";
 import "/@/store/modules/permission";
 import "/@/components/Modal";
 import "./pick.js";
@@ -70,11 +73,10 @@ import "./toString.js";
 import "./_arrayPush.js";
 import "/@/components/Table";
 import "/@/hooks/system/useListPage";
-import "vue-router";
 import "./LinkTableListPiece.js";
-import "@vueuse/core";
 import "./JModalTip.js";
 import "ant-design-vue";
+import "@vueuse/core";
 const _sfc_main = {
   name: "OnlineFormDetail",
   components: {

package/OnlineQueryForm.js

@@ -48,6 +48,9 @@ import "/@/store/modules/user";
 import "/@/utils";
 import "/@/utils/desform/customExpression";
 import "/@/components/Form/src/componentMap";
+import "./OnlineSelectCascade.js";
+import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
+import "vue-router";
 import "/@/store/modules/permission";
 import "/@/utils/propTypes";
 import "@ant-design/icons-vue";
@@ -61,15 +64,14 @@ import "./toString.js";
 import "./_arrayPush.js";
 import "/@/components/Table";
 import "/@/hooks/system/useListPage";
-import "vue-router";
 import "/@/components/Form/src/utils/Area";
 import "/@/components/Preview/index";
 import "./LinkTableListPiece.js";
-import "@vueuse/core";
 import "/@/components/Loading";
 import "/@/utils/auth";
 import "./JModalTip.js";
 import "ant-design-vue";
+import "@vueuse/core";
 var OnlineQueryForm_vue_vue_type_style_index_0_scoped_true_lang = "";
 const _sfc_main = {
   name: "OnlineQueryForm",
@@ -87,7 +89,7 @@ const _sfc_main = {
     const LOAD_URL = "/online/cgform/api/getQueryInfoVue3/";
     const onlineQueryFormRef = ref(null);
     const formSchemas = ref([]);
-    const baseColProps = ref({ xs: 24, sm: 24, md: 12, lg: 8, xl: 8 });
+    const baseColProps = ref({ xs: 24, sm: 24, md: 12, lg: 6, xl: 6 });
     const toggleButtonShow = ref(false);
     const toggleSearchStatus = ref(false);
     const queryParams = ref({});
@@ -180,7 +182,11 @@ const _sfc_main = {
             hideFieldName.push(item.field);
             item.isHidden();
           }
-          schemaArray.push(item.getFormItemSchema());
+          let tempSchema = item.getFormItemSchema();
+          if (item.slot == "groupDatetime") {
+            tempSchema["colProps"] = { xs: 24, sm: 24, md: 12, lg: 8, xl: 8 };
+          }
+          schemaArray.push(tempSchema);
         }
         hideList.value = hideFieldName;
         formSchemas.value = schemaArray;
@@ -344,7 +350,7 @@ const _sfc_main = {
     };
   }
 };
-const _withScopeId = (n) => (pushScopeId("data-v-01d37a80"), n = n(), popScopeId(), n);
+const _withScopeId = (n) => (pushScopeId("data-v-716ddf4f"), n = n(), popScopeId(), n);
 const _hoisted_1 = {
   key: 0,
   class: "jeecg-basic-table-form-container p-0"
@@ -468,5 +474,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     }, 8, ["onRegister"])
   ])) : createCommentVNode("", true);
 }
-var OnlineQueryForm = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-01d37a80"]]);
+var OnlineQueryForm = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-716ddf4f"]]);
 export { OnlineQueryForm as default };

package/OnlineSearchFormItem.js

@@ -16,10 +16,13 @@ var __spreadValues = (a, b) => {
 };
 import { defineComponent, ref, watch, resolveComponent, openBlock, createBlock, normalizeClass, withCtx, createElementVNode, toDisplayString, createElementBlock, Fragment, createVNode, renderList, createTextVNode, mergeProps, useCssVars, pushScopeId, popScopeId } from "vue";
 import { JDictSelectTag, JTreeSelect, JCategorySelect, JSelectUser, JSelectUserByDept, JSelectDept, JPopup, JAreaLinkage, JAreaSelect, JSelectMultiple } from "/@/components/Form";
-import { _ as _export_sfc, J as JOnlineSearchSelect } from "./index.js";
+import JOnlineSearchSelect from "./JOnlineSearchSelect.js";
+import { _ as _export_sfc } from "./index.js";
+import "@vueuse/core";
 import "/@/utils/http/axios";
 import "/@/hooks/web/useMessage";
-import "@vueuse/core";
+import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
+import "vue-router";
 var OnlineSearchFormItem_vue_vue_type_style_index_0_scoped_true_lang = "";
 const __default__ = defineComponent({
   name: "OnlineSearchFormItem",
@@ -216,7 +219,7 @@ const __default__ = defineComponent({
 });
 const __injectCSSVars__ = () => {
   useCssVars((_ctx) => ({
-    "0c8831e5": _ctx.labelTextMaxWidth
+    "1e41a56d": _ctx.labelTextMaxWidth
   }));
 };
 const __setup__ = __default__.setup;
@@ -225,7 +228,7 @@ __default__.setup = __setup__ ? (props, ctx) => {
   return __setup__(props, ctx);
 } : __injectCSSVars__;
 const _sfc_main = __default__;
-const _withScopeId = (n) => (pushScopeId("data-v-31eb536e"), n = n(), popScopeId(), n);
+const _withScopeId = (n) => (pushScopeId("data-v-76dfb908"), n = n(), popScopeId(), n);
 const _hoisted_1 = ["title"];
 const _hoisted_2 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("span", { class: "group-query-strig" }, "~", -1));
 const _hoisted_3 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("span", { class: "group-query-strig" }, "~", -1));
@@ -429,5 +432,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   }, 8, ["labelCol"]);
 }
-var OnlineSearchFormItem = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-31eb536e"]]);
+var OnlineSearchFormItem = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-76dfb908"]]);
 export { OnlineSearchFormItem as default };

package/OnlineSelectCascade.js

@@ -0,0 +1,228 @@
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import { defineComponent, ref, watch, resolveComponent, openBlock, createBlock, withCtx, createElementBlock, Fragment, renderList, createElementVNode, toDisplayString } from "vue";
+import { defHttp } from "/@/utils/http/axios";
+import { useMessage } from "/@/hooks/web/useMessage";
+import { _ as _export_sfc } from "./index.js";
+import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
+import "vue-router";
+const SELECT_OPTIONS_URL = "/online/cgform/api/querySelectOptions";
+const _sfc_main = defineComponent({
+  name: "OnlineSelectCascade",
+  props: {
+    table: { type: String, default: "" },
+    txt: { type: String, default: "" },
+    store: { type: String, default: "" },
+    idField: { type: String, default: "" },
+    pidField: { type: String, default: "" },
+    pidValue: { type: String, default: "-1" },
+    origin: { type: Boolean, default: false },
+    condition: { type: String, default: "" },
+    value: { type: String, default: "" },
+    isNumber: { type: Boolean, default: false },
+    placeholder: { type: String, default: "\u8BF7\u9009\u62E9" }
+  },
+  emits: ["change", "next"],
+  setup(props, { emit }) {
+    const { createMessage: $message } = useMessage();
+    const selectedValue = ref("");
+    const dictOptions = ref([]);
+    const optionsLoad = ref(true);
+    function handleChange(value) {
+      console.log("handleChange", value);
+      let temp = value || "";
+      emit("change", temp);
+      valueChangeThenEmitNext(temp);
+    }
+    watch(
+      () => props.condition,
+      (val) => {
+        optionsLoad.value = true;
+        if (val) {
+          loadOptions();
+        }
+      },
+      { immediate: true }
+    );
+    watch(
+      () => props.pidValue,
+      (val) => {
+        if (val === "-1") {
+          dictOptions.value = [];
+        } else {
+          loadOptions();
+        }
+      }
+    );
+    watch(
+      () => props.value,
+      (newVal, oldVal) => {
+        console.log("\u503C\u6539\u53D8\u4E8B\u4EF6", newVal, oldVal);
+        if (!newVal) {
+          selectedValue.value = [];
+          if (oldVal) {
+            emit("change", "");
+            emit("next", "-1");
+          }
+        } else {
+          selectedValue.value = newVal;
+        }
+        if (newVal && !oldVal) {
+          handleFirstValueSetting(newVal);
+        }
+      },
+      { immediate: true }
+    );
+    function handleFirstValueSetting(value) {
+      return __async(this, null, function* () {
+        if (props.idField === props.store) {
+          emit("next", value);
+        } else {
+          if (props.origin === true) {
+            yield getSelfOptions();
+            valueChangeThenEmitNext(value);
+          } else {
+            let arr = yield loadValueText();
+            valueChangeThenEmitNext(value, arr);
+          }
+        }
+      });
+    }
+    function loadOptions() {
+      let params = getQueryParams();
+      if (props.origin === true) {
+        params["condition"] = props.condition;
+      } else {
+        params["pidValue"] = props.pidValue;
+      }
+      console.log("\u8BF7\u6C42\u53C2\u6570", params);
+      dictOptions.value = [];
+      defHttp.get({ url: SELECT_OPTIONS_URL, params }, { isTransformResponse: false }).then((res) => {
+        if (res.success) {
+          dictOptions.value = [...res.result];
+          console.log("\u8BF7\u6C42\u7ED3\u679C", res.result, dictOptions);
+        } else {
+          $message.warning("\u8054\u52A8\u7EC4\u4EF6\u6570\u636E\u52A0\u8F7D\u5931\u8D25,\u8BF7\u68C0\u67E5\u914D\u7F6E!");
+        }
+      });
+    }
+    function getQueryParams() {
+      let params = {
+        table: props.table,
+        txt: props.txt,
+        key: props.store,
+        idField: props.idField,
+        pidField: props.pidField
+      };
+      return params;
+    }
+    function loadValueText() {
+      return new Promise((resolve) => {
+        if (!props.value) {
+          selectedValue.value = [];
+          resolve([]);
+        } else {
+          let params = getQueryParams();
+          if (props.isNumber === true) {
+            params["condition"] = `${props.store} = ${props.value}`;
+          } else {
+            params["condition"] = `${props.store} = '${props.value}'`;
+          }
+          defHttp.get({ url: SELECT_OPTIONS_URL, params }, { isTransformResponse: false }).then((res) => {
+            if (res.success) {
+              resolve(res.result);
+            } else {
+              $message.warning("\u8054\u52A8\u7EC4\u4EF6\u6570\u636E\u52A0\u8F7D\u5931\u8D25,\u8BF7\u68C0\u67E5\u914D\u7F6E!");
+              resolve([]);
+            }
+          });
+        }
+      });
+    }
+    function getSelfOptions() {
+      return new Promise((resolve) => {
+        let index = 0;
+        (function next(index2) {
+          if (index2 > 10) {
+            resolve([]);
+          }
+          let arr = dictOptions.value;
+          if (arr && arr.length > 0) {
+            resolve(arr);
+          } else {
+            setTimeout(() => {
+              next(index2++);
+            }, 300);
+          }
+        })(index);
+      });
+    }
+    function valueChangeThenEmitNext(value, arr = []) {
+      if (value && value.length > 0) {
+        if (!arr || arr.length == 0) {
+          arr = dictOptions.value;
+        }
+        let selected = arr.filter((item) => item.store === value);
+        if (selected && selected.length > 0) {
+          let id = selected[0].id;
+          emit("next", id);
+        }
+      }
+    }
+    return {
+      selectedValue,
+      dictOptions,
+      handleChange
+    };
+  }
+});
+const _hoisted_1 = ["title"];
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  const _component_a_select_option = resolveComponent("a-select-option");
+  const _component_a_select = resolveComponent("a-select");
+  return openBlock(), createBlock(_component_a_select, {
+    placeholder: _ctx.placeholder,
+    value: _ctx.selectedValue,
+    onChange: _ctx.handleChange,
+    allowClear: "",
+    style: { "width": "100%" }
+  }, {
+    default: withCtx(() => [
+      (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.dictOptions, (item, index) => {
+        return openBlock(), createBlock(_component_a_select_option, {
+          key: index,
+          value: item.store
+        }, {
+          default: withCtx(() => [
+            createElementVNode("span", {
+              style: { "display": "inline-block", "width": "100%" },
+              title: item.label
+            }, toDisplayString(item.label), 9, _hoisted_1)
+          ]),
+          _: 2
+        }, 1032, ["value"]);
+      }), 128))
+    ]),
+    _: 1
+  }, 8, ["placeholder", "value", "onChange"]);
+}
+var OnlineSelectCascade = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+export { OnlineSelectCascade as default };

package/OnlineSubFormDetail.js

@@ -34,6 +34,9 @@ import "/@/store/modules/user";
 import "/@/utils";
 import "/@/utils/desform/customExpression";
 import "/@/components/Form/src/componentMap";
+import "./OnlineSelectCascade.js";
+import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
+import "vue-router";
 import "/@/store/modules/permission";
 import "/@/utils/propTypes";
 import "@ant-design/icons-vue";
@@ -47,14 +50,13 @@ import "./toString.js";
 import "./_arrayPush.js";
 import "/@/components/Table";
 import "/@/hooks/system/useListPage";
-import "vue-router";
 import "/@/components/Form/src/utils/Area";
 import "/@/components/Preview/index";
 import "./LinkTableListPiece.js";
-import "@vueuse/core";
 import "/@/utils/auth";
 import "./JModalTip.js";
 import "ant-design-vue";
+import "@vueuse/core";
 import "/@/utils/dict";
 import "/@/utils/dict/index";
 import "/@/api/common/api";