@baosight/erm 1.0.55 → 1.0.56

package/lib/index.common.js

@@ -41286,7 +41286,7 @@ const MobileButtonEdit_exports_ = MobileButtonEditvue_type_script_lang_ts_setup_
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js!./node_modules/ts-loader/index.js??clonedRuleSet-41.use[2]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./packages/ermForm/ermForm.vue?vue&type=script&lang=ts&setup=true
 
 
-const ermFormvue_type_script_lang_ts_setup_true_withScopeId = n => (_pushScopeId("data-v-39d06794"), n = n(), _popScopeId(), n);
+const ermFormvue_type_script_lang_ts_setup_true_withScopeId = n => (_pushScopeId("data-v-5446108e"), n = n(), _popScopeId(), n);
 const ermFormvue_type_script_lang_ts_setup_true_hoisted_1 = {
   key: 0,
   class: "mainTitle"
@@ -41373,7 +41373,8 @@ const ermFormvue_type_script_lang_ts_setup_true_hoisted_5 = {
       addRow,
       checkRequireInput,
       resetData,
-      getGridCellData
+      getGridCellData,
+      mergeDataRow
     });
     //#endregion
     //#region 单记录高度设置
@@ -41490,6 +41491,12 @@ const ermFormvue_type_script_lang_ts_setup_true_hoisted_5 = {
     //#region 默认值规则defaultValueRule()
     function defaultValueRule(str, type) {
       var defaultValue = str.trim();
+      if (str.trim().indexOf("yyyy") > 0) {
+        defaultValue = str.trim().replace('yyyy', 'YYYY');
+      }
+      if (str.trim().indexOf("MMdd") > 0) {
+        defaultValue = str.trim().replace('dd', 'DD');
+      }
       var date = new Date();
       if (defaultValue === '$USER_ID$') {
         return (0,ei.getCurrentUser)().userId;
@@ -41498,7 +41505,7 @@ const ermFormvue_type_script_lang_ts_setup_true_hoisted_5 = {
       } else if (defaultValue === '$USER_NAME$') {
         return (0,ei.getCurrentUser)().userName;
       } else if (defaultValue.toUpperCase().indexOf('YYYY') >= 0 && defaultValue.toUpperCase().indexOf(',ADD') < 0) {
-        var out = moment_default()(date).format(str);
+        var out = moment_default()(date).format(defaultValue);
         return out;
       } else if (defaultValue.toUpperCase().indexOf(',ADDDAYS') > 0) {
         var idx = defaultValue.toUpperCase().indexOf(',ADDDAYS');
@@ -41609,7 +41616,7 @@ const ermFormvue_type_script_lang_ts_setup_true_hoisted_5 = {
           for (let i = 0; i < codeSets.value[itemConfig.SVC_NAME].data.length; i++) {
             const element = codeSets.value[itemConfig.SVC_NAME].data[i];
             codeSets.value[itemConfig.SVC_NAME].data[i].showFlag = true;
-            if (data[0][itemConfig.FATHER_FIELD].toString().trim() !== '' && element[FORM_FILTER] !== data[0][itemConfig.FATHER_FIELD]) {
+            if ((data[0][itemConfig.FATHER_FIELD] !== '' || data[0][itemConfig.FATHER_FIELD] !== ' ') && element[FORM_FILTER] !== data[0][itemConfig.FATHER_FIELD]) {
               element.showFlag = false;
             } else {
               element.showFlag = true;
@@ -41672,6 +41679,22 @@ const ermFormvue_type_script_lang_ts_setup_true_hoisted_5 = {
       });
     }
     //#endregion
+    //#region mergeDataRow 整行赋值
+    function mergeDataRow(idx, objIn) {
+      if (data.length <= idx) {
+        console.log('data中不存在第' + idx + '行数据');
+        return;
+      }
+      for (const key in objIn) {
+        if (objIn.hasOwnProperty(key)) {
+          console.log(`属性名: ${key}, 属性值: ${objIn[key]}`);
+          if (data[idx].hasOwnProperty(key)) {
+            data[idx][key] = objIn[key];
+          }
+        }
+      }
+    }
+    //#endregion
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.onMounted)(() => {
       getItemConfig();
     });
@@ -41773,10 +41796,10 @@ const ermFormvue_type_script_lang_ts_setup_true_hoisted_5 = {
 }));
 ;// CONCATENATED MODULE: ./packages/ermForm/ermForm.vue?vue&type=script&lang=ts&setup=true
  
-;// CONCATENATED MODULE: ./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]!./packages/ermForm/ermForm.vue?vue&type=style&index=0&id=39d06794&lang=scss&scoped=true
+;// CONCATENATED MODULE: ./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]!./packages/ermForm/ermForm.vue?vue&type=style&index=0&id=5446108e&lang=scss&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./packages/ermForm/ermForm.vue?vue&type=style&index=0&id=39d06794&lang=scss&scoped=true
+;// CONCATENATED MODULE: ./packages/ermForm/ermForm.vue?vue&type=style&index=0&id=5446108e&lang=scss&scoped=true
 
 ;// CONCATENATED MODULE: ./packages/ermForm/ermForm.vue
 
@@ -41785,7 +41808,7 @@ const ermFormvue_type_script_lang_ts_setup_true_hoisted_5 = {
 ;
 
 
-const ermForm_exports_ = /*#__PURE__*/(0,exportHelper/* default */.Z)(ermFormvue_type_script_lang_ts_setup_true, [['__scopeId',"data-v-39d06794"]])
+const ermForm_exports_ = /*#__PURE__*/(0,exportHelper/* default */.Z)(ermFormvue_type_script_lang_ts_setup_true, [['__scopeId',"data-v-5446108e"]])
 
 /* harmony default export */ const ermForm = (ermForm_exports_);
 ;// CONCATENATED MODULE: ./packages/ermForm/index.ts