sks-plugin-el-erp 1.0.4 → 1.0.5

package/README.md

@@ -7,8 +7,20 @@ npm publish
 ```
 
 ## 测试版
+
+```json
+{
+  "version": "1.0.4-beta.2",
+  "package.json": "发布时文件中的版本号,下个测试版最后面的版本号+1,例如 1.0.4-beta.3"
+}
+```
+### 发布测试版
+```shell
+npm publish --tag beta1
+```
+### 按照测试版
 ```shell
-npm publish --tag beta
+npm install sks-plugin-el-erp@beta1
 ```
 
 ## 撤销发布包

package/babel.config.js

@@ -0,0 +1,13 @@
+module.exports = {
+  presets: [
+    // https://github.com/vuejs/vue-cli/tree/master/packages/@vue/babel-preset-app
+    '@vue/cli-plugin-babel/preset'
+  ],
+  'env': {
+    'development': {
+      // babel-plugin-dynamic-import-node plugin only does one thing by converting all import() to require().
+      // This plugin can significantly increase the speed of hot updates, when you have a large number of pages.
+      'plugins': ['dynamic-import-node']
+    }
+  }
+}

package/index.js

@@ -5,7 +5,7 @@ import {
     DICT_DATA_CSS_CLASS,
     CHANGE_BIT_FLAG,
     clearFormValidate,
-    dictValueTypeToInteger, equalsObj,
+    equalsObj,
     findRowIndexInListFromAttrName,
     formatOssUrl, ifNull,
     isInArray,
@@ -19,7 +19,7 @@ import {
     setSksTableDataByPage,
     strIfEmpty,
     strIsEmpty,
-    strLength
+    strLength, generateUUID, initListVueVirtualUUID, genRowVueVirtualUUID, deepCopy, dictValueTypeToInteger
 } from "./lib/core";
 import {newTableColumnList} from "./lib/sks-model-utils";
 import './lib/style/sks-main.css'
@@ -28,8 +28,9 @@ import {isExternal} from "./lib/validate";
 import {msgError, msgInfo, msgLoading, msgSuccess} from "./lib/modal";
 import {resetForm} from "./lib/ref";
 import {absNumber, negateNumber} from "./lib/sks-number-utils";
-import {sksConfig} from "./lib/sksConfig";
+import {request, sksConfig} from "./lib/sksConfig";
 import {rowStyleElTable} from "./lib/sks-app-utils";
+import {simulateFilterByQueryParams} from "./lib/sks-mock-utils";
 
 
 const sksUtils={
@@ -48,6 +49,7 @@ const sksUtils={
     safeGetNullEmpty,
     formatOssUrl,
     mergeFromObject,
+    deepCopy,
     isInArray,
     findRowIndexInListFromAttrName,
     isInvalid,
@@ -65,6 +67,10 @@ const sksUtils={
     resetSksTableBefore,
     setSksTableDataByPage,
     rowStyleElTable,
+    generateUUID,
+    initListVueVirtualUUID,
+    genRowVueVirtualUUID,
+    simulateFilterByQueryParams,
 
     //modal
     msgError,
@@ -97,6 +103,18 @@ import SksDictLabelTag from './lib/ui/sks-dict-label-tag/index.js'
 import SksRightToolbar from './lib/ui/sks-right-toolbar/index.js'
 import SksTable from './lib/ui/sks-table/index.js'
 import SksPagination from './lib/ui/sks-pagination/index.js'
+import SksSelectSingleByLookupController from './lib/ui/sks-select-single-by-lookup-controller/index.js'
+import SksSelectMultipleByLookupService from "./lib/ui/sks-select-multiple-by-lookup-controller/index.js";
+import SksFilterParamDateRange from "./lib/ui/filter-param/sks-filter-param-date-range/index.js";
+import SksFilterParamInput from "./lib/ui/filter-param/sks-filter-param-input/index.js";
+import SksFilterParamDictSelect from "./lib/ui/filter-param/sks-filter-param-dict-select/index.js";
+import SksCheckbox from './lib/ui/sks-checkbox/index.js'
+import SksDate from './lib/ui/sks-date/index.js'
+import SksStatusSelect from './lib/ui/sks-status-select/index.js'
+import SksTableQueryFormEl from './lib/ui/sks-table-query-form-el/index.js'
+
+
+
 
 const components = [
     SksButton,
@@ -107,6 +125,15 @@ const components = [
     SksRightToolbar,
     SksTable,
     SksPagination,
+    SksSelectSingleByLookupController,
+    SksSelectMultipleByLookupService,
+    SksFilterParamDateRange,
+    SksFilterParamInput,
+    SksFilterParamDictSelect,
+    SksCheckbox,
+    SksDate,
+    SksStatusSelect,
+    SksTableQueryFormEl,
 ]
 
 
@@ -114,6 +141,9 @@ const install = function(Vue, opts = {}) {
     components.forEach(component => {
         Vue.component(component.name, component);
     });
+    Vue.prototype.$SKS_PLUGIN_EL_ERP = {
+        request: opts.request||request
+    };
 }
 
 /* istanbul ignore if */
@@ -132,4 +162,13 @@ export default {
     SksRightToolbar,
     SksTable,
     SksPagination,
+    SksSelectSingleByLookupController,
+    SksSelectMultipleByLookupService,
+    SksFilterParamDateRange,
+    SksFilterParamInput,
+    SksFilterParamDictSelect,
+    SksCheckbox,
+    SksDate,
+    SksStatusSelect,
+    SksTableQueryFormEl,
 }

package/lib/core.js

@@ -1,8 +1,8 @@
-
 /**
  * 变更标志
  * @type {{toBeDelete: 1, toBeAdd: 2, toBeModify: 3}}
  */
+
 export const CHANGE_BIT_FLAG={
     //无变更,只做查看
     none: 0,
@@ -536,7 +536,7 @@ export const defaultSksParamColumnData={
     prop: undefined,
     label: undefined,
     labelWidth: undefined,
-    clearable: false,
+    clearable: true,
     visible: true,
     itemStyle: undefined,
 
@@ -567,46 +567,6 @@ export const defaultSksParamColumnData={
 }
 
 
-/**
- *
- * @param data
- *              //时间范围查询
- *              htmlType: `sksFilterParamDateRange`
- useTimeBetween: sksParamColumn({
-                                htmlType: `sksFilterParamDateRange`,
-                                //根据map中的key为基准
-                                // prop: `nameLike`,
-                                label: '用餐时间',
-                    }),
- * @return {{}}
- */
-export function sksParamColumn(data){
-    return mergeFromObject({},defaultSksParamColumnData,data
-    )
-}
-
-export const defaultSksTableColumnData={
-    //自定义插槽
-    slot: undefined,
-    //属性名
-    prop: undefined,
-    label: undefined,
-    clearable: false,
-    visible: true,
-    minWidth: undefined,
-    align: 'center',
-    showOverflowTooltip: true,
-    className: undefined,
-    //不推荐使用
-    filters: undefined,
-
-    //页面类型
-    //none: 自定义
-    htmlType: '',
-    //字体颜色
-    textColor: 'none',
-}
-
 
 
 export const sksParamsPropConfigAvailableValueTypeOptions= {
@@ -800,301 +760,6 @@ export const availableSksWebDialogPropConfig={
     },
 }
 
-//列表可用配置项
-export const availableSksWebListPropPropConfig={
-    slot:{
-        value: undefined,
-        name: 'slot',
-        description: '自定义渲染',
-    },
-    align:{
-        value: 'center',
-        name: 'align',
-        description: '对齐方式',
-        htmlType: 'select',
-        htmlTypeOptions:[
-            {
-                dictValue: 'center',
-                dictLabel: '居中'
-            },
-            {
-                dictValue: 'left',
-                dictLabel: '左对齐'
-            },
-            {
-                dictValue: 'right',
-                dictLabel: '右对齐'
-            },
-
-        ]
-    },
-    width:{
-        value: undefined,
-        name: 'width',
-        description: '固定列宽',
-    },
-    minWidth:{
-        value: undefined,
-        name: 'minWidth',
-        description: '最小列宽',
-    },
-    htmlType: {
-        value: '',
-        name: 'htmlType',
-        description: '控件类型',
-        htmlType: 'select',
-        htmlTypeOptions:[
-            {
-                dictValue: '',
-                dictLabel: '默认(字符)'
-            },
-            {
-                dictValue: 'none',
-                dictLabel: '自定义'
-            },
-            {
-                dictValue: 'parseTimeYmd',
-                dictLabel: '只显示年月日'
-            },
-            {
-                dictValue: 'parseTimeMdHm',
-                dictLabel: '只显示月日时分'
-            },
-            {
-                dictValue: 'parseTimeYmdHm',
-                dictLabel: '只显示年月日时分'
-            },
-            {
-                dictValue: 'negateNumber',
-                dictLabel: '数字取反'
-            },
-            {
-                dictValue: 'absNumber',
-                dictLabel: '数字绝对值'
-            },
-            {
-                dictValue: 'dictFormat',
-                dictLabel: '显示字典对应的值'
-            },
-            {
-                dictValue: 'dictFormatObject',
-                dictLabel: '根据字典对象显示带颜色的字典标签(数据处理需要返回字典对象)'
-            },
-            {
-                dictValue: 'textSysUserId',
-                dictLabel: '显示用户ID对应的姓名'
-            },
-            {
-                dictValue: 'no0InfoYes1Danger',
-                dictLabel: '加急[0否(灰色)1是(红色)]'
-            },
-            {
-                dictValue: 'unFinish0WarningFinish1Success',
-                dictLabel: '0未完结,1完结'
-            },
-            {
-                dictValue: 'formatItemFeature',
-                dictLabel: '物资属性'
-            },
-            {
-                dictValue: 'elImageByImgUrl',
-                dictLabel: '图片(单字段)'
-            },
-
-
-        ]
-    },
-    showOverflowTooltip:{
-        value: defaultSksTableColumnData.showOverflowTooltip,
-        name: 'showOverflowTooltip',
-        description: '当内容过长被隐藏时显示 tooltip',
-        htmlType: 'select',
-        valueType: sksParamsPropConfigAvailableValueTypeOptions.boolean.dictValue,
-        htmlTypeOptions:[
-            {
-                dictValue: true,
-                dictLabel: '是'
-            },
-            {
-                dictValue: false,
-                dictLabel: '否'
-            },
-        ]
-    },
-    //字体颜色
-    textColor:{
-        value: defaultSksTableColumnData.textColor,
-        name: 'textColor',
-        description: '字体颜色',
-        htmlType: 'select',
-        valueType: sksParamsPropConfigAvailableValueTypeOptions.string.dictValue,
-        htmlTypeOptions:[
-            {
-                dictValue: 'none',
-                dictLabel: '默认颜色'
-            },
-            {
-                dictValue: 'red',
-                dictLabel: '红色'
-            },
-        ]
-    },
-}
-
-
-//查询可用配置项
-export const availableSksParamsPropConfig={
-    slot:{
-        value: undefined,
-        name: 'slot',
-        description: '自定义渲染',
-    },
-    labelWidth:{
-        value: undefined,
-        name: 'labelWidth',
-        description: '标签宽度',
-    },
-    htmlType: {
-        value: '',
-        name: 'htmlType',
-        description: '控件类型',
-        htmlType: 'select',
-        htmlTypeOptions:[
-            {
-                dictValue: '',
-                dictLabel: '默认输入框'
-            },
-            {
-                dictValue: 'none',
-                dictLabel: '自定义'
-            },
-            {
-                dictValue: 'input',
-                dictLabel: '文本框'
-            },
-            // {
-            //     dictValue: 'checkboxGroup',
-            //     dictLabel: '多选框'
-            // },
-            {
-                dictValue: 'checkbox',
-                dictLabel: '勾选框'
-            },
-            {
-                dictValue: 'sksFilterParamStrRangeYm',
-                dictLabel: '日期范围(年月-字符串范围搜索)'
-            },
-            {
-                dictValue: 'sksFilterParamDateRange',
-                dictLabel: '时间范围(年月日)'
-            },
-            {
-                dictValue: 'sksFilterParamDateRangeYmdhms',
-                dictLabel: '时间范围(年月日时分秒)'
-            },
-            {
-                dictValue: 'shopCategoryEquals',
-                dictLabel: '商户分类下拉'
-            },
-            {
-                dictValue: 'companySupperEquals',
-                dictLabel: '供应商选择下拉'
-            },
-            {
-                dictValue: 'sysUserIdEquals',
-                dictLabel: '人员选择下拉'
-            },
-            {
-                dictValue: 'sysUserIdEqualsZeroIsWaitAssign',
-                dictLabel: '人员选择下拉(增加为0时待指派选项)'
-            },
-            {
-                dictValue: 'itemEquals',
-                dictLabel: '产品/原材料下拉'
-            },
-            {
-                dictValue: 'unFinish0Finish1',
-                dictLabel: '0未完结,1完结'
-            },
-            {
-                dictValue: 'dictFormat',
-                dictLabel: '显示字典对应的值'
-            },
-            {
-                dictValue: 'dateFormatYmd',
-                dictLabel: '日期格式化'
-            },
-        ],
-    },
-    min:{
-        value: undefined,
-        name: 'min',
-        description: '最小值, htmlType=数字形式时有效',
-        //如果为空则默认String
-        valueType: sksParamsPropConfigAvailableValueTypeOptions.number.dictValue,
-        valueTypeOptions:[sksParamsPropConfigAvailableValueTypeOptions.number],
-    },
-    defaultValue: {
-        value: 'undefined',
-        name: 'htmlType',
-        description: '控件类型',
-        htmlType: 'select',
-        htmlTypeOptions:[
-            {
-                dictValue: 'undefined',
-                dictLabel: 'undefined'
-            },
-            {
-                dictValue: '',
-                dictLabel: '空字符'
-            },
-            {
-                dictValue: '0',
-                dictLabel: '数字0'
-            },
-        ]
-    },
-    // dictName:{
-    //     value: '',
-    //     name: 'dictName',
-    //     description: '字典名称(控件类型为显示字典值时有效)',
-    // hide:()=>{
-    // },
-    // },
-}
-
-export function sksTableColumn(data){
-    return mergeFromObject({},defaultSksTableColumnData,data)
-}
-
-//显示列表属性名称
-export function formatWebListPropConfigDescription(name){
-    let tmp=''
-    switch (name){
-        case 'visible':
-            return '是否显示'
-        case 'handleDictType':
-            return '处理字典类型'
-        case 'prop':
-            return '属性名'
-        case 'label':
-            return '标题'
-        case 'sksAppId':
-            return '配置主键'
-        case 'handleValProp':
-            return '处理的原属性(为空则使用 prop)'
-        case 'handleValType':
-            return '数据处理类型'
-        default:
-            break
-    }
-    for (let key of Object.keys(availableSksWebListPropPropConfig)) {
-        if (name == key) {
-            return availableSksWebListPropPropConfig[key].description
-        }
-    }
-    return tmp;
-}
 
 
 export function getSelectTitleByColumnConfig(columnConf) {
@@ -1107,10 +772,14 @@ function columnConfigToSelectTitle(columnConf={}){
     const data={}
     for (let key of Object.keys(columnConf)) {
         let value=columnConf[key]
-        if(value.label?.constructor === String){
-            data[key]=value.label
-        }else{
+        if(isNullOrUndefined(value.label)){
             data[key]=columnConfigToSelectTitle(value)
+        }else{
+            if(value.label.constructor === String){
+                data[key]=value.label
+            }else{
+                data[key]=columnConfigToSelectTitle(value)
+            }
         }
     }
     return data
@@ -1301,12 +970,12 @@ export function notEmptyAppend(val,prefix,suffix){
     return tmp;
 }
 
-export function initListVueVirtualUUID(list){
+export function initListVueVirtualUUID(list,hasVirtualChangeBitFlag=true,hasIsSet=true){
     if(list == undefined){
         return [];
     }
     list.forEach((item,i)=>{
-        initRowVueVirtualUUID(item)
+        initRowVueVirtualUUID(item,hasVirtualChangeBitFlag,hasIsSet)
     })
     return list;
 }
@@ -1316,18 +985,37 @@ export function initListVueVirtualUUID(list){
  * @param item
  * @return {*}
  */
-export function initRowVueVirtualUUID(item){
-    if(isNullOrUndefined(item.virtualChangeBitFlag)){
-        item.virtualChangeBitFlag=0
+export function initRowVueVirtualUUID(item,hasVirtualChangeBitFlag=true,hasIsSet=true){
+    if(hasVirtualChangeBitFlag){
+        if(isNullOrUndefined(item.virtualChangeBitFlag)){
+            item.virtualChangeBitFlag=0
+        }
     }
     if(isNullOrUndefined(item.vueVirtualUUID)){
         item.vueVirtualUUID=generateUUID();
-        item.isSet=false;
+        if(hasIsSet){
+            item.isSet=false;
+        }
     }
     return item;
 }
 
 
+/**
+ * 如果 vueVirtualUUID 不存在则生成
+ * 主要用于组件中 for循环需要一个key
+ * @param item
+ * @return {string}  vueVirtualUUID 的值
+ */
+export function genRowVueVirtualUUID(item){
+    let vueVirtualUUID=item.vueVirtualUUID
+    if(isNullOrUndefined(vueVirtualUUID)){
+        vueVirtualUUID=generateUUID();
+        item.vueVirtualUUID=vueVirtualUUID
+    }
+    return vueVirtualUUID;
+}
+
 /**
  * 清除属性校验错误信息
  * @param propName