woodao-pc-ui 0.0.34 → 0.0.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "woodao-pc-ui",
-  "version": "0.0.34",
+  "version": "0.0.36",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/woodao-pc-ui/woodao-pc-ui.common.js

@@ -47263,20 +47263,33 @@ var es_iterator_find = __webpack_require__(20116);
 
 /* harmony default export */ function Form() {
   function checkParams(innerFormItems) {
+    // 确保 innerFormItems 不为 undefined 或 null
+    if (!innerFormItems || !Array.isArray(innerFormItems)) {
+      return true;
+    }
     return innerFormItems.every(it => {
+      // 确保 it 不为 undefined 或 null
+      if (!it) return true;
       return it.validator ? it.validator(it, innerFormItems.find(item => it.associatedOption === item.name)) : true;
     });
   }
   function generatorParams(innerFormItems) {
     if (innerFormItems && innerFormItems.length !== 0) {
       return innerFormItems.reduce((pre, cur) => {
+        // 确保 cur 不为 undefined 或 null
+        if (!cur) return pre;
         if (cur.name !== undefined && cur.type != 'input-fixed' && cur.type != 'selPeople') {
-          pre[cur.name] = cur.value;
+          // 安全地处理 cur.value，避免 undefined 或 null
+          pre[cur.name] = cur.value != null ? cur.value : '';
         } else if (cur.name !== undefined && cur.type == 'input-fixed') {
-          pre[cur.name] = 'com.woodao.services' + cur.value1 + cur.value2;
+          // 安全地处理 cur.value1 和 cur.value2，避免 undefined 或 null
+          const value1 = cur.value1 != null ? cur.value1 : '';
+          const value2 = cur.value2 != null ? cur.value2 : '';
+          pre[cur.name] = 'com.woodao.services' + value1 + value2;
         } else if (cur.name !== undefined && cur.type == 'selPeople') {
-          pre[cur.name] = cur.value;
-          pre[cur.busValue] = cur.bindId;
+          // 安全地处理 cur.value 和 cur.bindId，避免 undefined 或 null
+          pre[cur.name] = cur.value != null ? cur.value : '';
+          pre[cur.busValue] = cur.bindId != null ? cur.bindId : '';
         }
         return pre;
       }, {});
@@ -47284,7 +47297,13 @@ var es_iterator_find = __webpack_require__(20116);
     return {};
   }
   function resetParams(innerFormItems) {
+    // 确保 innerFormItems 不为 undefined 或 null
+    if (!innerFormItems || !Array.isArray(innerFormItems)) {
+      return;
+    }
     innerFormItems.forEach(it => {
+      // 确保 it 不为 undefined 或 null
+      if (!it) return;
       it.reset ? it.reset() : it.value = '';
     });
   }
@@ -161274,7 +161293,7 @@ function useEcharts(dom, theme) {
   return instance;
 }
 ;// ./package.json
-var package_namespaceObject = {"rE":"0.0.34"};
+var package_namespaceObject = {"rE":"0.0.36"};
 ;// ./src/setting/index.ts
 
 const primaryColors = (/* unused pure expression or super */ null && (["#409eff", "#13C2C2", "#F5222D", "#722ED1", "#f7acbc", "#ef5b9c", "#bd6758", "#f47920", "#2e3a1f", "#b2d235", "#121a2a", "#6a6da9", "#867892", "#fcaf17", "#76becc", "#1b315e", "#b4532a", "#008792"]));
@@ -172090,30 +172109,30 @@ __default__.setup = __setup__ ? (props, ctx) => {
 const SelPeople_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(SelPeoplevue_type_script_lang_ts, [['render',SelPeoplevue_type_template_id_51989aae_scoped_true_ts_true_render],['__scopeId',"data-v-51989aae"]])
 
 /* harmony default export */ var SelPeople = (SelPeople_exports_);
-;// ./node_modules/babel-loader/lib/index.js!./node_modules/ts-loader/index.js??clonedRuleSet-41.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Form/BaseFormItem.vue?vue&type=template&id=4c723329&scoped=true&ts=true
+;// ./node_modules/babel-loader/lib/index.js!./node_modules/ts-loader/index.js??clonedRuleSet-41.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Form/BaseFormItem.vue?vue&type=template&id=62728fcf&scoped=true&ts=true
 
-const BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_hoisted_1 = {
+const BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_hoisted_1 = {
   style: {
     "width": "100%"
   }
 };
-const BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_hoisted_2 = {
+const BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_hoisted_2 = {
   key: 3,
   class: "w100"
 };
-const BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_hoisted_3 = {
+const BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_hoisted_3 = {
   class: "flex-row-start w100"
 };
-const BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_hoisted_4 = {
+const BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_hoisted_4 = {
   style: {
     "width": "100%",
     "height": "8px"
   }
 };
-const BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_hoisted_5 = {
+const BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_hoisted_5 = {
   key: 17
 };
-function BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+function BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_FormRender = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("FormRender");
   const _component_el_button = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-button");
   const _component_el_input = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-input");
@@ -172125,7 +172144,7 @@ function BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_render(_c
   const _component_el_radio_group = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-radio-group");
   const _component_el_checkbox_group = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-checkbox-group");
   const _component_el_switch = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-switch");
-  return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)("div", BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_hoisted_1, [_ctx.item.render ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_FormRender, {
+  return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)("div", BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_hoisted_1, [_ctx.item.render ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_FormRender, {
     key: 0,
     render: _ctx.item.render,
     "form-item": _ctx.item
@@ -172152,7 +172171,7 @@ function BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_render(_c
     rows: _ctx.item.rows || 5,
     class: "form-item",
     "show-password": _ctx.item.inputType === 'password'
-  }, null, 8, ["modelValue", "placeholder", "size", "readonly", "disabled", "type", "maxlength", "rows", "show-password"])) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)("", true), _ctx.item.type === 'input-fixed' ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)("div", BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_hoisted_2, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("div", BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_hoisted_3, [_cache[23] || (_cache[23] = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("span", null, "com.woodao.services", -1)), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_el_input, {
+  }, null, 8, ["modelValue", "placeholder", "size", "readonly", "disabled", "type", "maxlength", "rows", "show-password"])) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)("", true), _ctx.item.type === 'input-fixed' ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)("div", BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_hoisted_2, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("div", BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_hoisted_3, [_cache[23] || (_cache[23] = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("span", null, "com.woodao.services", -1)), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_el_input, {
     modelValue: _ctx.item.value1,
     "onUpdate:modelValue": _cache[2] || (_cache[2] = $event => _ctx.item.value1 = $event),
     placeholder: _ctx.item.placeholder1 || '请输入',
@@ -172373,7 +172392,7 @@ function BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_render(_c
     size: _ctx.size || 'default',
     onChange: _cache[20] || (_cache[20] = $event => _ctx.item.onChange ? _ctx.item.onChange(_ctx.item.value, _ctx.item.associatedOption || '') : () => {})
   }, {
-    default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.withDirectives)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("div", BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_hoisted_4, null, 512), [[external_commonjs_vue_commonjs2_vue_root_Vue_.vShow, _ctx.item.optionType === 'row']]), ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(true), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)(external_commonjs_vue_commonjs2_vue_root_Vue_.Fragment, null, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.renderList)(_ctx.item.checkOptions, optionItem => {
+    default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.withDirectives)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("div", BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_hoisted_4, null, 512), [[external_commonjs_vue_commonjs2_vue_root_Vue_.vShow, _ctx.item.optionType === 'row']]), ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(true), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)(external_commonjs_vue_commonjs2_vue_root_Vue_.Fragment, null, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.renderList)(_ctx.item.checkOptions, optionItem => {
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveDynamicComponent)(_ctx.item.style === 'button' ? 'el-checkbox-button' : 'el-checkbox'), {
         class: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.normalizeClass)(_ctx.item.optionType === 'row' ? 'row-option' : ''),
         key: optionItem.value,
@@ -172393,9 +172412,9 @@ function BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_render(_c
     disabled: _ctx.item.disabled || false,
     size: _ctx.size || 'default',
     onChange: _cache[22] || (_cache[22] = $event => _ctx.item.onChange ? _ctx.item.onChange(_ctx.item.value, _ctx.item.associatedOption || '') : () => {})
-  }, null, 8, ["modelValue", "disabled", "size"])) : _ctx.item.type === 'span' ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)("span", BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_hoisted_5, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)(_ctx.item.value), 1)) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)("", true)]);
+  }, null, 8, ["modelValue", "disabled", "size"])) : _ctx.item.type === 'span' ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)("span", BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_hoisted_5, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)(_ctx.item.value), 1)) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)("", true)]);
 }
