super-page-runtime 2.0.30 → 2.0.31

package/dist/es/components/runtime/utils/form/date-shortcuts.d.ts

@@ -0,0 +1,7 @@
+/**
+ * 快捷选择生成方式
+ * @param dateScopeDetails
+ * @param dateType
+ * @param rangeType
+ */
+export declare function getDateShortCuts(dateScopeDetails: any[], dateType: string, rangeType: string): any;

package/dist/es/components/runtime/utils/form/date-shortcuts.js

@@ -0,0 +1,96 @@
+function getDateShortCuts(dateScopeDetails, dateType, rangeType) {
+  if (!dateScopeDetails) {
+    return void 0;
+  }
+  const shortcuts = [];
+  if (dateScopeDetails.includes("today") && !["week", "month", "year"].includes(dateType)) {
+    const dateParams = {
+      text: "今天",
+      value: () => {
+        return /* @__PURE__ */ new Date();
+      }
+    };
+    if (rangeType.endsWith("range")) {
+      dateParams.value = () => {
+        return [/* @__PURE__ */ new Date(), /* @__PURE__ */ new Date()];
+      };
+    }
+    shortcuts.push(dateParams);
+  }
+  if (dateScopeDetails.includes("yesterday") && !["week", "month", "year"].includes(dateType)) {
+    const date = /* @__PURE__ */ new Date();
+    date.setTime(date.getTime() - 3600 * 1e3 * 24);
+    const dateParams = {
+      text: "昨天",
+      value: () => {
+        return date;
+      }
+    };
+    if (rangeType.endsWith("range")) {
+      dateParams.value = () => {
+        return [date, /* @__PURE__ */ new Date()];
+      };
+    }
+    shortcuts.push(dateParams);
+  }
+  if (dateScopeDetails.includes("oneWeek") && !["month", "year"].includes(dateType)) {
+    const date = /* @__PURE__ */ new Date();
+    date.setTime(date.getTime() - 3600 * 1e3 * 24 * 7);
+    const dateParams = {
+      text: "一周前",
+      value: () => {
+        return date;
+      }
+    };
+    if (rangeType.endsWith("range")) {
+      dateParams.text = "一周";
+      dateParams.value = () => {
+        return [date, /* @__PURE__ */ new Date()];
+      };
+    }
+    shortcuts.push(dateParams);
+  }
+  if (dateScopeDetails.includes("oneMonth") && !["year"].includes(dateType)) {
+    const date = /* @__PURE__ */ new Date();
+    if (date.getMonth() > 0) {
+      date.setMonth(date.getMonth() - 1);
+    } else {
+      date.setMonth(12);
+      date.setFullYear(date.getFullYear() - 1);
+    }
+    const dateParams = {
+      text: "一月前",
+      value: () => {
+        return date;
+      }
+    };
+    if (rangeType.endsWith("range")) {
+      dateParams.text = "一月";
+      dateParams.value = () => {
+        return [date, /* @__PURE__ */ new Date()];
+      };
+    }
+    shortcuts.push(dateParams);
+  }
+  if (dateScopeDetails.includes("oneYear")) {
+    const date = /* @__PURE__ */ new Date();
+    date.setFullYear(date.getFullYear() - 1);
+    const dateParams = {
+      text: "一年前",
+      value: () => {
+        return date;
+      }
+    };
+    if (rangeType.endsWith("range")) {
+      dateParams.text = "一年";
+      dateParams.value = () => {
+        return [date, /* @__PURE__ */ new Date()];
+      };
+    }
+    shortcuts.push(dateParams);
+  }
+  return shortcuts;
+}
+export {
+  getDateShortCuts
+};

package/dist/es/components/runtime/utils/page-helper-util.d.ts

