@ibiz-template/vue3-util 0.7.39 → 0.7.40

package/lib/props/editor/text-box.cjs

@@ -4,27 +4,17 @@ var common = require('./common.cjs');
 
 "use strict";
 function getInputProps() {
-  return { ...common.getEditorProps(), value: [String, Number] };
+  return {
+    ...common.getEditorProps(),
+    /**
+     * @description 编辑器值
+     */
+    value: [String, Number]
+  };
 }
 function getGridInputProps() {
   return { ...getInputProps(), ...common.getGridEditorCommonProps() };
 }
-function getInputNumberProps() {
-  return { ...common.getEditorProps(), value: Number };
-}
-function getGridInputNumberProps() {
-  return { ...getInputNumberProps(), ...common.getGridEditorCommonProps() };
-}
-function getInputIpProps() {
-  return { ...common.getEditorProps(), value: String };
-}
-function getGridInputIpProps() {
-  return { ...getInputIpProps(), ...common.getGridEditorCommonProps() };
-}
 
-exports.getGridInputIpProps = getGridInputIpProps;
-exports.getGridInputNumberProps = getGridInputNumberProps;
 exports.getGridInputProps = getGridInputProps;
-exports.getInputIpProps = getInputIpProps;
-exports.getInputNumberProps = getInputNumberProps;
 exports.getInputProps = getInputProps;

package/lib/props/editor/upload.cjs