-;// ./src/package/Form/BaseFormItem.vue?vue&type=template&id=4c723329&scoped=true&ts=true
+;// ./src/package/Form/BaseFormItem.vue?vue&type=template&id=62728fcf&scoped=true&ts=true
 
 // EXTERNAL MODULE: ./node_modules/console-browserify/index.js
 var console_browserify = __webpack_require__(94348);
@@ -172641,7 +172660,6 @@ const SelectBySystemCode_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)
 
 
 
-
 /* harmony default export */ var BaseFormItemvue_type_script_lang_ts = ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.defineComponent)({
   name: "BaseFormItem",
   components: {
@@ -172670,22 +172688,39 @@ const SelectBySystemCode_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)
     expose,
     emit
   }) {
-    const {
-      checkParams,
-      resetParams,
-      generatorParams
-    } = useForm();
-    const innerFormItems = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
-      return props.formItems;
-    });
+    // 由于 BaseFormItem 只处理单个表单项，不需要 formItems
+    // 这些方法应该由父组件 BaseForm 来处理
     function mCheckParams() {
-      return checkParams(innerFormItems.value);
+      // 单个表单项的验证逻辑
+      if (!props.item) return true;
+      return props.item.validator ? props.item.validator(props.item) : true;
     }
     function mResetParams() {
-      return resetParams(innerFormItems.value);
+      // 单个表单项的重置逻辑
+      if (!props.item) return;
+      if (props.item.reset) {
+        props.item.reset();
+      } else {
+        props.item.value = '';
+      }
     }
     function mGeneratorParams() {
-      return generatorParams(innerFormItems.value);
+      // 单个表单项的参数生成逻辑
+      if (!props.item || !props.item.name) return {};
+      const result = {};
+      if (props.item.type === 'input-fixed') {
+        const value1 = props.item.value1 != null ? props.item.value1 : '';
+        const value2 = props.item.value2 != null ? props.item.value2 : '';
+        result[props.item.name] = 'com.woodao.services' + value1 + value2;
+      } else if (props.item.type === 'selPeople') {
+        result[props.item.name] = props.item.value != null ? props.item.value : '';
+        if (props.item.busValue) {
+          result[props.item.busValue] = props.item.bindId != null ? props.item.bindId : '';
+        }
+      } else {
+        result[props.item.name] = props.item.value != null ? props.item.value : '';
+      }
+      return result;
     }
     function onSelectChange(item) {
       if (item.value) {
@@ -172745,7 +172780,6 @@ const SelectBySystemCode_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onMounted)(() => {
       getSysListForSelect();
     });
-    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)();
     expose({
       checkParams: mCheckParams,
       resetParams: mResetParams,
@@ -172753,7 +172787,6 @@ const SelectBySystemCode_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)
     });
     return {
       selSysObjectData,
-      innerFormItems,
       getSysListForSelect,
       onSelectChange,
       selectChange,
@@ -172763,10 +172796,10 @@ const SelectBySystemCode_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)
 }));
 ;// ./src/package/Form/BaseFormItem.vue?vue&type=script&lang=ts
  
-;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Form/BaseFormItem.vue?vue&type=style&index=0&id=4c723329&lang=scss&scoped=true
+;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Form/BaseFormItem.vue?vue&type=style&index=0&id=62728fcf&lang=scss&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// ./src/package/Form/BaseFormItem.vue?vue&type=style&index=0&id=4c723329&lang=scss&scoped=true
+;// ./src/package/Form/BaseFormItem.vue?vue&type=style&index=0&id=62728fcf&lang=scss&scoped=true
 
 ;// ./src/package/Form/BaseFormItem.vue
 
@@ -172776,7 +172809,7 @@ const SelectBySystemCode_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)
 ;
 
 
-const BaseFormItem_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(BaseFormItemvue_type_script_lang_ts, [['render',BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_render],['__scopeId',"data-v-4c723329"]])
+const BaseFormItem_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(BaseFormItemvue_type_script_lang_ts, [['render',BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_render],['__scopeId',"data-v-62728fcf"]])
 
 /* harmony default export */ var BaseFormItem = (BaseFormItem_exports_);
 ;// ./node_modules/babel-loader/lib/index.js!./node_modules/ts-loader/index.js??clonedRuleSet-41.use[1]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Form/BaseForm.vue?vue&type=script&lang=ts