@@ -98,6 +98,12 @@ export declare function formatVariableValue(pageContext: PageContext, variable:
  * @returns
  */
 export declare function formatValueByType(value: any, formatType: string, formatInfo: any): any;
+/**
+ * 根据变量获取值
+ * @param entity
+ * @param variable
+ */
+export declare function getValueFromVariable(entity: any, variable: string): any;
 /**
  * 从对象中获取值
  * @param valueSource 源对象

package/dist/es/components/runtime/utils/page-helper-util.js

@@ -477,7 +477,7 @@ function getValueFromVariable(entity, variable) {
   }
 }
 function getValueFromSource(valueSource, paramName, paramType) {
-  if (!valueSource || !paramName) {
+  if (paramType != "context" && !valueSource || !paramName) {
     return void 0;
   }
   const firstIndex = paramName.indexOf(".");
@@ -491,8 +491,28 @@ function getValueFromSource(valueSource, paramName, paramType) {
     return getValueFromSource(childValue, newParamName, paramType);
   } else {
     if (paramType == "context") {
+      console.log("newDate", paramName);
       if (paramName == "currentDate" || paramName == "currentTime") {
         return /* @__PURE__ */ new Date();
+      } else if (paramName.startsWith("currentDate") && paramName.length > 11) {
+        const str = paramName.substring(11);
+        const symbol = str.substring(0, 1);
+        let num = parseInt(str.substring(1, str.length - 1), 10);
+        const unit = str.substring(str.length - 1);
+        const date = /* @__PURE__ */ new Date();
+        num = "+" === symbol ? num : -num;
+        if (unit === "d" || unit === "w") {
+          num = unit === "w" ? num * 7 : num;
+          date.setDate(date.getDate() + num);
+        } else if (unit === "m") {
+          date.setMonth(date.getMonth() + num);
+        } else if (unit === "y") {
+          date.setFullYear(date.getFullYear() + num);
+        }
+        return date;
+      }
+      if (!valueSource) {
+        return void 0;
       }
     }
     return valueSource[paramName];
