mooho-base-admin-plus 0.4.75 → 0.4.76

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "0.4.75",
+  "version": "0.4.76",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "dotnetVersion": "1.4.0",
   "license": "MIT",

package/src/components/view/view-table.vue

@@ -245,6 +245,49 @@
                 @on-change="selected => onSelectDataChange(rowData(row, index), column, selected)"
               ></dialog-select>
             </template>
+            <template v-else-if="column.controlType === 'SelectWithOther'">
+              <div style="display: flex">
+                <Select
+                  :model-value="parseDataWithOther(rowData(row, index), column)"
+                  @update:model-value="$event => setDataWithOther(rowData(row, index), column.code, $event)"
+                  size="small"
+                  :disabled="isReadonly(rowData(row, index), column)"
+                  :clearable="true"
+                  :style="{
+                    width:
+                      parseDataWithOther(rowData(row, index), column) == '__Other'
+                        ? column.controlWidth == null
+                          ? null
+                          : column.controlWidth * 0.4 - 4 + 'px'
+                        : column.controlWidth == null
+                        ? null
+                        : column.controlWidth - 8 + 'px'
+                  }"
+                  :placeholder="column.description"
+                  :transfer="true"
+                  @on-change="selected => onSelectDataChange(rowData(row, index), column, selected)"
+                >
+                  <Option v-for="item in getDataSource(rowData(row, index), column)" :key="item.id" :value="item.id">{{ item.name }}</Option>
+                  <Option key="__Other" value="__Other">{{ !!(column.pattern || '').trim() ? column.pattern : $t('Front_Label_Others') }}</Option>
+                </Select>
+                <Input
+                  type="text"
+                  size="small"
+                  v-show="parseDataWithOther(rowData(row, index), column) == '__Other'"
+                  :model-value="parseData(rowData(row, index), column.code)"
+                  @update:model-value="$event => setData(rowData(row, index), column.code, $event)"
+                  :readonly="readonly || column.isReadonly"
+                  :style="{
+                    width: column.controlWidth == null ? null : column.controlWidth * 0.6 - 8 + 'px'
+                  }"
+                  style="margin-left: 4px"
+                  :maxlength="column.maxLength"
+                  :placeholder="column.description"
+                  @on-change="onDataChange(rowData(row, index), column)"
+                  @on-blur="onBlur(rowData(row, index), column)"
+                />
+              </div>
+            </template>
             <template v-else-if="column.controlType === 'Date' || column.controlType === 'DateTime' || column.controlType === 'Year' || column.controlType === 'Month'">
               <DatePicker
                 size="small"
@@ -2382,6 +2425,38 @@
 
           this.loadData(data);
         }
+      },
+      // 根据表达式取值（带其他）
+      parseDataWithOther(model, column) {
+        let expression = column.code;
+        let selectValue = this.parseData(model, expression + '_o');
+
+        let value = this.parseData(model, expression);
+        let dataSource = this.getDataSource(model, column);
+
+        if (selectValue != null) {
+          return selectValue;
+        } else if (value == null) {
+          return null;
+        } else if (
+          dataSource &&
+          dataSource.some(item => {
+            return item.id == value;
+          })
+        ) {
+          return value;
+        } else {
+          return '__Other';
+        }
+      },
+      // 根据表达式赋值（带其他）
+      setDataWithOther(model, expression, value) {
+        this.setData(model, expression + '_o', value);
+        if (value != '__Other') {
+          this.setData(model, expression, value);
+        } else {
+          this.setData(model, expression, null);
+        }
       }
     }
   };

package/src/i18n/index.js

@@ -9,6 +9,8 @@ import { createI18n } from 'vue-i18n/index';
 export default createI18n({
   allowComposition: true,
   globalInjection: true,
+  fallbackWarn: false,
+  missingWarn: false,
   legacy: false
   // locale,
   // messages