@@ -172909,9 +172942,9 @@ const BaseFormItem_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(BaseF
 const BaseForm_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(BaseFormvue_type_script_lang_ts, [['render',BaseFormvue_type_template_id_5a2b5424_scoped_true_ts_true_render],['__scopeId',"data-v-5a2b5424"]])
 
 /* harmony default export */ var BaseForm = (BaseForm_exports_);
-;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/BaseGrid.vue?vue&type=template&id=452723b2&scoped=true
+;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/BaseGrid.vue?vue&type=template&id=2f556c6d&scoped=true
 
-function BaseGridvue_type_template_id_452723b2_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+function BaseGridvue_type_template_id_2f556c6d_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_vxe_grid = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("vxe-grid");
   return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_vxe_grid, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.mergeProps)({
     ref: "xGrid"
@@ -172925,14 +172958,14 @@ function BaseGridvue_type_template_id_452723b2_scoped_true_render(_ctx, _cache,
     onCellDblclick: _ctx.handleDBLClick
   }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createSlots)({
     _: 2
-  }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.renderList)(Object.keys(_ctx.$slots), slotName => {
+  }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.renderList)(Object.keys(_ctx.$slots || {}), slotName => {
     return {
       name: slotName,
       fn: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(data => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.renderSlot)(_ctx.$slots, slotName, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.normalizeProps)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.guardReactiveProps)(data)), undefined, true)])
     };
   })]), 1040, ["onPageChange", "onCellClick", "onCheckboxChange", "onCurrentChange", "onCellMouseenter", "onCellMouseleave", "onCellDblclick"]);
 }
-;// ./src/package/Grid/BaseGrid.vue?vue&type=template&id=452723b2&scoped=true
+;// ./src/package/Grid/BaseGrid.vue?vue&type=template&id=2f556c6d&scoped=true
 
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/BaseGrid.vue?vue&type=script&lang=js
 
@@ -173040,7 +173073,9 @@ function BaseGridvue_type_template_id_452723b2_scoped_true_render(_ctx, _cache,
     }) {
       const $grid = xGrid.value;
       if (!$grid || !lastClickedRow || props.multipleSelection) return;
-      if (row?.id !== lastClickedRow.id) {
+
+      // 安全地比较 id，避免 lastClickedRow 为 null 时的错误
+      if (row?.id !== lastClickedRow?.id) {
         await $grid.setCurrentRow(lastClickedRow);
       }
     }
@@ -173101,10 +173136,10 @@ function BaseGridvue_type_template_id_452723b2_scoped_true_render(_ctx, _cache,
 }));
 ;// ./src/package/Grid/BaseGrid.vue?vue&type=script&lang=js
  
-;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/BaseGrid.vue?vue&type=style&index=0&id=452723b2&scoped=true&lang=css
+;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/BaseGrid.vue?vue&type=style&index=0&id=2f556c6d&scoped=true&lang=css
 // extracted by mini-css-extract-plugin
 
-;// ./src/package/Grid/BaseGrid.vue?vue&type=style&index=0&id=452723b2&scoped=true&lang=css
+;// ./src/package/Grid/BaseGrid.vue?vue&type=style&index=0&id=2f556c6d&scoped=true&lang=css
 
 ;// ./src/package/Grid/BaseGrid.vue
 