@@ -636,6 +656,7 @@ export {
   getFormPropName,
   getOptionDatasFromPage,
   getValueFromSource,
+  getValueFromVariable,
   getVariableValue,
   monitorFieldChange,
   queryOptionDatasources,

package/dist/es/components/runtime/utils/page-init-util.d.ts

@@ -17,7 +17,7 @@ export declare function queryPageDesignByCode(pageCode: string): Promise<any>;
  * @param pageDesign 页面设计对象
  */
 export declare function convertToPageContext(pageDesign: PageDesign, pageRequest: object): PageContext | null;
-export declare function getModelFields(pageContext: PageContext, formItemConfigure: any, prop?: string): any;
+export declare function getModelFields(pageContext: PageContext, formItemConfigure: Component, prop?: string): string[];
 /**
  * 获取表单元素模型名称
  * @param pageContext 页面对象

package/dist/es/components/runtime/utils/page-init-util.js

@@ -4,7 +4,9 @@ import { getAdditionalParamMap } from "./events/standard-event.js";
 import { PageDimensions } from "./interfaces/page-design-types.js";
 import { formatVariableValue, setVariableValue, getFormPropName } from "./page-helper-util.js";
 function queryPageDesignByCode(pageCode) {
-  return http.get(window["$vueApp"].config.globalProperties.baseAPI + "/component/super-page-design/runtime/" + pageCode);
+  return http.get(
+    window["$vueApp"].config.globalProperties.baseAPI + "/component/super-page-design/runtime/" + pageCode
+  );
 }
 function convertToPageContext(pageDesign, pageRequest) {
   if (pageDesign == null) {
@@ -109,15 +111,22 @@ function getRequestObject(pageRequest) {
   return requestObj;
 }
 function getModelFields(pageContext, formItemConfigure, prop) {
+  if (!formItemConfigure) {
+    return ["temp"];
+  }
   pageContext.entity;
   let propsBase;
   let propName = prop;
-  if (!prop && formItemConfigure) {
+  if (!prop) {
     propsBase = formItemConfigure.props.base ? formItemConfigure.props.base : {};
     propName = propsBase.prop;
   }
   let fields = null;
-  if (propName && propName.startsWith("${")) {
+  if (prop) {
+    fields = ["data", prop];
+  } else if (!propName || !propName.startsWith("${")) {
+    fields = ["page", formItemConfigure.uuid];
+  } else if (propName.startsWith("${")) {
     propName = propName.substring(2, propName.length - 1);
     fields = propName.split(".");
     if (formItemConfigure && fields.length < 2) {
@@ -132,13 +141,13 @@ function getModelFields(pageContext, formItemConfigure, prop) {
   return fields;
 }
 function getFormModelFields(pageContext, formItemConfigure, prop) {
-  let fields = getModelFields(pageContext, formItemConfigure, prop);
+  const fields = getModelFields(pageContext, formItemConfigure, prop);
   const entity = pageContext.entity;
   let propsBase;
   if (formItemConfigure) {
     propsBase = formItemConfigure.props.base ? formItemConfigure.props.base : {};
   }
-  if (entity.data.ID == void 0 && entity.data.ID == void 0) {
+  if (entity.data.ID == void 0 && entity.data.id == void 0) {
     if (propsBase && propsBase.defaultValue) {
       let defaultValue = formatVariableValue(pageContext, propsBase.defaultValue);
       if (defaultValue != null && defaultValue != void 0) {
@@ -194,12 +203,15 @@ function queryPageSuperGrids(pageDesign, pageContext, publishVersion) {
   if (additionalParamMap && Object.keys(additionalParamMap) > 0) {
     additionalParamMapJson = JSON.stringify(additionalParamMap);
   }
-  return http.post(window["$vueApp"].config.globalProperties.baseAPI + "/component/super-page-design/super-grids", {
-    tableRuntimes,
-    additionalParamMapJson,
-    pageCode,
-    publishVersion
-  });
+  return http.post(
+    window["$vueApp"].config.globalProperties.baseAPI + "/component/super-page-design/super-grids",
+    {
+      tableRuntimes,
+      additionalParamMapJson,
+      pageCode,
+      publishVersion
+    }
+  );
 }
 function packageFormRules(pageContext, configure) {
   const isWorkflow = pageContext.workflowCode ? true : false;

package/dist/es/components/runtime/views/assemblys/form/date-picker/datepicker-runtime.vue2.js

@@ -1,6 +1,7 @@
 import { defineComponent, computed, ref, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementBlock, toDisplayString, createCommentVNode } from "vue";
 import { getFormModelFields } from "../../../../utils/page-init-util.js";
-import { getVariableValue, setVariableValue } from "../../../../utils/page-helper-util.js";
+import { getDateShortCuts } from "../../../../utils/form/date-shortcuts.js";
+import { getVariableValue, setVariableValue, getValueFromVariable } from "../../../../utils/page-helper-util.js";
 import { getCustomFunc, handleEvent } from "../../../../utils/events/event-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "datepicker-runtime",
@@ -25,6 +26,34 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const runtimeClass = runtimeInfo.class;
     const headerStyle = runtimeInfo.headerStyle;
     const designProperty = ref(runtimeInfo.props ? runtimeInfo.props : {});
+    if (designProperty.value.dateType && designProperty.value.dateType.includes("range")) {
+      let hisValue = getVariableValue(entity, dynamicFields);
+      if (hisValue && !Array.isArray(hisValue)) {
+        hisValue = [hisValue];
+      }
+      if (!entity.data || !entity.data.id && !entity.data.ID) {
+        if (designProperty.value.defaultValue2) {
+          const defaultValue2 = getValueFromVariable(entity, designProperty.value.defaultValue2);
+          hisValue = !hisValue ? [] : hisValue;
+          if (hisValue.length == 0) {
+            hisValue.push(void 0);
+          }
+          if (hisValue.length > 1) {
+            hisValue[1] = defaultValue2;
+          } else {
+            hisValue.push(defaultValue2);
+          }
+        }
+      }
+      setVariableValue(entity, dynamicFields, hisValue);
+    }
+    const shortcuts = ref(
+      getDateShortCuts(
+        designProperty.value.dateScopeDetails,
+        designProperty.value.sourceType,
+        designProperty.value.dateType
+      )
+    );
     if (designProperty.value.shortcutsFunc) {
       const func = getCustomFunc(props.pageContext, designProperty.value.shortcutsFunc);
       if (func) {
@@ -35,18 +64,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }
         ]);
         if (returns) {
-          if (typeof returns === "object") {
+          if (!Array.isArray(returns)) {
             returns = [returns];
           }
-          if (!designProperty.value.shortcuts) {
-            designProperty.value.shortcuts = [];
+          if (!shortcuts.value) {
+            shortcuts.value = [];
           }
           for (let r of returns) {
             if (r.text && r.value) {
-              designProperty.value.shortcuts.push(r);
+              shortcuts.value.push(r);
             }
           }
         }
+        console.log("shortcuts", shortcuts.value);
       }
     }
     return (_ctx, _cache) => {
@@ -80,7 +110,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             format: designProperty.value.format,
             modelValue: dynamicModelMethod.value,
             "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => dynamicModelMethod.value = $event),
-            shortcuts: designProperty.value.shortcuts,
+            shortcuts: shortcuts.value,
             type: designProperty.value.dateType,
             onChange: _cache[1] || (_cache[1] = ($event) => unref(handleEvent)($event, _ctx.pageContext, _ctx.configure, "change")),
             onBlur: _cache[2] || (_cache[2] = ($event) => unref(handleEvent)($event, _ctx.pageContext, _ctx.configure, "blur")),
@@ -100,7 +130,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             format: designProperty.value.format,
             modelValue: dynamicModelMethod.value,
             "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => dynamicModelMethod.value = $event),
-            shortcuts: designProperty.value.shortcuts,
+            shortcuts: shortcuts.value,
             type: designProperty.value.dateType,
             onChange: _cache[8] || (_cache[8] = ($event) => unref(handleEvent)($event, _ctx.pageContext, _ctx.configure, "change")),
             onBlur: _cache[9] || (_cache[9] = ($event) => unref(handleEvent)($event, _ctx.pageContext, _ctx.configure, "blur")),

package/dist/es/index.d.ts

@@ -4,8 +4,10 @@ import { getStandPermissionInfo, getFunctionInfo, FuncType } from './components/
 import { getCustomTheme, getCustomThemeOptions, getNumFormatter } from './components/runtime/utils/charts/chart-util';
 import { default as cn } from './i18n/langs/cn.js';
 import { default as en } from './i18n/langs/en.js';
+import { getDateShortCuts } from './components/runtime/utils/form/date-shortcuts';
 
 export { SuperPageNew, SuperPageDialogNew, getComponentOptionConfigs };
 export { getStandPermissionInfo, getFunctionInfo, FuncType };
 export { getCustomTheme, getCustomThemeOptions, getNumFormatter as getNumFormatterForChart };
+export { getDateShortCuts };
 export { cn, en };

package/dist/es/index.js

@@ -5,6 +5,7 @@ import { FuncType, getFunctionInfo, getStandPermissionInfo } from "./components/
 import { getCustomTheme, getCustomThemeOptions, getNumFormatter } from "./components/runtime/utils/charts/chart-util.js";
 import { default as default4 } from "./i18n/langs/cn.js";
 import { default as default5 } from "./i18n/langs/en.js";
+import { getDateShortCuts } from "./components/runtime/utils/form/date-shortcuts.js";
 export {
   FuncType,
   default3 as SuperPageDialogNew,
@@ -14,6 +15,7 @@ export {
   getComponentOptionConfigs,
   getCustomTheme,
   getCustomThemeOptions,
+  getDateShortCuts,
   getFunctionInfo,
   getNumFormatter as getNumFormatterForChart,
   getStandPermissionInfo

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-runtime",
-  "version": "2.0.30",
+  "version": "2.0.31",
   "description": "AgileBuilder super page runtime",
   "license": "ISC",
   "main": "dist/es/index.js",
@@ -48,7 +48,7 @@
     "@vitejs/plugin-vue-jsx": "^3.1.0",
     "@vue/eslint-config-prettier": "^8.0.0",
     "@vue/test-utils": "^2.4.4",
-    "agilebuilder-ui": "1.0.24",
+    "agilebuilder-ui": "1.0.23",
     "axios": "^1.6.8",
     "cypress": "^13.6.6",
     "element-plus": "^2.6.1",