@@ -4,7 +4,13 @@ var common = require('./common.cjs');
 
 "use strict";
 function getUploadProps() {
-  return { ...common.getEditorProps(), value: String };
+  return {
+    ...common.getEditorProps(),
+    /**
+     * @description 编辑器值
+     */
+    value: String
+  };
 }
 function getGridUploadProps() {
   return { ...getUploadProps(), ...common.getGridEditorCommonProps() };

package/lib/props/index.cjs

@@ -11,6 +11,7 @@ var checkBox = require('./editor/check-box.cjs');
 var dataPicker = require('./editor/data-picker.cjs');
 var datePicker = require('./editor/date-picker.cjs');
 var dateRange = require('./editor/date-range.cjs');
+var dateRangeSelect = require('./editor/date-range-select.cjs');
 var listBox = require('./editor/list-box.cjs');
 var numberRange = require('./editor/number-range.cjs');
 var radioButtonList = require('./editor/radio-button-list.cjs');
@@ -27,15 +28,14 @@ var markdown = require('./editor/markdown.cjs');
 var array = require('./editor/array.cjs');
 var cascader = require('./editor/cascader.cjs');
 var colorPicker = require('./editor/color-picker.cjs');
+var inputIp = require('./editor/input-ip.cjs');
+var inputNumber = require('./editor/input-number.cjs');
+var mapPicker = require('./editor/map-picker.cjs');
 
 "use strict";
 
 exports.RequiredProp = common.RequiredProp;
-exports.getGridInputIpProps = textBox.getGridInputIpProps;
-exports.getGridInputNumberProps = textBox.getGridInputNumberProps;
 exports.getGridInputProps = textBox.getGridInputProps;
-exports.getInputIpProps = textBox.getInputIpProps;
-exports.getInputNumberProps = textBox.getInputNumberProps;
 exports.getInputProps = textBox.getInputProps;
 exports.getGridSpanProps = span.getGridSpanProps;
 exports.getSpanProps = span.getSpanProps;
@@ -55,6 +55,9 @@ exports.getDatePickerProps = datePicker.getDatePickerProps;
 exports.getGridDatePickerProps = datePicker.getGridDatePickerProps;
 exports.getDateRangeProps = dateRange.getDateRangeProps;
 exports.getGridDateRangeProps = dateRange.getGridDateRangeProps;
+exports.getDateRangeSelectEmits = dateRangeSelect.getDateRangeSelectEmits;
+exports.getDateRangeSelectProps = dateRangeSelect.getDateRangeSelectProps;
+exports.getGridDateRangeSelectProps = dateRangeSelect.getGridDateRangeSelectProps;
 exports.getGridListBoxProps = listBox.getGridListBoxProps;
 exports.getListBoxProps = listBox.getListBoxProps;
 exports.getGridNumberRangeProps = numberRange.getGridNumberRangeProps;
@@ -87,3 +90,9 @@ exports.getCascaderProps = cascader.getCascaderProps;
 exports.getGridCascaderProps = cascader.getGridCascaderProps;
 exports.getColorPickerProps = colorPicker.getColorPickerProps;
 exports.getGridColorPickerProps = colorPicker.getGridColorPickerProps;
+exports.getGridInputIpProps = inputIp.getGridInputIpProps;
+exports.getInputIpProps = inputIp.getInputIpProps;
+exports.getGridInputNumberProps = inputNumber.getGridInputNumberProps;
+exports.getInputNumberProps = inputNumber.getInputNumberProps;
+exports.getGridMapPickerProps = mapPicker.getGridMapPickerProps;
+exports.getMapPickerProps = mapPicker.getMapPickerProps;

package/lib/util/route/route.cjs

@@ -108,6 +108,17 @@ function getOwnRouteContext(context) {
     "currentSrfNav",
     "toRouteDepth"
   ];
+  if (ownContext.attributekeys) {
+    const attributeKeys = ownContext.attributekeys.split("|");
+    if (attributeKeys && attributeKeys.length > 0) {
+      attributeKeys.forEach((key) => {
+        if (ramda.isNotNil(context[key])) {
+          ownContext[key] = context[key];
+        }
+      });
+    }
+    delete ownContext.attributekeys;
+  }
   Object.keys(ownContext).forEach((key) => {
     if (excludeKeys.includes(key) || ramda.isNil(ownContext[key])) {
       delete ownContext[key];

package/lib/view/common/view.cjs

@@ -15,21 +15,42 @@ function _isSlot(s) {
 const View = /* @__PURE__ */ vue.defineComponent({
   name: "IBizView",
   props: {
-    context: Object,
+    /**
+     * @description 应用上下文
+     */
+    context: {
+      type: Object
+    },
+    /**
+     * @description 视图参数
+     * @default {}
+     */
     params: {
       type: Object,
       default: () => ({})
     },
+    /**
+     * @description 视图模型
+     */
     modelData: {
       type: Object,
       required: true
     },
+    /**
+     * @description 视图模态操作对象，在模态等形式打开视图时，需给视图注入此对象
+     */
     modal: {
       type: Object
     },
+    /**
+     * @description 视图状态
+     */
     state: {
       type: Object
     },
+    /**
+     * @description 视图适配器
+     */
     provider: {
       type: Object
     }

package/lib/view/de-redirect-view/de-redirect-view.cjs

@@ -21,6 +21,10 @@ const DeRedirectView = /* @__PURE__ */ vue.defineComponent({
     modelData: {
       type: Object,
       required: true
+    },
+    isEmbedCtrlNav: {
+      type: Boolean,
+      default: false
     }
   },
   setup(props) {
@@ -39,6 +43,18 @@ const DeRedirectView = /* @__PURE__ */ vue.defineComponent({
         }
       });
     });
+    if (props.isEmbedCtrlNav) {
+      vue.watch(() => [c.context, c.params], () => {
+        runtime.getDERedirectToView(vue.toRaw(props.modelData), vue.toRaw(c.context), vue.toRaw(c.params)).then(async (result) => {
+          if (result.type === "view") {
+            toViewId.value = result.viewId;
+            toViewContext.value = result.context;
+          }
+        });
+      }, {
+        deep: true
+      });
+    }
     return {
       c,
       toViewId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-util",
-  "version": "0.7.39",
+  "version": "0.7.40",
   "description": "通用组件库(vue3)",
   "main": "lib/index.cjs",
   "types": "es/index.d.ts",
@@ -37,10 +37,10 @@
   "license": "MIT",
   "devDependencies": {
     "@ibiz-template/cli": "^0.3.10",
-    "@ibiz-template/core": "^0.7.39",
-    "@ibiz-template/runtime": "^0.7.39",
+    "@ibiz-template/core": "^0.7.40",
+    "@ibiz-template/runtime": "^0.7.40",
     "@ibiz-template/theme": "^0.7.39",
-    "@ibiz/model-core": "^0.1.68",
+    "@ibiz/model-core": "^0.1.75",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.11",
     "@types/systemjs": "^6.13.5",
@@ -57,7 +57,7 @@
   "peerDependencies": {
     "@ibiz-template/core": "^0.6.0",
     "@ibiz-template/runtime": "^0.6.0",
-    "@ibiz/model-core": "^0.1.68",
+    "@ibiz/model-core": "^0.1.75",
     "dayjs": "^1.11.10",
     "path-browserify": "^1.0.1",
     "pinia": "^2.1.7",
@@ -67,5 +67,5 @@
     "vue": "^3.3.8",
     "vue-router": "^4.2.4"
   },
-  "gitHead": "763fadf3223009ad5ac7bbb63fc03b6c7b0d6905"
+  "gitHead": "46e39bf68e6e2212eb077ba6bd6e907e180fa335"
 }