@@ -173114,7 +173149,7 @@ function BaseGridvue_type_template_id_452723b2_scoped_true_render(_ctx, _cache,
 ;
 
 
-const BaseGrid_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(BaseGridvue_type_script_lang_js, [['render',BaseGridvue_type_template_id_452723b2_scoped_true_render],['__scopeId',"data-v-452723b2"]])
+const BaseGrid_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(BaseGridvue_type_script_lang_js, [['render',BaseGridvue_type_template_id_2f556c6d_scoped_true_render],['__scopeId',"data-v-2f556c6d"]])
 
 /* harmony default export */ var BaseGrid = (BaseGrid_exports_);
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/GoVxeGrid.vue?vue&type=template&id=0bab14de&scoped=true

package/woodao-pc-ui/woodao-pc-ui.css

@@ -34,7 +34,7 @@ button[data-v-7aa63542] {
   padding: 12px 20px !important; /* 调整悬停时的内边距 */
 }
 
-.form-item[data-v-4c723329]{width:100%}.ring-block[data-v-4c723329]{width:3px;height:14px;background:#00b3f3}.option-description[data-v-4c723329]{margin-left:5px;color:#a8abb2;font-size:12px}.row-option[data-v-4c723329]{display:block}
+.form-item[data-v-62728fcf]{width:100%}.ring-block[data-v-62728fcf]{width:3px;height:14px;background:#00b3f3}.option-description[data-v-62728fcf]{margin-left:5px;color:#a8abb2;font-size:12px}.row-option[data-v-62728fcf]{display:block}
 .error-message[data-v-5a2b5424]{color:#f56c6c;font-size:12px;line-height:1;padding-top:4px;position:absolute;top:100%;left:0}.form-item[data-v-5a2b5424]{width:100%}.ring-block[data-v-5a2b5424]{width:3px;height:14px;background:#00b3f3}.go-content-body[data-v-5a2b5424]{position:relative}.go-content-body .sel-item-container[data-v-5a2b5424]{border:1px solid #dcdee2;border-radius:4px;color:#515a6e;background-color:#fff;background-image:none;height:32px;line-height:30px}.go-content-body .sel-item-container[data-v-5a2b5424]:hover{border:1px solid #2d8cf0}.go-content-body .placeholder[data-v-5a2b5424]{color:#bbb}.go-content-body .input-group-addon[data-v-5a2b5424]{position:absolute;right:8px;top:7px;color:#666;font-size:14px}
 
 /* 你可以在这里添加样式 */

package/woodao-pc-ui/woodao-pc-ui.umd.js

@@ -47263,20 +47263,33 @@ var es_iterator_find = __webpack_require__(20116);
 
 /* harmony default export */ function Form() {
   function checkParams(innerFormItems) {
+    // 确保 innerFormItems 不为 undefined 或 null
+    if (!innerFormItems || !Array.isArray(innerFormItems)) {
+      return true;
+    }
     return innerFormItems.every(it => {
+      // 确保 it 不为 undefined 或 null
+      if (!it) return true;
       return it.validator ? it.validator(it, innerFormItems.find(item => it.associatedOption === item.name)) : true;
     });
   }
   function generatorParams(innerFormItems) {
     if (innerFormItems && innerFormItems.length !== 0) {
       return innerFormItems.reduce((pre, cur) => {
+        // 确保 cur 不为 undefined 或 null
+        if (!cur) return pre;
         if (cur.name !== undefined && cur.type != 'input-fixed' && cur.type != 'selPeople') {
-          pre[cur.name] = cur.value;
+          // 安全地处理 cur.value，避免 undefined 或 null
+          pre[cur.name] = cur.value != null ? cur.value : '';
         } else if (cur.name !== undefined && cur.type == 'input-fixed') {
-          pre[cur.name] = 'com.woodao.services' + cur.value1 + cur.value2;
+          // 安全地处理 cur.value1 和 cur.value2，避免 undefined 或 null
+          const value1 = cur.value1 != null ? cur.value1 : '';
+          const value2 = cur.value2 != null ? cur.value2 : '';
+          pre[cur.name] = 'com.woodao.services' + value1 + value2;
         } else if (cur.name !== undefined && cur.type == 'selPeople') {
-          pre[cur.name] = cur.value;
-          pre[cur.busValue] = cur.bindId;
+          // 安全地处理 cur.value 和 cur.bindId，避免 undefined 或 null
+          pre[cur.name] = cur.value != null ? cur.value : '';
+          pre[cur.busValue] = cur.bindId != null ? cur.bindId : '';
         }
         return pre;
       }, {});
@@ -47284,7 +47297,13 @@ var es_iterator_find = __webpack_require__(20116);
     return {};
   }
   function resetParams(innerFormItems) {
+    // 确保 innerFormItems 不为 undefined 或 null
+    if (!innerFormItems || !Array.isArray(innerFormItems)) {
+      return;
+    }
     innerFormItems.forEach(it => {
+      // 确保 it 不为 undefined 或 null
+      if (!it) return;
       it.reset ? it.reset() : it.value = '';
     });
   }
@@ -161274,7 +161293,7 @@ function useEcharts(dom, theme) {
   return instance;
 }
 ;// ./package.json
-var package_namespaceObject = {"rE":"0.0.34"};
+var package_namespaceObject = {"rE":"0.0.36"};
 ;// ./src/setting/index.ts
 
 const primaryColors = (/* unused pure expression or super */ null && (["#409eff", "#13C2C2", "#F5222D", "#722ED1", "#f7acbc", "#ef5b9c", "#bd6758", "#f47920", "#2e3a1f", "#b2d235", "#121a2a", "#6a6da9", "#867892", "#fcaf17", "#76becc", "#1b315e", "#b4532a", "#008792"]));
@@ -172090,30 +172109,30 @@ __default__.setup = __setup__ ? (props, ctx) => {
 const SelPeople_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(SelPeoplevue_type_script_lang_ts, [['render',SelPeoplevue_type_template_id_51989aae_scoped_true_ts_true_render],['__scopeId',"data-v-51989aae"]])
 
 /* harmony default export */ var SelPeople = (SelPeople_exports_);
-;// ./node_modules/babel-loader/lib/index.js!./node_modules/ts-loader/index.js??clonedRuleSet-41.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Form/BaseFormItem.vue?vue&type=template&id=4c723329&scoped=true&ts=true
+;// ./node_modules/babel-loader/lib/index.js!./node_modules/ts-loader/index.js??clonedRuleSet-41.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Form/BaseFormItem.vue?vue&type=template&id=62728fcf&scoped=true&ts=true
 
-const BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_hoisted_1 = {
+const BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_hoisted_1 = {
   style: {
     "width": "100%"
   }
 };
-const BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_hoisted_2 = {
+const BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_hoisted_2 = {
   key: 3,
   class: "w100"
 };
-const BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_hoisted_3 = {
+const BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_hoisted_3 = {
   class: "flex-row-start w100"
 };
-const BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_hoisted_4 = {
+const BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_hoisted_4 = {
   style: {
     "width": "100%",
     "height": "8px"
   }
 };
-const BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_hoisted_5 = {
+const BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_hoisted_5 = {
   key: 17
 };
-function BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+function BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_FormRender = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("FormRender");
   const _component_el_button = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-button");
   const _component_el_input = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-input");
@@ -172125,7 +172144,7 @@ function BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_render(_c
   const _component_el_radio_group = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-radio-group");
   const _component_el_checkbox_group = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-checkbox-group");
   const _component_el_switch = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-switch");
-  return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)("div", BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_hoisted_1, [_ctx.item.render ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_FormRender, {
+  return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)("div", BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_hoisted_1, [_ctx.item.render ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_FormRender, {
     key: 0,
     render: _ctx.item.render,
     "form-item": _ctx.item
@@ -172152,7 +172171,7 @@ function BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_render(_c
     rows: _ctx.item.rows || 5,
     class: "form-item",
     "show-password": _ctx.item.inputType === 'password'
-  }, null, 8, ["modelValue", "placeholder", "size", "readonly", "disabled", "type", "maxlength", "rows", "show-password"])) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)("", true), _ctx.item.type === 'input-fixed' ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)("div", BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_hoisted_2, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("div", BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_hoisted_3, [_cache[23] || (_cache[23] = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("span", null, "com.woodao.services", -1)), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_el_input, {
+  }, null, 8, ["modelValue", "placeholder", "size", "readonly", "disabled", "type", "maxlength", "rows", "show-password"])) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)("", true), _ctx.item.type === 'input-fixed' ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)("div", BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_hoisted_2, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("div", BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_hoisted_3, [_cache[23] || (_cache[23] = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("span", null, "com.woodao.services", -1)), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_el_input, {
     modelValue: _ctx.item.value1,
     "onUpdate:modelValue": _cache[2] || (_cache[2] = $event => _ctx.item.value1 = $event),
     placeholder: _ctx.item.placeholder1 || '请输入',
@@ -172373,7 +172392,7 @@ function BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_render(_c
     size: _ctx.size || 'default',
     onChange: _cache[20] || (_cache[20] = $event => _ctx.item.onChange ? _ctx.item.onChange(_ctx.item.value, _ctx.item.associatedOption || '') : () => {})
   }, {
-    default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.withDirectives)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("div", BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_hoisted_4, null, 512), [[external_commonjs_vue_commonjs2_vue_root_Vue_.vShow, _ctx.item.optionType === 'row']]), ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(true), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)(external_commonjs_vue_commonjs2_vue_root_Vue_.Fragment, null, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.renderList)(_ctx.item.checkOptions, optionItem => {
+    default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.withDirectives)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("div", BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_hoisted_4, null, 512), [[external_commonjs_vue_commonjs2_vue_root_Vue_.vShow, _ctx.item.optionType === 'row']]), ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(true), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)(external_commonjs_vue_commonjs2_vue_root_Vue_.Fragment, null, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.renderList)(_ctx.item.checkOptions, optionItem => {
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveDynamicComponent)(_ctx.item.style === 'button' ? 'el-checkbox-button' : 'el-checkbox'), {
         class: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.normalizeClass)(_ctx.item.optionType === 'row' ? 'row-option' : ''),
         key: optionItem.value,
@@ -172393,9 +172412,9 @@ function BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_render(_c
     disabled: _ctx.item.disabled || false,
     size: _ctx.size || 'default',
     onChange: _cache[22] || (_cache[22] = $event => _ctx.item.onChange ? _ctx.item.onChange(_ctx.item.value, _ctx.item.associatedOption || '') : () => {})
-  }, null, 8, ["modelValue", "disabled", "size"])) : _ctx.item.type === 'span' ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)("span", BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_hoisted_5, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)(_ctx.item.value), 1)) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)("", true)]);
+  }, null, 8, ["modelValue", "disabled", "size"])) : _ctx.item.type === 'span' ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)("span", BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_hoisted_5, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)(_ctx.item.value), 1)) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)("", true)]);
 }
-;// ./src/package/Form/BaseFormItem.vue?vue&type=template&id=4c723329&scoped=true&ts=true
+;// ./src/package/Form/BaseFormItem.vue?vue&type=template&id=62728fcf&scoped=true&ts=true
 
 // EXTERNAL MODULE: ./node_modules/console-browserify/index.js
 var console_browserify = __webpack_require__(34844);
@@ -172641,7 +172660,6 @@ const SelectBySystemCode_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)
 
 
 
-
 /* harmony default export */ var BaseFormItemvue_type_script_lang_ts = ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.defineComponent)({
   name: "BaseFormItem",
   components: {
@@ -172670,22 +172688,39 @@ const SelectBySystemCode_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)
     expose,
     emit
   }) {
-    const {
-      checkParams,
-      resetParams,
-      generatorParams
-    } = useForm();
-    const innerFormItems = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
-      return props.formItems;
-    });
+    // 由于 BaseFormItem 只处理单个表单项，不需要 formItems
+    // 这些方法应该由父组件 BaseForm 来处理
     function mCheckParams() {
-      return checkParams(innerFormItems.value);
+      // 单个表单项的验证逻辑
+      if (!props.item) return true;
+      return props.item.validator ? props.item.validator(props.item) : true;
     }
     function mResetParams() {
-      return resetParams(innerFormItems.value);
+      // 单个表单项的重置逻辑
+      if (!props.item) return;
+      if (props.item.reset) {
+        props.item.reset();
+      } else {
+        props.item.value = '';
+      }
     }
     function mGeneratorParams() {
-      return generatorParams(innerFormItems.value);
+      // 单个表单项的参数生成逻辑
+      if (!props.item || !props.item.name) return {};
+      const result = {};
+      if (props.item.type === 'input-fixed') {
+        const value1 = props.item.value1 != null ? props.item.value1 : '';
+        const value2 = props.item.value2 != null ? props.item.value2 : '';
+        result[props.item.name] = 'com.woodao.services' + value1 + value2;
+      } else if (props.item.type === 'selPeople') {
+        result[props.item.name] = props.item.value != null ? props.item.value : '';
+        if (props.item.busValue) {
+          result[props.item.busValue] = props.item.bindId != null ? props.item.bindId : '';
+        }
+      } else {
+        result[props.item.name] = props.item.value != null ? props.item.value : '';
+      }
+      return result;
     }
     function onSelectChange(item) {
       if (item.value) {
@@ -172745,7 +172780,6 @@ const SelectBySystemCode_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onMounted)(() => {
       getSysListForSelect();
     });
-    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)();
     expose({
       checkParams: mCheckParams,
       resetParams: mResetParams,
@@ -172753,7 +172787,6 @@ const SelectBySystemCode_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)
     });
     return {
       selSysObjectData,
-      innerFormItems,
       getSysListForSelect,
       onSelectChange,
       selectChange,
@@ -172763,10 +172796,10 @@ const SelectBySystemCode_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)
 }));
 ;// ./src/package/Form/BaseFormItem.vue?vue&type=script&lang=ts
  
-;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-66.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-66.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-66.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-66.use[3]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Form/BaseFormItem.vue?vue&type=style&index=0&id=4c723329&lang=scss&scoped=true
+;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-66.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-66.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-66.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-66.use[3]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Form/BaseFormItem.vue?vue&type=style&index=0&id=62728fcf&lang=scss&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// ./src/package/Form/BaseFormItem.vue?vue&type=style&index=0&id=4c723329&lang=scss&scoped=true
+;// ./src/package/Form/BaseFormItem.vue?vue&type=style&index=0&id=62728fcf&lang=scss&scoped=true
 
 ;// ./src/package/Form/BaseFormItem.vue
 
@@ -172776,7 +172809,7 @@ const SelectBySystemCode_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)
 ;
 
 
-const BaseFormItem_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(BaseFormItemvue_type_script_lang_ts, [['render',BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_render],['__scopeId',"data-v-4c723329"]])
+const BaseFormItem_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(BaseFormItemvue_type_script_lang_ts, [['render',BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_render],['__scopeId',"data-v-62728fcf"]])
 
 /* harmony default export */ var BaseFormItem = (BaseFormItem_exports_);
 ;// ./node_modules/babel-loader/lib/index.js!./node_modules/ts-loader/index.js??clonedRuleSet-41.use[1]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Form/BaseForm.vue?vue&type=script&lang=ts
@@ -172909,9 +172942,9 @@ const BaseFormItem_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(BaseF
 const BaseForm_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(BaseFormvue_type_script_lang_ts, [['render',BaseFormvue_type_template_id_5a2b5424_scoped_true_ts_true_render],['__scopeId',"data-v-5a2b5424"]])
 
 /* harmony default export */ var BaseForm = (BaseForm_exports_);
-;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-84.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/BaseGrid.vue?vue&type=template&id=452723b2&scoped=true
+;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-84.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/BaseGrid.vue?vue&type=template&id=2f556c6d&scoped=true
 
-function BaseGridvue_type_template_id_452723b2_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+function BaseGridvue_type_template_id_2f556c6d_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_vxe_grid = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("vxe-grid");
   return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_vxe_grid, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.mergeProps)({
     ref: "xGrid"
@@ -172925,14 +172958,14 @@ function BaseGridvue_type_template_id_452723b2_scoped_true_render(_ctx, _cache,
     onCellDblclick: _ctx.handleDBLClick
   }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createSlots)({
     _: 2
-  }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.renderList)(Object.keys(_ctx.$slots), slotName => {
+  }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.renderList)(Object.keys(_ctx.$slots || {}), slotName => {
     return {
       name: slotName,
       fn: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(data => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.renderSlot)(_ctx.$slots, slotName, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.normalizeProps)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.guardReactiveProps)(data)), undefined, true)])
     };
   })]), 1040, ["onPageChange", "onCellClick", "onCheckboxChange", "onCurrentChange", "onCellMouseenter", "onCellMouseleave", "onCellDblclick"]);
 }
-;// ./src/package/Grid/BaseGrid.vue?vue&type=template&id=452723b2&scoped=true
+;// ./src/package/Grid/BaseGrid.vue?vue&type=template&id=2f556c6d&scoped=true
 
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-84.use[1]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/BaseGrid.vue?vue&type=script&lang=js
 
@@ -173040,7 +173073,9 @@ function BaseGridvue_type_template_id_452723b2_scoped_true_render(_ctx, _cache,
     }) {
       const $grid = xGrid.value;
       if (!$grid || !lastClickedRow || props.multipleSelection) return;
-      if (row?.id !== lastClickedRow.id) {
+
+      // 安全地比较 id，避免 lastClickedRow 为 null 时的错误
+      if (row?.id !== lastClickedRow?.id) {
         await $grid.setCurrentRow(lastClickedRow);
       }
     }
@@ -173101,10 +173136,10 @@ function BaseGridvue_type_template_id_452723b2_scoped_true_render(_ctx, _cache,
 }));
 ;// ./src/package/Grid/BaseGrid.vue?vue&type=script&lang=js
  
-;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-56.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-56.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-56.use[2]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/BaseGrid.vue?vue&type=style&index=0&id=452723b2&scoped=true&lang=css
+;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-56.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-56.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-56.use[2]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/BaseGrid.vue?vue&type=style&index=0&id=2f556c6d&scoped=true&lang=css
 // extracted by mini-css-extract-plugin
 
-;// ./src/package/Grid/BaseGrid.vue?vue&type=style&index=0&id=452723b2&scoped=true&lang=css
+;// ./src/package/Grid/BaseGrid.vue?vue&type=style&index=0&id=2f556c6d&scoped=true&lang=css
 
 ;// ./src/package/Grid/BaseGrid.vue
 
@@ -173114,7 +173149,7 @@ function BaseGridvue_type_template_id_452723b2_scoped_true_render(_ctx, _cache,
 ;
 
 
-const BaseGrid_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(BaseGridvue_type_script_lang_js, [['render',BaseGridvue_type_template_id_452723b2_scoped_true_render],['__scopeId',"data-v-452723b2"]])
+const BaseGrid_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(BaseGridvue_type_script_lang_js, [['render',BaseGridvue_type_template_id_2f556c6d_scoped_true_render],['__scopeId',"data-v-2f556c6d"]])
 
 /* harmony default export */ var BaseGrid = (BaseGrid_exports_);
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-84.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/GoVxeGrid.vue?vue&type=template&id=0bab14de&scoped=true

package/woodao-pc-ui/woodao-pc-ui.umd.min.js

@@ -47263,20 +47263,33 @@ var es_iterator_find = __webpack_require__(20116);
 
 /* harmony default export */ function Form() {
   function checkParams(innerFormItems) {
+    // 确保 innerFormItems 不为 undefined 或 null
+    if (!innerFormItems || !Array.isArray(innerFormItems)) {
+      return true;
+    }
     return innerFormItems.every(it => {
+      // 确保 it 不为 undefined 或 null
+      if (!it) return true;
       return it.validator ? it.validator(it, innerFormItems.find(item => it.associatedOption === item.name)) : true;
     });
   }
   function generatorParams(innerFormItems) {
     if (innerFormItems && innerFormItems.length !== 0) {
       return innerFormItems.reduce((pre, cur) => {
+        // 确保 cur 不为 undefined 或 null
+        if (!cur) return pre;
         if (cur.name !== undefined && cur.type != 'input-fixed' && cur.type != 'selPeople') {
-          pre[cur.name] = cur.value;
+          // 安全地处理 cur.value，避免 undefined 或 null
+          pre[cur.name] = cur.value != null ? cur.value : '';
         } else if (cur.name !== undefined && cur.type == 'input-fixed') {
-          pre[cur.name] = 'com.woodao.services' + cur.value1 + cur.value2;
+          // 安全地处理 cur.value1 和 cur.value2，避免 undefined 或 null
+          const value1 = cur.value1 != null ? cur.value1 : '';
+          const value2 = cur.value2 != null ? cur.value2 : '';
+          pre[cur.name] = 'com.woodao.services' + value1 + value2;
         } else if (cur.name !== undefined && cur.type == 'selPeople') {
-          pre[cur.name] = cur.value;
-          pre[cur.busValue] = cur.bindId;
+          // 安全地处理 cur.value 和 cur.bindId，避免 undefined 或 null
+          pre[cur.name] = cur.value != null ? cur.value : '';
+          pre[cur.busValue] = cur.bindId != null ? cur.bindId : '';
         }
         return pre;
       }, {});
@@ -47284,7 +47297,13 @@ var es_iterator_find = __webpack_require__(20116);
     return {};
   }
   function resetParams(innerFormItems) {
+    // 确保 innerFormItems 不为 undefined 或 null
+    if (!innerFormItems || !Array.isArray(innerFormItems)) {
+      return;
+    }
     innerFormItems.forEach(it => {
+      // 确保 it 不为 undefined 或 null
+      if (!it) return;
       it.reset ? it.reset() : it.value = '';
     });
   }
@@ -161274,7 +161293,7 @@ function useEcharts(dom, theme) {
   return instance;
 }
 ;// ./package.json
-var package_namespaceObject = {"rE":"0.0.34"};
+var package_namespaceObject = {"rE":"0.0.36"};
 ;// ./src/setting/index.ts
 
 const primaryColors = (/* unused pure expression or super */ null && (["#409eff", "#13C2C2", "#F5222D", "#722ED1", "#f7acbc", "#ef5b9c", "#bd6758", "#f47920", "#2e3a1f", "#b2d235", "#121a2a", "#6a6da9", "#867892", "#fcaf17", "#76becc", "#1b315e", "#b4532a", "#008792"]));
@@ -172090,30 +172109,30 @@ __default__.setup = __setup__ ? (props, ctx) => {
 const SelPeople_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(SelPeoplevue_type_script_lang_ts, [['render',SelPeoplevue_type_template_id_51989aae_scoped_true_ts_true_render],['__scopeId',"data-v-51989aae"]])
 
 /* harmony default export */ var SelPeople = (SelPeople_exports_);
-;// ./node_modules/babel-loader/lib/index.js!./node_modules/ts-loader/index.js??clonedRuleSet-41.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Form/BaseFormItem.vue?vue&type=template&id=4c723329&scoped=true&ts=true
+;// ./node_modules/babel-loader/lib/index.js!./node_modules/ts-loader/index.js??clonedRuleSet-41.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Form/BaseFormItem.vue?vue&type=template&id=62728fcf&scoped=true&ts=true
 
-const BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_hoisted_1 = {
+const BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_hoisted_1 = {
   style: {
     "width": "100%"
   }
 };
-const BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_hoisted_2 = {
+const BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_hoisted_2 = {
   key: 3,
   class: "w100"
 };
-const BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_hoisted_3 = {
+const BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_hoisted_3 = {
   class: "flex-row-start w100"
 };
-const BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_hoisted_4 = {
+const BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_hoisted_4 = {
   style: {
     "width": "100%",
     "height": "8px"
   }
 };
-const BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_hoisted_5 = {
+const BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_hoisted_5 = {
   key: 17
 };
-function BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+function BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_FormRender = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("FormRender");
   const _component_el_button = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-button");
   const _component_el_input = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-input");
@@ -172125,7 +172144,7 @@ function BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_render(_c
   const _component_el_radio_group = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-radio-group");
   const _component_el_checkbox_group = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-checkbox-group");
   const _component_el_switch = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-switch");
-  return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)("div", BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_hoisted_1, [_ctx.item.render ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_FormRender, {
+  return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)("div", BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_hoisted_1, [_ctx.item.render ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_FormRender, {
     key: 0,
     render: _ctx.item.render,
     "form-item": _ctx.item
@@ -172152,7 +172171,7 @@ function BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_render(_c
     rows: _ctx.item.rows || 5,
     class: "form-item",
     "show-password": _ctx.item.inputType === 'password'
-  }, null, 8, ["modelValue", "placeholder", "size", "readonly", "disabled", "type", "maxlength", "rows", "show-password"])) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)("", true), _ctx.item.type === 'input-fixed' ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)("div", BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_hoisted_2, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("div", BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_hoisted_3, [_cache[23] || (_cache[23] = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("span", null, "com.woodao.services", -1)), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_el_input, {
+  }, null, 8, ["modelValue", "placeholder", "size", "readonly", "disabled", "type", "maxlength", "rows", "show-password"])) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)("", true), _ctx.item.type === 'input-fixed' ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)("div", BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_hoisted_2, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("div", BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_hoisted_3, [_cache[23] || (_cache[23] = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("span", null, "com.woodao.services", -1)), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_el_input, {
     modelValue: _ctx.item.value1,
     "onUpdate:modelValue": _cache[2] || (_cache[2] = $event => _ctx.item.value1 = $event),
     placeholder: _ctx.item.placeholder1 || '请输入',
@@ -172373,7 +172392,7 @@ function BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_render(_c
     size: _ctx.size || 'default',
     onChange: _cache[20] || (_cache[20] = $event => _ctx.item.onChange ? _ctx.item.onChange(_ctx.item.value, _ctx.item.associatedOption || '') : () => {})
   }, {
-    default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.withDirectives)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("div", BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_hoisted_4, null, 512), [[external_commonjs_vue_commonjs2_vue_root_Vue_.vShow, _ctx.item.optionType === 'row']]), ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(true), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)(external_commonjs_vue_commonjs2_vue_root_Vue_.Fragment, null, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.renderList)(_ctx.item.checkOptions, optionItem => {
+    default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.withDirectives)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("div", BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_hoisted_4, null, 512), [[external_commonjs_vue_commonjs2_vue_root_Vue_.vShow, _ctx.item.optionType === 'row']]), ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(true), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)(external_commonjs_vue_commonjs2_vue_root_Vue_.Fragment, null, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.renderList)(_ctx.item.checkOptions, optionItem => {
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveDynamicComponent)(_ctx.item.style === 'button' ? 'el-checkbox-button' : 'el-checkbox'), {
         class: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.normalizeClass)(_ctx.item.optionType === 'row' ? 'row-option' : ''),
         key: optionItem.value,
@@ -172393,9 +172412,9 @@ function BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_render(_c
     disabled: _ctx.item.disabled || false,
     size: _ctx.size || 'default',
     onChange: _cache[22] || (_cache[22] = $event => _ctx.item.onChange ? _ctx.item.onChange(_ctx.item.value, _ctx.item.associatedOption || '') : () => {})
-  }, null, 8, ["modelValue", "disabled", "size"])) : _ctx.item.type === 'span' ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)("span", BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_hoisted_5, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)(_ctx.item.value), 1)) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)("", true)]);
+  }, null, 8, ["modelValue", "disabled", "size"])) : _ctx.item.type === 'span' ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)("span", BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_hoisted_5, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.toDisplayString)(_ctx.item.value), 1)) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)("", true)]);
 }
-;// ./src/package/Form/BaseFormItem.vue?vue&type=template&id=4c723329&scoped=true&ts=true
+;// ./src/package/Form/BaseFormItem.vue?vue&type=template&id=62728fcf&scoped=true&ts=true
 
 // EXTERNAL MODULE: ./node_modules/console-browserify/index.js
 var console_browserify = __webpack_require__(8313);
@@ -172641,7 +172660,6 @@ const SelectBySystemCode_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)
 
 
 
-
 /* harmony default export */ var BaseFormItemvue_type_script_lang_ts = ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.defineComponent)({
   name: "BaseFormItem",
   components: {
@@ -172670,22 +172688,39 @@ const SelectBySystemCode_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)
     expose,
     emit
   }) {
-    const {
-      checkParams,
-      resetParams,
-      generatorParams
-    } = useForm();
-    const innerFormItems = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
-      return props.formItems;
-    });
+    // 由于 BaseFormItem 只处理单个表单项，不需要 formItems
+    // 这些方法应该由父组件 BaseForm 来处理
     function mCheckParams() {
-      return checkParams(innerFormItems.value);
+      // 单个表单项的验证逻辑
+      if (!props.item) return true;
+      return props.item.validator ? props.item.validator(props.item) : true;
     }
     function mResetParams() {
-      return resetParams(innerFormItems.value);
+      // 单个表单项的重置逻辑
+      if (!props.item) return;
+      if (props.item.reset) {
+        props.item.reset();
+      } else {
+        props.item.value = '';
+      }
     }
     function mGeneratorParams() {
-      return generatorParams(innerFormItems.value);
+      // 单个表单项的参数生成逻辑
+      if (!props.item || !props.item.name) return {};
+      const result = {};
+      if (props.item.type === 'input-fixed') {
+        const value1 = props.item.value1 != null ? props.item.value1 : '';
+        const value2 = props.item.value2 != null ? props.item.value2 : '';
+        result[props.item.name] = 'com.woodao.services' + value1 + value2;
+      } else if (props.item.type === 'selPeople') {
+        result[props.item.name] = props.item.value != null ? props.item.value : '';
+        if (props.item.busValue) {
+          result[props.item.busValue] = props.item.bindId != null ? props.item.bindId : '';
+        }
+      } else {
+        result[props.item.name] = props.item.value != null ? props.item.value : '';
+      }
+      return result;
     }
     function onSelectChange(item) {
       if (item.value) {
@@ -172745,7 +172780,6 @@ const SelectBySystemCode_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onMounted)(() => {
       getSysListForSelect();
     });
-    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)();
     expose({
       checkParams: mCheckParams,
       resetParams: mResetParams,
@@ -172753,7 +172787,6 @@ const SelectBySystemCode_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)
     });
     return {
       selSysObjectData,
-      innerFormItems,
       getSysListForSelect,
       onSelectChange,
       selectChange,
@@ -172763,10 +172796,10 @@ const SelectBySystemCode_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)
 }));
 ;// ./src/package/Form/BaseFormItem.vue?vue&type=script&lang=ts
  
-;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-110.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-110.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-110.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-110.use[3]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Form/BaseFormItem.vue?vue&type=style&index=0&id=4c723329&lang=scss&scoped=true
+;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-110.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-110.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-110.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-110.use[3]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Form/BaseFormItem.vue?vue&type=style&index=0&id=62728fcf&lang=scss&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// ./src/package/Form/BaseFormItem.vue?vue&type=style&index=0&id=4c723329&lang=scss&scoped=true
+;// ./src/package/Form/BaseFormItem.vue?vue&type=style&index=0&id=62728fcf&lang=scss&scoped=true
 
 ;// ./src/package/Form/BaseFormItem.vue
 
@@ -172776,7 +172809,7 @@ const SelectBySystemCode_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)
 ;
 
 
-const BaseFormItem_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(BaseFormItemvue_type_script_lang_ts, [['render',BaseFormItemvue_type_template_id_4c723329_scoped_true_ts_true_render],['__scopeId',"data-v-4c723329"]])
+const BaseFormItem_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(BaseFormItemvue_type_script_lang_ts, [['render',BaseFormItemvue_type_template_id_62728fcf_scoped_true_ts_true_render],['__scopeId',"data-v-62728fcf"]])
 
 /* harmony default export */ var BaseFormItem = (BaseFormItem_exports_);
 ;// ./node_modules/babel-loader/lib/index.js!./node_modules/ts-loader/index.js??clonedRuleSet-41.use[1]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Form/BaseForm.vue?vue&type=script&lang=ts
@@ -172909,9 +172942,9 @@ const BaseFormItem_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(BaseF
 const BaseForm_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(BaseFormvue_type_script_lang_ts, [['render',BaseFormvue_type_template_id_5a2b5424_scoped_true_ts_true_render],['__scopeId',"data-v-5a2b5424"]])
 
 /* harmony default export */ var BaseForm = (BaseForm_exports_);
-;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-128.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/BaseGrid.vue?vue&type=template&id=452723b2&scoped=true
+;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-128.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/BaseGrid.vue?vue&type=template&id=2f556c6d&scoped=true
 
-function BaseGridvue_type_template_id_452723b2_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+function BaseGridvue_type_template_id_2f556c6d_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_vxe_grid = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("vxe-grid");
   return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_vxe_grid, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.mergeProps)({
     ref: "xGrid"
@@ -172925,14 +172958,14 @@ function BaseGridvue_type_template_id_452723b2_scoped_true_render(_ctx, _cache,
     onCellDblclick: _ctx.handleDBLClick
   }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createSlots)({
     _: 2
-  }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.renderList)(Object.keys(_ctx.$slots), slotName => {
+  }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.renderList)(Object.keys(_ctx.$slots || {}), slotName => {
     return {
       name: slotName,
       fn: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(data => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.renderSlot)(_ctx.$slots, slotName, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.normalizeProps)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.guardReactiveProps)(data)), undefined, true)])
     };
   })]), 1040, ["onPageChange", "onCellClick", "onCheckboxChange", "onCurrentChange", "onCellMouseenter", "onCellMouseleave", "onCellDblclick"]);
 }
-;// ./src/package/Grid/BaseGrid.vue?vue&type=template&id=452723b2&scoped=true
+;// ./src/package/Grid/BaseGrid.vue?vue&type=template&id=2f556c6d&scoped=true
 
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-128.use[1]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/BaseGrid.vue?vue&type=script&lang=js
 
@@ -173040,7 +173073,9 @@ function BaseGridvue_type_template_id_452723b2_scoped_true_render(_ctx, _cache,
     }) {
       const $grid = xGrid.value;
       if (!$grid || !lastClickedRow || props.multipleSelection) return;
-      if (row?.id !== lastClickedRow.id) {
+
+      // 安全地比较 id，避免 lastClickedRow 为 null 时的错误
+      if (row?.id !== lastClickedRow?.id) {
         await $grid.setCurrentRow(lastClickedRow);
       }
     }
@@ -173101,10 +173136,10 @@ function BaseGridvue_type_template_id_452723b2_scoped_true_render(_ctx, _cache,
 }));
 ;// ./src/package/Grid/BaseGrid.vue?vue&type=script&lang=js
  
-;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-100.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-100.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-100.use[2]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/BaseGrid.vue?vue&type=style&index=0&id=452723b2&scoped=true&lang=css
+;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-100.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-100.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-100.use[2]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/BaseGrid.vue?vue&type=style&index=0&id=2f556c6d&scoped=true&lang=css
 // extracted by mini-css-extract-plugin
 
-;// ./src/package/Grid/BaseGrid.vue?vue&type=style&index=0&id=452723b2&scoped=true&lang=css
+;// ./src/package/Grid/BaseGrid.vue?vue&type=style&index=0&id=2f556c6d&scoped=true&lang=css
 
 ;// ./src/package/Grid/BaseGrid.vue
 
@@ -173114,7 +173149,7 @@ function BaseGridvue_type_template_id_452723b2_scoped_true_render(_ctx, _cache,
 ;
 
 
-const BaseGrid_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(BaseGridvue_type_script_lang_js, [['render',BaseGridvue_type_template_id_452723b2_scoped_true_render],['__scopeId',"data-v-452723b2"]])
+const BaseGrid_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(BaseGridvue_type_script_lang_js, [['render',BaseGridvue_type_template_id_2f556c6d_scoped_true_render],['__scopeId',"data-v-2f556c6d"]])
 
 /* harmony default export */ var BaseGrid = (BaseGrid_exports_);
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-128.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Grid/GoVxeGrid.vue?vue&type=template&id=0bab14de&scoped=true